diff options
author | Wolfgang Denk <wd@denx.de> | 2012-04-27 11:03:26 (GMT) |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2012-04-29 12:12:10 (GMT) |
commit | e654fac2e6914cb27ae2cb855db5484bde38e107 (patch) | |
tree | a4c8c2b705a1482cb212164e48dd09693ddef362 | |
parent | 415d386877df49eb051b85ef74fa59a16dc17c7d (diff) | |
parent | 02b233ecb129d69f8e234f94fd96a012caed880b (diff) | |
download | u-boot-e654fac2e6914cb27ae2cb855db5484bde38e107.tar.xz |
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
-rw-r--r-- | README | 2 | ||||
-rw-r--r-- | arch/arm/cpu/armv7/omap-common/spl_nand.c | 2 | ||||
-rw-r--r-- | include/config_cmd_all.h | 1 | ||||
-rw-r--r-- | include/configs/HWW1U1A.h | 2 | ||||
-rw-r--r-- | include/configs/MBX.h | 1 | ||||
-rw-r--r-- | include/configs/MigoR.h | 1 | ||||
-rw-r--r-- | include/configs/at91sam9m10g45ek.h | 1 | ||||
-rw-r--r-- | include/configs/debris.h | 2 | ||||
-rw-r--r-- | include/configs/digsy_mtc.h | 1 | ||||
-rw-r--r-- | include/configs/ep8260.h | 1 | ||||
-rw-r--r-- | include/configs/gplugd.h | 1 | ||||
-rw-r--r-- | include/configs/jadecpu.h | 1 | ||||
-rw-r--r-- | include/configs/kilauea.h | 1 | ||||
-rw-r--r-- | include/configs/lwmon5.h | 1 | ||||
-rw-r--r-- | include/configs/makalu.h | 1 | ||||
-rw-r--r-- | include/configs/ms7722se.h | 1 | ||||
-rw-r--r-- | include/configs/ms7750se.h | 1 | ||||
-rw-r--r-- | include/configs/omap3_logic.h | 2 | ||||
-rw-r--r-- | include/configs/quad100hd.h | 1 | ||||
-rw-r--r-- | include/configs/r2dplus.h | 1 | ||||
-rw-r--r-- | include/configs/sh7757lcr.h | 1 | ||||
-rw-r--r-- | include/configs/sh7785lcr.h | 1 | ||||
-rw-r--r-- | include/configs/u8500_href.h | 1 | ||||
-rw-r--r-- | include/configs/zeus.h | 1 |
24 files changed, 5 insertions, 24 deletions
@@ -814,7 +814,7 @@ The following options need to be configured: CONFIG_CMD_TIME * run command and report execution time CONFIG_CMD_USB * USB 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 diff --git a/arch/arm/cpu/armv7/omap-common/spl_nand.c b/arch/arm/cpu/armv7/omap-common/spl_nand.c index 1295e88..8cf55c9 100644 --- a/arch/arm/cpu/armv7/omap-common/spl_nand.c +++ b/arch/arm/cpu/armv7/omap-common/spl_nand.c @@ -54,7 +54,7 @@ void spl_nand_load_image(void) * load parameter image * load to temp position since nand_spl_load_image reads * 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 */ nand_spl_load_image(CONFIG_CMD_SPL_NAND_OFS, diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h index 2c6b829..55f4f7a 100644 --- a/include/config_cmd_all.h +++ b/include/config_cmd_all.h @@ -15,7 +15,6 @@ #define CONFIG_CMD_AMBAPP /* AMBA Plug & Play Bus print utility */ #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_BEDBUG /* Include BedBug Debugger */ #define CONFIG_CMD_BMP /* BMP support */ diff --git a/include/configs/HWW1U1A.h b/include/configs/HWW1U1A.h index 01597b9..f08d78b 100644 --- a/include/configs/HWW1U1A.h +++ b/include/configs/HWW1U1A.h @@ -422,7 +422,7 @@ const char *hww1u1a_get_ps1(void); #define CONFIG_MD5 #define CONFIG_SHA1 #define CONFIG_CMD_MD5SUM -#define CONFIG_CMD_SHA1 +#define CONFIG_CMD_SHA1SUM #define CONFIG_CMD_ASKENV #define CONFIG_CMD_SETEXPR diff --git a/include/configs/MBX.h b/include/configs/MBX.h index cb5b023..79780bd 100644 --- a/include/configs/MBX.h +++ b/include/configs/MBX.h @@ -87,7 +87,6 @@ * Command line configuration. */ #define CONFIG_CMD_NET -#define CONFIG_CMD_DFL #define CONFIG_CMD_SDRAM #define CONFIG_CMD_PCMCIA #define CONFIG_CMD_IDE diff --git a/include/configs/MigoR.h b/include/configs/MigoR.h index 619a800..84ba78f 100644 --- a/include/configs/MigoR.h +++ b/include/configs/MigoR.h @@ -38,7 +38,6 @@ #define CONFIG_CMD_NET #define CONFIG_CMD_PING #define CONFIG_CMD_NFS -#define CONFIG_CMD_DFL #define CONFIG_CMD_SDRAM #define CONFIG_CMD_SAVEENV diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h index 6a02188..159857d 100644 --- a/include/configs/at91sam9m10g45ek.h +++ b/include/configs/at91sam9m10g45ek.h @@ -107,7 +107,6 @@ #undef CONFIG_CMD_FPGA #undef CONFIG_CMD_IMI #undef CONFIG_CMD_IMLS -#undef CONFIG_CMD_AUTOSCRIPT #undef CONFIG_CMD_LOADS #define CONFIG_CMD_PING diff --git a/include/configs/debris.h b/include/configs/debris.h index 60c7c40..303630d 100644 --- a/include/configs/debris.h +++ b/include/configs/debris.h @@ -148,7 +148,7 @@ #define CONFIG_CMD_ELF #define CONFIG_CMD_I2C #define CONFIG_CMD_JFFS2 -#define CONFIG_CMD_KGBD +#define CONFIG_CMD_KGDB #define CONFIG_CMD_PCI #define CONFIG_CMD_PING #define CONFIG_CMD_SAVES diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h index d517334..1f66023 100644 --- a/include/configs/digsy_mtc.h +++ b/include/configs/digsy_mtc.h @@ -119,7 +119,6 @@ #ifdef CONFIG_VIDEO #define CONFIG_CMD_BMP #endif -#define CONFIG_CMD_DFL #define CONFIG_CMD_CACHE #define CONFIG_CMD_DATE #define CONFIG_CMD_DHCP diff --git a/include/configs/ep8260.h b/include/configs/ep8260.h index f19360d..221d3e0 100644 --- a/include/configs/ep8260.h +++ b/include/configs/ep8260.h @@ -325,7 +325,6 @@ #define CONFIG_CMD_SDRAM #define CONFIG_CMD_SNTP -#undef CONFIG_CMD_DCR #undef CONFIG_CMD_XIMG /* Where do the internal registers live? */ diff --git a/include/configs/gplugd.h b/include/configs/gplugd.h index 462cc7e..efff309 100644 --- a/include/configs/gplugd.h +++ b/include/configs/gplugd.h @@ -70,7 +70,6 @@ #define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ #include <config_cmd_default.h> #define CONFIG_CMD_I2C -#define CONFIG_CMD_AUTOSCRIPT #undef CONFIG_CMD_FPGA #define CONFIG_CMD_USB #define CONFIG_CMD_EXT2 diff --git a/include/configs/jadecpu.h b/include/configs/jadecpu.h index f72ee02..d644fea 100644 --- a/include/configs/jadecpu.h +++ b/include/configs/jadecpu.h @@ -130,7 +130,6 @@ #undef CONFIG_CMD_XIMG #define CONFIG_CMD_BMP -#define CONFIG_CMD_CAN #define CONFIG_CMD_DHCP #define CONFIG_CMD_ELF #define CONFIG_CMD_FAT diff --git a/include/configs/kilauea.h b/include/configs/kilauea.h index 621dbb8..d505a41 100644 --- a/include/configs/kilauea.h +++ b/include/configs/kilauea.h @@ -447,7 +447,6 @@ */ #define CONFIG_CMD_CHIP_CONFIG #define CONFIG_CMD_DATE -#define CONFIG_CMD_LOG #define CONFIG_CMD_NAND #define CONFIG_CMD_PCI #define CONFIG_CMD_SNTP diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h index a6f2864..68215fd 100644 --- a/include/configs/lwmon5.h +++ b/include/configs/lwmon5.h @@ -435,7 +435,6 @@ #define CONFIG_CMD_FAT #define CONFIG_CMD_I2C #define CONFIG_CMD_IRQ -#define CONFIG_CMD_LOG #define CONFIG_CMD_MII #define CONFIG_CMD_NET #define CONFIG_CMD_NFS diff --git a/include/configs/makalu.h b/include/configs/makalu.h index fcc789d..6c1b136 100644 --- a/include/configs/makalu.h +++ b/include/configs/makalu.h @@ -252,7 +252,6 @@ */ #define CONFIG_CMD_DATE #define CONFIG_CMD_DTT -#define CONFIG_CMD_LOG #define CONFIG_CMD_PCI #define CONFIG_CMD_SNTP diff --git a/include/configs/ms7722se.h b/include/configs/ms7722se.h index 7cf641f..f110490 100644 --- a/include/configs/ms7722se.h +++ b/include/configs/ms7722se.h @@ -35,7 +35,6 @@ #define CONFIG_CMD_NET #define CONFIG_CMD_NFS #define CONFIG_CMD_PING -#define CONFIG_CMD_DFL #define CONFIG_CMD_SDRAM #define CONFIG_CMD_MEMORY #define CONFIG_CMD_SAVEENV diff --git a/include/configs/ms7750se.h b/include/configs/ms7750se.h index 03f52f3..52e15cc 100644 --- a/include/configs/ms7750se.h +++ b/include/configs/ms7750se.h @@ -38,7 +38,6 @@ */ /*#include <config_cmd_default.h>*/ -#define CONFIG_CMD_DFL #define CONFIG_CMD_FLASH #define CONFIG_CMD_SAVEENV diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index 01360f6..4ac17cc 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -122,7 +122,7 @@ #define CONFIG_CMD_NET /* bootp, tftpboot, rarpboot */ #define CONFIG_CMD_PING #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_FPGA /* FPGA configuration Support */ diff --git a/include/configs/quad100hd.h b/include/configs/quad100hd.h index dc5ec3a..5d0c385 100644 --- a/include/configs/quad100hd.h +++ b/include/configs/quad100hd.h @@ -69,7 +69,6 @@ #define CONFIG_CMD_I2C #undef CONFIG_CMD_IRQ #define CONFIG_CMD_JFFS2 -#undef CONFIG_CMD_LOG #undef CONFIG_CMD_MII #define CONFIG_CMD_NAND #undef CONFIG_CMD_PING diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h index 0ce3fa8..9cdfc14 100644 --- a/include/configs/r2dplus.h +++ b/include/configs/r2dplus.h @@ -15,7 +15,6 @@ */ #include <config_cmd_default.h> -#define CONFIG_CMD_DFL #define CONFIG_CMD_CACHE #define CONFIG_CMD_FLASH #define CONFIG_CMD_PCI diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h index 73d2a87..708bff7 100644 --- a/include/configs/sh7757lcr.h +++ b/include/configs/sh7757lcr.h @@ -41,7 +41,6 @@ #define CONFIG_CMD_MII #define CONFIG_CMD_PING #define CONFIG_CMD_NFS -#define CONFIG_CMD_DFL #define CONFIG_CMD_SDRAM #define CONFIG_CMD_SF #define CONFIG_CMD_RUN diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h index 1e71bcc..9c32bfc 100644 --- a/include/configs/sh7785lcr.h +++ b/include/configs/sh7785lcr.h @@ -37,7 +37,6 @@ #define CONFIG_CMD_NET #define CONFIG_CMD_PING #define CONFIG_CMD_NFS -#define CONFIG_CMD_DFL #define CONFIG_CMD_SDRAM #define CONFIG_CMD_RUN #define CONFIG_CMD_SAVEENV diff --git a/include/configs/u8500_href.h b/include/configs/u8500_href.h index 4747fbd..95028de 100644 --- a/include/configs/u8500_href.h +++ b/include/configs/u8500_href.h @@ -95,7 +95,6 @@ #define CONFIG_CMD_MMC #define CONFIG_CMD_FAT #define CONFIG_CMD_EXT2 -#define CONFIG_CMD_EMMC #define CONFIG_CMD_SOURCE #define CONFIG_CMD_I2C diff --git a/include/configs/zeus.h b/include/configs/zeus.h index 63279b0..2556e3b 100644 --- a/include/configs/zeus.h +++ b/include/configs/zeus.h @@ -78,7 +78,6 @@ #define CONFIG_CMD_ELF #define CONFIG_CMD_I2C #define CONFIG_CMD_IRQ -#define CONFIG_CMD_LOG #define CONFIG_CMD_MII #define CONFIG_CMD_NET #define CONFIG_CMD_NFS |