Adjust "echo" as a default command

Patch by Sam Song, 19 Jun 2005

diff --git a/CHANGELOG b/CHANGELOG
index e532b04ed93a3564c6c402b0b83df26ed5aa0600..18f01cb3713bd0cfd679d44763807bd78416ebbc 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -2,6 +2,9 @@
 Changes since U-Boot 1.1.4:
 ======================================================================
 
+* Adjust "echo" as a default command
+  Patch by Sam Song, 19 Jun 2005
+
 * Fix PCIDF calculation in cpu/mpc8260/speed.c for MPC8280EC
   Patch by KokHow Teh, 16 Jun 2005
 

diff --git a/README b/README
index 6f610082224e54fc0a31246cdea7ad688df1e6d1..962ab52aa10958b1a1a6d62409b7dbd361594f86 100644 (file)
--- a/README
+++ b/README
@@ -606,7 +606,7 @@ The following options need to be configured:
                CFG_CMD_DIAG    * Diagnostics
                CFG_CMD_DOC     * Disk-On-Chip Support
                CFG_CMD_DTT     * Digital Therm and Thermostat
-               CFG_CMD_ECHO    * echo arguments
+               CFG_CMD_ECHO      echo arguments
                CFG_CMD_EEPROM  * EEPROM read/write support
                CFG_CMD_ELF     * bootelf, bootvx
                CFG_CMD_ENV       saveenv

diff --git a/common/command.c b/common/command.c
index 2b4c5547b31af616f5599e475790935823d04344..e917975a7331d21f6cf02efad21660ac2e060c77 100644 (file)
--- a/common/command.c
+++ b/common/command.c
@@ -42,6 +42,8 @@ U_BOOT_CMD(
        NULL
 );
 
+#if (CONFIG_COMMANDS & CFG_CMD_ECHO)
+
 int
 do_echo (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
@@ -74,6 +76,8 @@ U_BOOT_CMD(
        "    - echo args to console; \\c suppresses newline\n"
 );
 
+#endif /*  CFG_CMD_ECHO */
+
 #ifdef CFG_HUSH_PARSER
 
 int

diff --git a/include/cmd_confdefs.h b/include/cmd_confdefs.h
index 9ee4849611c3cf812027d979ea6b7eba28d2bf58..cf36583108c7bd1513eb1f1863fc1eb4053a66b9 100644 (file)
--- a/include/cmd_confdefs.h
+++ b/include/cmd_confdefs.h
@@ -112,7 +112,6 @@
                        CFG_CMD_DISPLAY | \
                        CFG_CMD_DOC     | \
                        CFG_CMD_DTT     | \
-                       CFG_CMD_ECHO    | \
                        CFG_CMD_EEPROM  | \
                        CFG_CMD_ELF     | \
                        CFG_CMD_EXT2    | \

diff --git a/include/configs/ISPAN.h b/include/configs/ISPAN.h
index 65056a21eee92a96e5c75e7cb6c39249c2f857e6..706bdb94f57ddd038ba9418b3a58c57a6e298b60 100644 (file)
--- a/include/configs/ISPAN.h
+++ b/include/configs/ISPAN.h
@@ -109,7 +109,6 @@
 #define CONFIG_COMMANDS                ( CONFIG_CMD_DFL  \
                                | CFG_CMD_ASKENV  \
                                | CFG_CMD_DHCP    \
-                               | CFG_CMD_ECHO    \
                                | CFG_CMD_IMMAP   \
                                | CFG_CMD_MII     \
                                | CFG_CMD_PING    \

diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h
index 1f01e7be0b0a3711450b2e824e27df4ff23fbde2..7e57a0fae1497c9afba1960aa688f16f0bd341dc 100644 (file)
--- a/include/configs/MIP405.h
+++ b/include/configs/MIP405.h
@@ -58,7 +58,6 @@
                        CFG_CMD_CACHE   | \
                        CFG_CMD_DATE    | \
                        CFG_CMD_DHCP    | \
-                       CFG_CMD_ECHO    | \
                        CFG_CMD_EEPROM  | \
                        CFG_CMD_ELF     | \
                        CFG_CMD_FAT     | \

diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h
index 091b768a99203d5e23fc73ed315d8a3ea6a362bb..806e95f48083d2c943652fbf87309d5f09de0726 100644 (file)
--- a/include/configs/PIP405.h
+++ b/include/configs/PIP405.h
@@ -50,7 +50,6 @@
                        CFG_CMD_PCI     | \
                        CFG_CMD_CACHE   | \
                        CFG_CMD_IRQ     | \
-                       CFG_CMD_ECHO    | \
                        CFG_CMD_EEPROM  | \
                        CFG_CMD_I2C     | \
                        CFG_CMD_REGINFO | \

diff --git a/include/configs/RPXsuper.h b/include/configs/RPXsuper.h
index 6ae9403c4690ce705c3aa2211a6299166f95b545..45907aa0e79f562d05e820f80fcf967445875e55 100644 (file)
--- a/include/configs/RPXsuper.h
+++ b/include/configs/RPXsuper.h
@@ -154,7 +154,6 @@
 #define CONFIG_COMMANDS         ( CONFIG_CMD_DFL | \
                                  CFG_CMD_IMMAP  | \
                                  CFG_CMD_ASKENV | \
-                                 CFG_CMD_ECHO   | \
                                  CFG_CMD_I2C    | \
                                  CFG_CMD_REGINFO & \
                                 ~CFG_CMD_KGDB )

