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

diff --git a/README b/README
index 43074cf65f8327e98f1c007f889fe9c69a6869b8..f726303e1977d774f65bd8f0b8877cb5bd259eed 100644 (file)
--- a/README
+++ b/README
@@ -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 1295e88752473dab7217e14cf9c8ac38b1cc394b..8cf55c9a1c8b9956193aa25ed1d618cb3b5434fe 100644 (file)
--- 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 2c6b8295fb88f1c5a673bfb1c08f86a667c92fb2..55f4f7a30b2a8a3227c021cf2ece323c1dda4f37 100644 (file)
--- 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 01597b965b6ce16e2584b640eee76336050988d8..f08d78b91c22520720895f78e70ecd2b6ddb5aab 100644 (file)
--- 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 cb5b023b58fed55c7255c3e540ba8842e78a335a..79780bd1a361ee64f70a1530f77941813cdb004c 100644 (file)
--- 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 619a8002a73267c43770c1a705397439a96a1de9..84ba78f9e962e9443ab2c9499cd1c0225ed961e5 100644 (file)
--- 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 6a02188108f0c4a2a3135457b3d2793e2ce01306..159857d32f1941caf5b9d92d4983f93c193228e1 100644 (file)
--- 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 60c7c4058f87a3ad19ec2aca9775dec528b5ed13..303630d7d772aecd69103c33a6757165785cacec 100644 (file)
--- 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 d5173349c4bbd12263f7874eabf8e563bba9783d..1f660235f02a036627b5026c51e23906764857b4 100644 (file)
--- 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 f19360d501220cb79bf6c1d11141eae2c86bf5ec..221d3e055d74f07143fc6537abef9960c3435d00 100644 (file)
--- 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 462cc7e16c8117576f4879139e4f026fda18b2f3..efff3098a5014963c4a1acc95943fead96e21c3d 100644 (file)
--- 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 f72ee02abfa70d5e4e6f4d7cfb0bce8c1bf490f0..d644fea22f47f2f852493340e2677b2739ca1175 100644 (file)
--- 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 621dbb8fa67fe74c7e06d4db187d2bd3f0aaec17..d505a41de4510596c8e5c1c13df4d4bcc0f9610a 100644 (file)
--- 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 a6f2864c6593733f57a8738b10aa534287ab5f0d..68215fda9d263023bf2085e554b6b1aaefa91f11 100644 (file)
--- 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 fcc789d714158349b5cd6c11b6eec943f6ad1215..6c1b136659abae34d237de17600e1aac3f95cf4c 100644 (file)
--- 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 7cf641fd13b91c7d909d831d0f1efa57895fbb90..f1104902be4357e14eda81277b7bd4b206956c98 100644 (file)
--- 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 03f52f39055180b7ecdc9529997497f33d6cab54..52e15cce876419075d93aaaeb36ac092a7c11508 100644 (file)
--- 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 01360f6cbd6b38843593b253e5229ba9a800105c..4ac17cc63658c18092bcfd234f5acd1c53068d98 100644 (file)
--- 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 dc5ec3aa823dc3d3f957840b3b69e3e2edcedb24..5d0c3859877ca0a91354d312e53c5679744cda31 100644 (file)
--- 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 0ce3fa864c7f679dd93a13fc7da60fb0042fd4df..9cdfc147e956f4e9d34dcd4f9b3278624fb93637 100644 (file)
--- 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 73d2a8759678059f86ac5ee861cf3957c970f011..708bff7bb70ff1e1a6aedfd3e1f15320c3a1da55 100644 (file)
--- 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 1e71bcc3effb4b6c767d1f3bacc2ac8c040f09ad..9c32bfc58bb1f5d8ef0f78c1db944dd0c3ee9f11 100644 (file)
--- 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 4747fbd351ba660b99640fcf20c68bb21d9bf3f8..95028de059d851a081b2ba8ab75f5dd29f0cbc2e 100644 (file)
--- 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 63279b01ce2133e3df4bdf7c08bbefe7309b74b4..2556e3b3ef39601a9a9ae6b5d072471483115204 100644 (file)
--- 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