mirror of
				https://github.com/smaeul/u-boot.git
				synced 2025-11-03 21:48:15 +00:00 
			
		
		
		
	Merge branch 'marex@denx.de' of git://git.denx.de/u-boot-staging
* 'marex@denx.de' of git://git.denx.de/u-boot-staging: CMD: CONFIG_CMD_SETECPR -> CONFIG_CMD_SETEXPR on omap3_logic CMD: Fix CONFIG_CMD_SAVEBP_WRITE_SIZE -> CONFIG_CMD_SPL_WRITE_SIZE CMD: Fix typo CMD_FSL -> CMD_MFSL in readme HWW1U1A: Fix CMD_SHA1 -> CMD_SHA1SUM CMD: Remove CMD_LOG, it's unused CMD: Fix typo KGBD -> KGDB on debris board CMD: Drop CONFIG_CMD_EMMC, it's not used CMD: Drop CONFIG_CMD_DFL, it's not used CMD: Drop CMD_DCR, it's not used CMD: Drop CMD_CAN, it's not used CMD: Remove CMD_AUTOSCRIPT, it's not used AT91: Drop AT91_SPIMUX command from cmd_all
This commit is contained in:
		
						commit
						e654fac2e6
					
				
							
								
								
									
										2
									
								
								README
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								README
									
									
									
									
									
								
							@ -814,7 +814,7 @@ The following options need to be configured:
 | 
				
			|||||||
		CONFIG_CMD_TIME		* run command and report execution time
 | 
							CONFIG_CMD_TIME		* run command and report execution time
 | 
				
			||||||
		CONFIG_CMD_USB		* USB support
 | 
							CONFIG_CMD_USB		* USB support
 | 
				
			||||||
		CONFIG_CMD_CDP		* Cisco Discover Protocol support
 | 
							CONFIG_CMD_CDP		* Cisco Discover Protocol support
 | 
				
			||||||
		CONFIG_CMD_FSL		* Microblaze FSL support
 | 
							CONFIG_CMD_MFSL		* Microblaze FSL support
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		EXAMPLE: If you want all functions except of network
 | 
							EXAMPLE: If you want all functions except of network
 | 
				
			||||||
 | 
				
			|||||||