diff --git a/include/configs/Rattler.h b/include/configs/Rattler.h
index a170f290e0e876cb0ed718c1d7fff19fadf28d72..dbc57e8b271cd9742ee979da0d82be72a81ecbad 100644 (file)
--- a/include/configs/Rattler.h
+++ b/include/configs/Rattler.h
@@ -127,7 +127,6 @@
 
 #define CONFIG_COMMANDS                (CONFIG_CMD_DFL   \
                                | CFG_CMD_DHCP    \
-                               | CFG_CMD_ECHO    \
                                | CFG_CMD_IMMAP   \
                                | CFG_CMD_JFFS2   \
                                | CFG_CMD_MII     \

diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h
index 5ad19394817fed4b3ce3bec0e6815c4ffe140a18..6020998ae20bc0e567aa1c72b90b423372c344d2 100644 (file)
--- a/include/configs/TQM5200.h
+++ b/include/configs/TQM5200.h
@@ -161,7 +161,6 @@
                                CFG_CMD_ASKENV  | \
                                CFG_CMD_DATE    | \
                                CFG_CMD_DHCP    | \
-                               CFG_CMD_ECHO    | \
                                CFG_CMD_EEPROM  | \
                                CFG_CMD_I2C     | \
                                CFG_CMD_JFFS2   | \

diff --git a/include/configs/gw8260.h b/include/configs/gw8260.h
index 6c080437ffa91325efdfa3a1cabd1629c873951c..4f83b1945d305ac0943c78a4031db34b090d949e 100644 (file)
--- a/include/configs/gw8260.h
+++ b/include/configs/gw8260.h
@@ -305,7 +305,6 @@
                               CFG_CMD_BEDBUG  | \
                               CFG_CMD_ELF | \
                               CFG_CMD_ASKENV  | \
-                              CFG_CMD_ECHO    | \
                               CFG_CMD_REGINFO | \
                               CFG_CMD_IMMAP   | \
                               CFG_CMD_MII)

diff --git a/include/configs/ppmc8260.h b/include/configs/ppmc8260.h
index 757922210244c0c2f8fe934853694f71a8081879..d671dccc19b7b7464c96210728c8d7b6bd7da285 100644 (file)
--- a/include/configs/ppmc8260.h
+++ b/include/configs/ppmc8260.h
@@ -279,7 +279,6 @@
 #define CONFIG_COMMANDS                (((CONFIG_CMD_DFL & ~(CFG_CMD_KGDB))) | \
                                CFG_CMD_ELF     | \
                                CFG_CMD_ASKENV  | \
-                               CFG_CMD_ECHO    | \
                                CFG_CMD_REGINFO | \
                                CFG_CMD_MEMTEST | \
                                CFG_CMD_MII     | \

diff --git a/include/configs/sacsng.h b/include/configs/sacsng.h
index 4e0cfdb4c36244a81eabf1261a50d196d5f590ee..97b52fa1ae7940ad00c89dd424853e510a4755ae 100644 (file)
--- a/include/configs/sacsng.h
+++ b/include/configs/sacsng.h
@@ -507,7 +507,6 @@
 # define CONFIG_COMMANDS       (((CONFIG_CMD_DFL & ~(CFG_CMD_KGDB))) | \
                                CFG_CMD_ELF     | \
                                CFG_CMD_ASKENV  | \
-                               CFG_CMD_ECHO    | \
                                CFG_CMD_I2C     | \
                                CFG_CMD_SPI     | \
                                CFG_CMD_SDRAM   | \
@@ -520,7 +519,6 @@
 # define CONFIG_COMMANDS       (((CONFIG_CMD_DFL & ~(CFG_CMD_KGDB))) | \
                                CFG_CMD_ELF     | \
                                CFG_CMD_ASKENV  | \
-                               CFG_CMD_ECHO    | \
                                CFG_CMD_I2C     | \
                                CFG_CMD_SPI     | \
                                CFG_CMD_SDRAM   | \

diff --git a/include/configs/sbc8260.h b/include/configs/sbc8260.h
index 180ce057d7921fda1e5408cf7690abe8ba938586..9cf0654be10e19555fe74f2d1a055af45b0f57d3 100644 (file)
--- a/include/configs/sbc8260.h
+++ b/include/configs/sbc8260.h
@@ -448,7 +448,6 @@
 #ifdef CONFIG_ETHER_ON_FCC
 # define CONFIG_COMMANDS       (((CONFIG_CMD_DFL & ~(CFG_CMD_KGDB))) | \
                                CFG_CMD_ASKENV  | \
-                               CFG_CMD_ECHO    | \
                                CFG_CMD_ELF     | \
                                CFG_CMD_I2C     | \
                                CFG_CMD_IMMAP   | \
@@ -459,7 +458,6 @@
 #else
 # define CONFIG_COMMANDS       (((CONFIG_CMD_DFL & ~(CFG_CMD_KGDB))) | \
                                CFG_CMD_ASKENV  | \
-                               CFG_CMD_ECHO    | \
                                CFG_CMD_ELF     | \
                                CFG_CMD_I2C     | \
                                CFG_CMD_IMMAP   | \

diff --git a/include/configs/utx8245.h b/include/configs/utx8245.h
index d312b6559ad3cc2b6969fd7fec8ad9c846ff582e..e5d4397d2c74c9e4f71b26dcd2c327013dbd0c9a 100644 (file)
--- a/include/configs/utx8245.h
+++ b/include/configs/utx8245.h
@@ -91,7 +91,6 @@ protect on ${u-boot_startaddr} ${u-boot_endaddr}"
                                                                | CFG_CMD_ENV | CFG_CMD_CONSOLE \
                                                                | CFG_CMD_LOADS | CFG_CMD_LOADB \
                                                                | CFG_CMD_IMI | CFG_CMD_CACHE \
-                                                               | CFG_CMD_RUN | CFG_CMD_ECHO \
                                                                | CFG_CMD_REGINFO | CFG_CMD_NET\
                                                                | CFG_CMD_DHCP | CFG_CMD_I2C \
                                                                | CFG_CMD_DATE)