@ -54,7 +54,7 @@ void spl_nand_load_image(void)
 | 
				
			|||||||
		 * load parameter image
 | 
							 * load parameter image
 | 
				
			||||||
		 * load to temp position since nand_spl_load_image reads
 | 
							 * load to temp position since nand_spl_load_image reads
 | 
				
			||||||
		 * a whole block which is typically larger than
 | 
							 * a whole block which is typically larger than
 | 
				
			||||||
		 * CONFIG_CMD_SAVEBP_WRITE_SIZE therefore may overwrite
 | 
							 * CONFIG_CMD_SPL_WRITE_SIZE therefore may overwrite
 | 
				
			||||||
		 * following sections like BSS
 | 
							 * following sections like BSS
 | 
				
			||||||
		 */
 | 
							 */
 | 
				
			||||||
		nand_spl_load_image(CONFIG_CMD_SPL_NAND_OFS,
 | 
							nand_spl_load_image(CONFIG_CMD_SPL_NAND_OFS,
 | 
				
			||||||
 | 
				
			|||||||
@ -15,7 +15,6 @@
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
#define CONFIG_CMD_AMBAPP	/* AMBA Plug & Play Bus print utility */
 | 
					#define CONFIG_CMD_AMBAPP	/* AMBA Plug & Play Bus print utility */
 | 
				
			||||||
#define CONFIG_CMD_ASKENV	/* ask for env variable		*/
 | 
					#define CONFIG_CMD_ASKENV	/* ask for env variable		*/
 | 
				
			||||||
#define CONFIG_CMD_AT91_SPIMUX	/* AT91 MMC/SPI Mux Support     */
 | 
					 | 
				
			||||||
#define CONFIG_CMD_BDI		/* bdinfo			*/
 | 
					#define CONFIG_CMD_BDI		/* bdinfo			*/
 | 
				
			||||||
#define CONFIG_CMD_BEDBUG	/* Include BedBug Debugger	*/
 | 
					#define CONFIG_CMD_BEDBUG	/* Include BedBug Debugger	*/
 | 
				
			||||||
#define CONFIG_CMD_BMP		/* BMP support			*/
 | 
					#define CONFIG_CMD_BMP		/* BMP support			*/
 | 
				
			||||||
 | 
				
			|||||||
@ -422,7 +422,7 @@ const char *hww1u1a_get_ps1(void);
 | 
				
			|||||||
#define CONFIG_MD5
 | 
					#define CONFIG_MD5
 | 
				
			||||||
#define CONFIG_SHA1
 | 
					#define CONFIG_SHA1
 | 
				
			||||||
#define CONFIG_CMD_MD5SUM
 | 
					#define CONFIG_CMD_MD5SUM
 | 
				
			||||||
#define CONFIG_CMD_SHA1
 | 
					#define CONFIG_CMD_SHA1SUM
 | 
				
			||||||
#define CONFIG_CMD_ASKENV
 | 
					#define CONFIG_CMD_ASKENV
 | 
				
			||||||
#define CONFIG_CMD_SETEXPR
 | 
					#define CONFIG_CMD_SETEXPR
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -87,7 +87,6 @@
 | 
				
			|||||||
 * Command line configuration.
 | 
					 * Command line configuration.
 | 
				
			||||||
 */
 | 
					 */
 | 
				
			||||||
#define CONFIG_CMD_NET
 | 
					#define CONFIG_CMD_NET
 | 
				
			||||||
#define CONFIG_CMD_DFL
 | 
					 | 
				
			||||||
#define CONFIG_CMD_SDRAM
 | 
					#define CONFIG_CMD_SDRAM
 | 
				
			||||||
#define CONFIG_CMD_PCMCIA
 | 
					#define CONFIG_CMD_PCMCIA
 | 
				
			||||||
#define CONFIG_CMD_IDE
 | 
					#define CONFIG_CMD_IDE
 | 
				
			||||||
 | 
				
			|||||||
@ -38,7 +38,6 @@
 | 
				
			|||||||
#define CONFIG_CMD_NET
 | 
					#define CONFIG_CMD_NET
 | 
				
			||||||
#define CONFIG_CMD_PING
 | 
					#define CONFIG_CMD_PING
 | 
				
			||||||
#define CONFIG_CMD_NFS
 | 
					#define CONFIG_CMD_NFS
 | 
				
			||||||
#define CONFIG_CMD_DFL
 | 
					 | 
				
			||||||
#define CONFIG_CMD_SDRAM
 | 
					#define CONFIG_CMD_SDRAM
 | 
				
			||||||
#define CONFIG_CMD_SAVEENV
 | 
					#define CONFIG_CMD_SAVEENV
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -107,7 +107,6 @@
 | 
				
			|||||||
#undef CONFIG_CMD_FPGA
 | 
					#undef CONFIG_CMD_FPGA
 | 
				
			||||||
#undef CONFIG_CMD_IMI
 | 
					#undef CONFIG_CMD_IMI
 | 
				
			||||||
#undef CONFIG_CMD_IMLS
 | 
					#undef CONFIG_CMD_IMLS
 | 
				
			||||||
#undef CONFIG_CMD_AUTOSCRIPT
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_LOADS
 | 
					#undef CONFIG_CMD_LOADS
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define CONFIG_CMD_PING
 | 
					#define CONFIG_CMD_PING
 | 
				
			||||||
 | 
				
			|||||||
@ -148,7 +148,7 @@
 | 
				
			|||||||
#define CONFIG_CMD_ELF
 | 
					#define CONFIG_CMD_ELF
 | 
				
			||||||
#define CONFIG_CMD_I2C
 | 
					#define CONFIG_CMD_I2C
 | 
				
			||||||
#define CONFIG_CMD_JFFS2
 | 
					#define CONFIG_CMD_JFFS2
 | 
				
			||||||
#define CONFIG_CMD_KGBD
 | 
					#define CONFIG_CMD_KGDB
 | 
				
			||||||
#define CONFIG_CMD_PCI
 | 
					#define CONFIG_CMD_PCI
 | 
				
			||||||
#define CONFIG_CMD_PING
 | 
					#define CONFIG_CMD_PING
 | 
				
			||||||
#define CONFIG_CMD_SAVES
 | 
					#define CONFIG_CMD_SAVES
 | 
				
			||||||
 | 
				
			|||||||
@ -119,7 +119,6 @@
 | 
				
			|||||||
#ifdef CONFIG_VIDEO
 | 
					#ifdef CONFIG_VIDEO
 | 
				
			||||||
#define CONFIG_CMD_BMP
 | 
					#define CONFIG_CMD_BMP
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
#define CONFIG_CMD_DFL
 | 
					 | 
				
			||||||
#define CONFIG_CMD_CACHE
 | 
					#define CONFIG_CMD_CACHE
 | 
				
			||||||
#define CONFIG_CMD_DATE
 | 
					#define CONFIG_CMD_DATE
 | 
				
			||||||
#define CONFIG_CMD_DHCP
 | 
					#define CONFIG_CMD_DHCP
 | 
				
			||||||
 | 
				
			|||||||
@ -325,7 +325,6 @@
 | 
				
			|||||||
#define CONFIG_CMD_SDRAM
 | 
					#define CONFIG_CMD_SDRAM
 | 
				
			||||||
#define CONFIG_CMD_SNTP
 | 
					#define CONFIG_CMD_SNTP
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#undef CONFIG_CMD_DCR
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_XIMG
 | 
					#undef CONFIG_CMD_XIMG
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Where do the internal registers live? */
 | 
					/* Where do the internal registers live? */
 | 
				
			||||||
 | 
				
			|||||||
@ -70,7 +70,6 @@
 | 
				
			|||||||
#define CONFIG_SYS_NO_FLASH		/* Declare no flash (NOR/SPI) */
 | 
					#define CONFIG_SYS_NO_FLASH		/* Declare no flash (NOR/SPI) */
 | 
				
			||||||
#include <config_cmd_default.h>
 | 
					#include <config_cmd_default.h>
 | 
				
			||||||
#define CONFIG_CMD_I2C
 | 
					#define CONFIG_CMD_I2C
 | 
				
			||||||
#define CONFIG_CMD_AUTOSCRIPT
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_FPGA
 | 
					#undef CONFIG_CMD_FPGA
 | 
				
			||||||
#define CONFIG_CMD_USB
 | 
					#define CONFIG_CMD_USB
 | 
				
			||||||
#define CONFIG_CMD_EXT2
 | 
					#define CONFIG_CMD_EXT2
 | 
				
			||||||
 | 
				
			|||||||
@ -130,7 +130,6 @@
 | 
				
			|||||||
#undef CONFIG_CMD_XIMG
 | 
					#undef CONFIG_CMD_XIMG
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define CONFIG_CMD_BMP
 | 
					#define CONFIG_CMD_BMP
 | 
				
			||||||
#define CONFIG_CMD_CAN
 | 
					 | 
				
			||||||
#define CONFIG_CMD_DHCP
 | 
					#define CONFIG_CMD_DHCP
 | 
				
			||||||
#define CONFIG_CMD_ELF
 | 
					#define CONFIG_CMD_ELF
 | 
				
			||||||
#define CONFIG_CMD_FAT
 | 
					#define CONFIG_CMD_FAT
 | 
				
			||||||
 | 
				
			|||||||
@ -447,7 +447,6 @@
 | 
				
			|||||||
 */
 | 
					 */
 | 
				
			||||||
#define CONFIG_CMD_CHIP_CONFIG
 | 
					#define CONFIG_CMD_CHIP_CONFIG
 | 
				
			||||||
#define CONFIG_CMD_DATE
 | 
					#define CONFIG_CMD_DATE
 | 
				
			||||||
#define CONFIG_CMD_LOG
 | 
					 | 
				
			||||||
#define CONFIG_CMD_NAND
 | 
					#define CONFIG_CMD_NAND
 | 
				
			||||||
#define CONFIG_CMD_PCI
 | 
					#define CONFIG_CMD_PCI
 | 
				
			||||||
#define CONFIG_CMD_SNTP
 | 
					#define CONFIG_CMD_SNTP
 | 
				
			||||||
 | 
				
			|||||||
@ -435,7 +435,6 @@
 | 
				
			|||||||
#define CONFIG_CMD_FAT
 | 
					#define CONFIG_CMD_FAT
 | 
				
			||||||
#define CONFIG_CMD_I2C
 | 
					#define CONFIG_CMD_I2C
 | 
				
			||||||
#define CONFIG_CMD_IRQ
 | 
					#define CONFIG_CMD_IRQ
 | 
				
			||||||
#define CONFIG_CMD_LOG
 | 
					 | 
				
			||||||
#define CONFIG_CMD_MII
 | 
					#define CONFIG_CMD_MII
 | 
				
			||||||
#define CONFIG_CMD_NET
 | 
					#define CONFIG_CMD_NET
 | 
				
			||||||
#define CONFIG_CMD_NFS
 | 
					#define CONFIG_CMD_NFS
 | 
				
			||||||
 | 
				
			|||||||
@ -252,7 +252,6 @@
 | 
				
			|||||||
 */
 | 
					 */
 | 
				
			||||||
#define CONFIG_CMD_DATE
 | 
					#define CONFIG_CMD_DATE
 | 
				
			||||||
#define CONFIG_CMD_DTT
 | 
					#define CONFIG_CMD_DTT
 | 
				
			||||||
#define CONFIG_CMD_LOG
 | 
					 | 
				
			||||||
#define CONFIG_CMD_PCI
 | 
					#define CONFIG_CMD_PCI
 | 
				
			||||||
#define CONFIG_CMD_SNTP
 | 
					#define CONFIG_CMD_SNTP
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -35,7 +35,6 @@
 | 
				
			|||||||
#define CONFIG_CMD_NET
 | 
					#define CONFIG_CMD_NET
 | 
				
			||||||
#define CONFIG_CMD_NFS
 | 
					#define CONFIG_CMD_NFS
 | 
				
			||||||
#define CONFIG_CMD_PING
 | 
					#define CONFIG_CMD_PING
 | 
				
			||||||
#define CONFIG_CMD_DFL
 | 
					 | 
				
			||||||
#define CONFIG_CMD_SDRAM
 | 
					#define CONFIG_CMD_SDRAM
 | 
				
			||||||
#define CONFIG_CMD_MEMORY
 | 
					#define CONFIG_CMD_MEMORY
 | 
				
			||||||
#define CONFIG_CMD_SAVEENV
 | 
					#define CONFIG_CMD_SAVEENV
 | 
				
			||||||
 | 
				
			|||||||
@ -38,7 +38,6 @@
 | 
				
			|||||||
 */
 | 
					 */
 | 
				
			||||||
/*#include <config_cmd_default.h>*/
 | 
					/*#include <config_cmd_default.h>*/
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define CONFIG_CMD_DFL
 | 
					 | 
				
			||||||
#define CONFIG_CMD_FLASH
 | 
					#define CONFIG_CMD_FLASH
 | 
				
			||||||
#define CONFIG_CMD_SAVEENV
 | 
					#define CONFIG_CMD_SAVEENV
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -122,7 +122,7 @@
 | 
				
			|||||||
#define CONFIG_CMD_NET      /* bootp, tftpboot, rarpboot    */
 | 
					#define CONFIG_CMD_NET      /* bootp, tftpboot, rarpboot    */
 | 
				
			||||||
#define CONFIG_CMD_PING
 | 
					#define CONFIG_CMD_PING
 | 
				
			||||||
#define CONFIG_CMD_DHCP
 | 
					#define CONFIG_CMD_DHCP
 | 
				
			||||||
#define CONFIG_CMD_SETECPR	/* Evaluate expressions		*/
 | 
					#define CONFIG_CMD_SETEXPR	/* Evaluate expressions		*/
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#undef CONFIG_CMD_FLASH		/* flinfo, erase, protect	*/
 | 
					#undef CONFIG_CMD_FLASH		/* flinfo, erase, protect	*/
 | 
				
			||||||
#undef CONFIG_CMD_FPGA		/* FPGA configuration Support	*/
 | 
					#undef CONFIG_CMD_FPGA		/* FPGA configuration Support	*/
 | 
				
			||||||
 | 
				
			|||||||
@ -69,7 +69,6 @@
 | 
				
			|||||||
#define CONFIG_CMD_I2C
 | 
					#define CONFIG_CMD_I2C
 | 
				
			||||||
#undef CONFIG_CMD_IRQ
 | 
					#undef CONFIG_CMD_IRQ
 | 
				
			||||||
#define CONFIG_CMD_JFFS2
 | 
					#define CONFIG_CMD_JFFS2
 | 
				
			||||||
#undef CONFIG_CMD_LOG
 | 
					 | 
				
			||||||
#undef CONFIG_CMD_MII
 | 
					#undef CONFIG_CMD_MII
 | 
				
			||||||
#define CONFIG_CMD_NAND
 | 
					#define CONFIG_CMD_NAND
 | 
				
			||||||
#undef CONFIG_CMD_PING
 | 
					#undef CONFIG_CMD_PING
 | 
				
			||||||
 | 
				
			|||||||
@ -15,7 +15,6 @@
 | 
				
			|||||||
 */
 | 
					 */
 | 
				
			||||||
#include <config_cmd_default.h>
 | 
					#include <config_cmd_default.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#define CONFIG_CMD_DFL
 | 
					 | 
				
			||||||
#define CONFIG_CMD_CACHE
 | 
					#define CONFIG_CMD_CACHE
 | 
				
			||||||
#define CONFIG_CMD_FLASH
 | 
					#define CONFIG_CMD_FLASH
 | 
				
			||||||
#define CONFIG_CMD_PCI
 | 
					#define CONFIG_CMD_PCI
 | 
				
			||||||
 | 
				
			|||||||
@ -41,7 +41,6 @@
 | 
				
			|||||||
#define CONFIG_CMD_MII
 | 
					#define CONFIG_CMD_MII
 | 
				
			||||||
#define CONFIG_CMD_PING
 | 
					#define CONFIG_CMD_PING
 | 
				
			||||||
#define CONFIG_CMD_NFS
 | 
					#define CONFIG_CMD_NFS
 | 
				
			||||||
#define CONFIG_CMD_DFL
 | 
					 | 
				
			||||||
#define CONFIG_CMD_SDRAM
 | 
					#define CONFIG_CMD_SDRAM
 | 
				
			||||||
#define CONFIG_CMD_SF
 | 
					#define CONFIG_CMD_SF
 | 
				
			||||||
#define CONFIG_CMD_RUN
 | 
					#define CONFIG_CMD_RUN
 | 
				
			||||||
 | 
				
			|||||||
@ -37,7 +37,6 @@
 | 
				
			|||||||
#define CONFIG_CMD_NET
 | 
					#define CONFIG_CMD_NET
 | 
				
			||||||
#define CONFIG_CMD_PING
 | 
					#define CONFIG_CMD_PING
 | 
				
			||||||
#define CONFIG_CMD_NFS
 | 
					#define CONFIG_CMD_NFS
 | 
				
			||||||
#define CONFIG_CMD_DFL
 | 
					 | 
				
			||||||
#define CONFIG_CMD_SDRAM
 | 
					#define CONFIG_CMD_SDRAM
 | 
				
			||||||
#define CONFIG_CMD_RUN
 | 
					#define CONFIG_CMD_RUN
 | 
				
			||||||
#define CONFIG_CMD_SAVEENV
 | 
					#define CONFIG_CMD_SAVEENV
 | 
				
			||||||
 | 
				
			|||||||
@ -95,7 +95,6 @@
 | 
				
			|||||||
#define CONFIG_CMD_MMC
 | 
					#define CONFIG_CMD_MMC
 | 
				
			||||||
#define CONFIG_CMD_FAT
 | 
					#define CONFIG_CMD_FAT
 | 
				
			||||||
#define CONFIG_CMD_EXT2
 | 
					#define CONFIG_CMD_EXT2
 | 
				
			||||||
#define CONFIG_CMD_EMMC
 | 
					 | 
				
			||||||
#define CONFIG_CMD_SOURCE
 | 
					#define CONFIG_CMD_SOURCE
 | 
				
			||||||
#define CONFIG_CMD_I2C
 | 
					#define CONFIG_CMD_I2C
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -78,7 +78,6 @@
 | 
				
			|||||||
#define CONFIG_CMD_ELF
 | 
					#define CONFIG_CMD_ELF
 | 
				
			||||||
#define CONFIG_CMD_I2C
 | 
					#define CONFIG_CMD_I2C
 | 
				
			||||||
#define CONFIG_CMD_IRQ
 | 
					#define CONFIG_CMD_IRQ
 | 
				
			||||||
#define CONFIG_CMD_LOG
 | 
					 | 
				
			||||||
#define CONFIG_CMD_MII
 | 
					#define CONFIG_CMD_MII
 | 
				
			||||||
#define CONFIG_CMD_NET
 | 
					#define CONFIG_CMD_NET
 | 
				
			||||||
#define CONFIG_CMD_NFS
 | 
					#define CONFIG_CMD_NFS
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user