ppc: Rework some hard-coded BOOTCOMMANDS

There are an assortment of hard-coded CONFIG_BOOTCOMMAND options in some
board headers.  Rework these so that they do not add to the CONFIG
namespace.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/include/configs/MPC8349EMDS.h b/include/configs/MPC8349EMDS.h
index 4831a8189cbea125d11ef5675cac0d9fae703f7a..959de73cf0c6624cf38b25c4acaf30727d4ca845 100644 (file)
--- a/include/configs/MPC8349EMDS.h
+++ b/include/configs/MPC8349EMDS.h
@@ -342,7 +342,7 @@
        "fdtfile=mpc834x_mds.dtb\0"                                     \
        ""
 
-#define CONFIG_NFSBOOTCOMMAND                                          \
+#define NFSBOOTCOMMAND                                         \
        "setenv bootargs root=/dev/nfs rw "                             \
                "nfsroot=$serverip:$rootpath "                          \
                "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:"   \
@@ -352,7 +352,7 @@
        "tftp $fdtaddr $fdtfile;"                                       \
        "bootm $loadaddr - $fdtaddr"
 
-#define CONFIG_RAMBOOTCOMMAND                                          \
+#define RAMBOOTCOMMAND                                         \
        "setenv bootargs root=/dev/ram rw "                             \
                "console=$consoledev,$baudrate $othbootargs;"           \
        "tftp $ramdiskaddr $ramdiskfile;"                               \

diff --git a/include/configs/MPC8349EMDS_SDRAM.h b/include/configs/MPC8349EMDS_SDRAM.h
index a59fc8062ab301d55feb0295970b18ef72e7bdc7..072c6a000f86cd1a67ee0126414f4d7bf775e905 100644 (file)
--- a/include/configs/MPC8349EMDS_SDRAM.h
+++ b/include/configs/MPC8349EMDS_SDRAM.h
@@ -399,7 +399,7 @@
        "fdtfile=mpc834x_mds.dtb\0"                                     \
        ""
 
-#define CONFIG_NFSBOOTCOMMAND                                          \
+#define NFSBOOTCOMMAND                                         \
        "setenv bootargs root=/dev/nfs rw "                             \
                "nfsroot=$serverip:$rootpath "                          \
                "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:"   \
@@ -409,7 +409,7 @@
        "tftp $fdtaddr $fdtfile;"                                       \
        "bootm $loadaddr - $fdtaddr"
 
-#define CONFIG_RAMBOOTCOMMAND                                          \
+#define RAMBOOTCOMMAND                                         \
        "setenv bootargs root=/dev/ram rw "                             \
                "console=$consoledev,$baudrate $othbootargs;"           \
        "tftp $ramdiskaddr $ramdiskfile;"                               \

diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h
index ab958d6cb24b19f7c4cb28a77d0007186b72ff3a..1d2389a1c60702fe2269841caf49f8b556c6c88a 100644 (file)
--- a/include/configs/MPC837XERDB.h
+++ b/include/configs/MPC837XERDB.h
@@ -387,7 +387,7 @@
                                                        "$netdev:off "  \
                "root=$rootdev rw console=$console,$baudrate $othbootargs\0"
 
-#define CONFIG_NFSBOOTCOMMAND                                          \
+#define NFSBOOTCOMMAND                                         \
        "setenv rootdev /dev/nfs;"                                      \
        "run setbootargs;"                                              \
        "run setipargs;"                                                \
@@ -395,7 +395,7 @@
        "tftp $fdtaddr $fdtfile;"                                       \
        "bootm $loadaddr - $fdtaddr"
 
-#define CONFIG_RAMBOOTCOMMAND                                          \
+#define RAMBOOTCOMMAND                                         \
        "setenv rootdev /dev/ram;"                                      \
        "run setbootargs;"                                              \
        "tftp $ramdiskaddr $ramdiskfile;"                               \

diff --git a/include/configs/MPC8540ADS.h b/include/configs/MPC8540ADS.h
index dacb4781769afba61fa0e78e9d17beccf584416f..db1d205f6fa9667cf847aafb255cac3c481bf001 100644 (file)
--- a/include/configs/MPC8540ADS.h
+++ b/include/configs/MPC8540ADS.h
@@ -327,7 +327,7 @@
    "fdtaddr=400000\0"                                                  \
    "fdtfile=your.fdt.dtb\0"
 
-#define CONFIG_NFSBOOTCOMMAND                                          \
+#define NFSBOOTCOMMAND                                         \
    "setenv bootargs root=/dev/nfs rw "                                  \
       "nfsroot=$serverip:$rootpath "                                    \
       "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off " \
@@ -336,7 +336,7 @@
    "tftp $fdtaddr $fdtfile;"                                           \
    "bootm $loadaddr - $fdtaddr"
 
-#define CONFIG_RAMBOOTCOMMAND \
+#define RAMBOOTCOMMAND \
    "setenv bootargs root=/dev/ram rw "                                  \
       "console=$consoledev,$baudrate $othbootargs;"                     \
    "tftp $ramdiskaddr $ramdiskfile;"                                    \
@@ -344,6 +344,6 @@
    "tftp $fdtaddr $fdtfile;"                                           \
    "bootm $loadaddr $ramdiskaddr $fdtaddr"
 
-#define CONFIG_BOOTCOMMAND  CONFIG_NFSBOOTCOMMAND
+#define CONFIG_BOOTCOMMAND  NFSBOOTCOMMAND
 
 #endif /* __CONFIG_H */

diff --git a/include/configs/MPC8548CDS.h b/include/configs/MPC8548CDS.h
index 3341b3bb4827aadd89a781d02cb3e5d635bd0c59..c8cba4d879fb2b2b7c8a6dde91fe6ea972d6e753 100644 (file)
--- a/include/configs/MPC8548CDS.h
+++ b/include/configs/MPC8548CDS.h
@@ -468,7 +468,7 @@ extern unsigned long get_clock_freq(void);
        "fdtaddr=1e00000\0"                     \
        "fdtfile=mpc8548cds.dtb\0"
 
-#define CONFIG_NFSBOOTCOMMAND                                          \
+#define NFSBOOTCOMMAND                                         \
    "setenv bootargs root=/dev/nfs rw "                                 \
       "nfsroot=$serverip:$rootpath "                                   \
       "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off " \
@@ -477,7 +477,7 @@ extern unsigned long get_clock_freq(void);
    "tftp $fdtaddr $fdtfile;"                                           \
    "bootm $loadaddr - $fdtaddr"
 
-#define CONFIG_RAMBOOTCOMMAND \
+#define RAMBOOTCOMMAND \
    "setenv bootargs root=/dev/ram rw "                                 \
       "console=$consoledev,$baudrate $othbootargs;"                    \
    "tftp $ramdiskaddr $ramdiskfile;"                                   \
@@ -485,6 +485,6 @@ extern unsigned long get_clock_freq(void);
    "tftp $fdtaddr $fdtfile;"                                           \
    "bootm $loadaddr $ramdiskaddr $fdtaddr"
 
-#define CONFIG_BOOTCOMMAND     CONFIG_NFSBOOTCOMMAND
+#define CONFIG_BOOTCOMMAND     NFSBOOTCOMMAND
 
 #endif /* __CONFIG_H */

diff --git a/include/configs/MPC8560ADS.h b/include/configs/MPC8560ADS.h
index f68418975e40eae16ea1369c1411b057acf78c81..186193c85c8e9716bae09ed0f588f4c0a69e17f6 100644 (file)
--- a/include/configs/MPC8560ADS.h
+++ b/include/configs/MPC8560ADS.h
@@ -316,7 +316,7 @@
        "fdtaddr=400000\0"                                              \
        "fdtfile=mpc8560ads.dtb\0"
 
-#define CONFIG_NFSBOOTCOMMAND                                          \
+#define NFSBOOTCOMMAND                                         \
        "setenv bootargs root=/dev/nfs rw "                             \
                "nfsroot=$serverip:$rootpath "                          \
                "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off " \
@@ -325,7 +325,7 @@
        "tftp $fdtaddr $fdtfile;"                                       \
        "bootm $loadaddr - $fdtaddr"
 
-#define CONFIG_RAMBOOTCOMMAND \
+#define RAMBOOTCOMMAND \
        "setenv bootargs root=/dev/ram rw "                             \
                "console=$consoledev,$baudrate $othbootargs;"           \
        "tftp $ramdiskaddr $ramdiskfile;"                               \
@@ -333,6 +333,6 @@
        "tftp $fdtaddr $fdtfile;"                                       \
        "bootm $loadaddr $ramdiskaddr $fdtaddr"
 
-#define CONFIG_BOOTCOMMAND  CONFIG_NFSBOOTCOMMAND
+#define CONFIG_BOOTCOMMAND  NFSBOOTCOMMAND
 
 #endif /* __CONFIG_H */

diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h
index b3fadc6da2c3df168c18f2c5cd65f5cae3b9e371..a222ec93b1e661e0c214d778b90ad57be6248caf 100644 (file)
--- a/include/configs/P1010RDB.h
+++ b/include/configs/P1010RDB.h
@@ -696,7 +696,7 @@ extern unsigned long get_sdram_size(void);
        "i2c mw 19 1 4; i2c mw 19 3 f3; reset\0"
 #endif
 
-#define CONFIG_RAMBOOTCOMMAND          \
+#define RAMBOOTCOMMAND         \
        "setenv bootargs root=/dev/ram rw "     \
        "console=$consoledev,$baudrate $othbootargs; "  \
        "tftp $ramdiskaddr $ramdiskfile;"       \
@@ -704,7 +704,7 @@ extern unsigned long get_sdram_size(void);
        "tftp $fdtaddr $fdtfile;"               \
        "bootm $loadaddr $ramdiskaddr $fdtaddr"
 
-#define CONFIG_BOOTCOMMAND CONFIG_RAMBOOTCOMMAND
+#define CONFIG_BOOTCOMMAND RAMBOOTCOMMAND
 
 #include <asm/fsl_secure_boot.h>
 

diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h
index 74008f69f5ca91cd870bd024f4a465e188bbd9a8..bc0172b7b105e1fd28e5d467032aaef17d21f58b 100644 (file)
--- a/include/configs/P2041RDB.h
+++ b/include/configs/P2041RDB.h
@@ -509,14 +509,14 @@ unsigned long get_board_sys_clk(unsigned long dummy);
        "fdtfile=p2041rdb/p2041rdb.dtb\0"                       \
        "bdev=sda3\0"
 
-#define CONFIG_HDBOOT                                  \
+#define HDBOOT                                 \
        "setenv bootargs root=/dev/$bdev rw "           \
        "console=$consoledev,$baudrate $othbootargs;"   \
        "tftp $loadaddr $bootfile;"                     \
        "tftp $fdtaddr $fdtfile;"                       \
        "bootm $loadaddr - $fdtaddr"
 
-#define CONFIG_NFSBOOTCOMMAND                  \
+#define NFSBOOTCOMMAND                 \
        "setenv bootargs root=/dev/nfs rw "     \
        "nfsroot=$serverip:$rootpath "          \
        "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off " \
@@ -525,7 +525,7 @@ unsigned long get_board_sys_clk(unsigned long dummy);
        "tftp $fdtaddr $fdtfile;"               \
        "bootm $loadaddr - $fdtaddr"
 
-#define CONFIG_RAMBOOTCOMMAND                          \
+#define RAMBOOTCOMMAND                         \
        "setenv bootargs root=/dev/ram rw "             \
        "console=$consoledev,$baudrate $othbootargs;"   \
        "tftp $ramdiskaddr $ramdiskfile;"               \
@@ -533,7 +533,7 @@ unsigned long get_board_sys_clk(unsigned long dummy);
        "tftp $fdtaddr $fdtfile;"                       \
        "bootm $loadaddr $ramdiskaddr $fdtaddr"
 
-#define CONFIG_BOOTCOMMAND             CONFIG_HDBOOT
+#define CONFIG_BOOTCOMMAND             HDBOOT
 
 #include <asm/fsl_secure_boot.h>
 

diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h
index 3d8c126a1ed1de2485c6313ea819696d51d4a621..95aafe1a322fbe4c0f6386c4d59bb8915402e42e 100644 (file)
--- a/include/configs/T102xRDB.h
+++ b/include/configs/T102xRDB.h
@@ -650,7 +650,7 @@ unsigned long get_board_ddr_clk(void);
        "fdtaddr=1e00000\0"                                     \
        "bdev=sda3\0"
 
-#define CONFIG_LINUX                                   \
+#define LINUXBOOTCOMMAND                                       \
        "setenv bootargs root=/dev/ram rw "             \
        "console=$consoledev,$baudrate $othbootargs;"   \
        "setenv ramdiskaddr 0x02000000;"                \
@@ -658,7 +658,7 @@ unsigned long get_board_ddr_clk(void);
        "setenv loadaddr 0x1000000;"                    \
        "bootm $loadaddr $ramdiskaddr $fdtaddr"
 
-#define CONFIG_NFSBOOTCOMMAND                  \
+#define NFSBOOTCOMMAND                 \
        "setenv bootargs root=/dev/nfs rw "     \
        "nfsroot=$serverip:$rootpath "          \
        "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off " \
@@ -667,7 +667,7 @@ unsigned long get_board_ddr_clk(void);
        "tftp $fdtaddr $fdtfile;"               \
        "bootm $loadaddr - $fdtaddr"
 
-#define CONFIG_BOOTCOMMAND     CONFIG_LINUX
+#define CONFIG_BOOTCOMMAND     LINUXBOOTCOMMAND
 
 #include <asm/fsl_secure_boot.h>
 

diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h
index b008fdf3b7ca05c111d2218d939fa41a8ef0bc01..2b6238e089957a3299a4311320c579d710ec50cc 100644 (file)
--- a/include/configs/T104xRDB.h
+++ b/include/configs/T104xRDB.h
@@ -727,7 +727,7 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
        "fdtfile=" __stringify(FDTFILE) "\0"                    \
        "bdev=sda3\0"
 
-#define CONFIG_LINUX                       \
+#define LINUXBOOTCOMMAND                       \
        "setenv bootargs root=/dev/ram rw "            \
        "console=$consoledev,$baudrate $othbootargs;"  \
        "setenv ramdiskaddr 0x02000000;"               \
@@ -735,14 +735,14 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
        "setenv loadaddr 0x1000000;"                   \
        "bootm $loadaddr $ramdiskaddr $fdtaddr"
 
-#define CONFIG_HDBOOT                                  \
+#define HDBOOT                                 \
        "setenv bootargs root=/dev/$bdev rw "           \
        "console=$consoledev,$baudrate $othbootargs;"   \
        "tftp $loadaddr $bootfile;"                     \
        "tftp $fdtaddr $fdtfile;"                       \
        "bootm $loadaddr - $fdtaddr"
 
-#define CONFIG_NFSBOOTCOMMAND                  \
+#define NFSBOOTCOMMAND                 \
        "setenv bootargs root=/dev/nfs rw "     \
        "nfsroot=$serverip:$rootpath "          \
        "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off " \
@@ -751,7 +751,7 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
        "tftp $fdtaddr $fdtfile;"               \
        "bootm $loadaddr - $fdtaddr"
 
-#define CONFIG_RAMBOOTCOMMAND                          \
+#define RAMBOOTCOMMAND                         \
        "setenv bootargs root=/dev/ram rw "             \
        "console=$consoledev,$baudrate $othbootargs;"   \
        "tftp $ramdiskaddr $ramdiskfile;"               \
@@ -759,7 +759,7 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg
        "tftp $fdtaddr $fdtfile;"                       \
        "bootm $loadaddr $ramdiskaddr $fdtaddr"
 
-#define CONFIG_BOOTCOMMAND             CONFIG_LINUX
+#define CONFIG_BOOTCOMMAND             LINUXBOOTCOMMAND
 
 #include <asm/fsl_secure_boot.h>
 

diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h
index 99f5971489c93f25e0852e4411e94f9ad7c59f33..cd729cf0c792a532d4a1a7fc4b5ae7fda32bf303 100644 (file)
--- a/include/configs/T208xQDS.h
+++ b/include/configs/T208xQDS.h
@@ -644,7 +644,7 @@ unsigned long get_board_ddr_clk(void);
  * For emulation this causes u-boot to jump to the start of the
  * proof point app code automatically
  */
-#define CONFIG_PROOF_POINTS                            \
+#define PROOF_POINTS                           \
        "setenv bootargs root=/dev/$bdev rw "           \
        "console=$consoledev,$baudrate $othbootargs;"   \
        "cpu 1 release 0x29000000 - - -;"               \
@@ -656,11 +656,11 @@ unsigned long get_board_ddr_clk(void);
        "cpu 7 release 0x29000000 - - -;"               \
        "go 0x29000000"
 
-#define CONFIG_HVBOOT                          \
+#define HVBOOT                         \
        "setenv bootargs config-addr=0x60000000; "      \
        "bootm 0x01000000 - 0x00f00000"
 
-#define CONFIG_ALU                             \
+#define ALU                            \
        "setenv bootargs root=/dev/$bdev rw "           \
        "console=$consoledev,$baudrate $othbootargs;"   \
        "cpu 1 release 0x01000000 - - -;"               \
@@ -672,7 +672,7 @@ unsigned long get_board_ddr_clk(void);
        "cpu 7 release 0x01000000 - - -;"               \
        "go 0x01000000"
 
-#define CONFIG_LINUX                           \
+#define LINUXBOOTCOMMAND                               \
        "setenv bootargs root=/dev/ram rw "             \
        "console=$consoledev,$baudrate $othbootargs;"   \
        "setenv ramdiskaddr 0x02000000;"                \
@@ -680,14 +680,14 @@ unsigned long get_board_ddr_clk(void);
        "setenv loadaddr 0x1000000;"                    \
        "bootm $loadaddr $ramdiskaddr $fdtaddr"
 
-#define CONFIG_HDBOOT                                  \
+#define HDBOOT                                 \
        "setenv bootargs root=/dev/$bdev rw "           \
        "console=$consoledev,$baudrate $othbootargs;"   \
        "tftp $loadaddr $bootfile;"                     \
        "tftp $fdtaddr $fdtfile;"                       \
        "bootm $loadaddr - $fdtaddr"
 
-#define CONFIG_NFSBOOTCOMMAND                  \
+#define NFSBOOTCOMMAND                 \
        "setenv bootargs root=/dev/nfs rw "     \
        "nfsroot=$serverip:$rootpath "          \
        "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off " \
@@ -696,7 +696,7 @@ unsigned long get_board_ddr_clk(void);
        "tftp $fdtaddr $fdtfile;"               \
        "bootm $loadaddr - $fdtaddr"
 
-#define CONFIG_RAMBOOTCOMMAND                          \
+#define RAMBOOTCOMMAND                         \
        "setenv bootargs root=/dev/ram rw "             \
        "console=$consoledev,$baudrate $othbootargs;"   \
        "tftp $ramdiskaddr $ramdiskfile;"               \
@@ -704,7 +704,7 @@ unsigned long get_board_ddr_clk(void);
        "tftp $fdtaddr $fdtfile;"                       \
        "bootm $loadaddr $ramdiskaddr $fdtaddr"
 
-#define CONFIG_BOOTCOMMAND             CONFIG_LINUX
+#define CONFIG_BOOTCOMMAND             LINUXBOOTCOMMAND
 
 #include <asm/fsl_secure_boot.h>
 

diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h
index 0813ffbc600c166ae456cfe9d48542934b4a71ee..be8ead70da57bf90876f3aed65af0c685ad13f58 100644 (file)
--- a/include/configs/T208xRDB.h
+++ b/include/configs/T208xRDB.h
@@ -593,7 +593,7 @@ unsigned long get_board_ddr_clk(void);
  * For emulation this causes u-boot to jump to the start of the
  * proof point app code automatically
  */
-#define CONFIG_PROOF_POINTS                            \
+#define PROOF_POINTS                           \
        "setenv bootargs root=/dev/$bdev rw "           \
        "console=$consoledev,$baudrate $othbootargs;"   \
        "cpu 1 release 0x29000000 - - -;"               \
@@ -605,11 +605,11 @@ unsigned long get_board_ddr_clk(void);
        "cpu 7 release 0x29000000 - - -;"               \
        "go 0x29000000"
 
-#define CONFIG_HVBOOT                          \
+#define HVBOOT                         \
        "setenv bootargs config-addr=0x60000000; "      \
        "bootm 0x01000000 - 0x00f00000"
 
-#define CONFIG_ALU                             \
+#define ALU                            \
        "setenv bootargs root=/dev/$bdev rw "           \
        "console=$consoledev,$baudrate $othbootargs;"   \
        "cpu 1 release 0x01000000 - - -;"               \
@@ -621,7 +621,7 @@ unsigned long get_board_ddr_clk(void);
        "cpu 7 release 0x01000000 - - -;"               \
        "go 0x01000000"
 
-#define CONFIG_LINUX                           \
+#define LINUXBOOTCOMMAND                               \
        "setenv bootargs root=/dev/ram rw "             \
        "console=$consoledev,$baudrate $othbootargs;"   \
        "setenv ramdiskaddr 0x02000000;"                \
@@ -629,14 +629,14 @@ unsigned long get_board_ddr_clk(void);
        "setenv loadaddr 0x1000000;"                    \
        "bootm $loadaddr $ramdiskaddr $fdtaddr"
 
-#define CONFIG_HDBOOT                                  \
+#define HDBOOT                                 \
        "setenv bootargs root=/dev/$bdev rw "           \
        "console=$consoledev,$baudrate $othbootargs;"   \
        "tftp $loadaddr $bootfile;"                     \
        "tftp $fdtaddr $fdtfile;"                       \
        "bootm $loadaddr - $fdtaddr"
 
-#define CONFIG_NFSBOOTCOMMAND                  \
+#define NFSBOOTCOMMAND                 \
        "setenv bootargs root=/dev/nfs rw "     \
        "nfsroot=$serverip:$rootpath "          \
        "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off " \
@@ -645,7 +645,7 @@ unsigned long get_board_ddr_clk(void);
        "tftp $fdtaddr $fdtfile;"               \
        "bootm $loadaddr - $fdtaddr"
 
-#define CONFIG_RAMBOOTCOMMAND                          \
+#define RAMBOOTCOMMAND                         \
        "setenv bootargs root=/dev/ram rw "             \
        "console=$consoledev,$baudrate $othbootargs;"   \
        "tftp $ramdiskaddr $ramdiskfile;"               \
@@ -653,7 +653,7 @@ unsigned long get_board_ddr_clk(void);
        "tftp $fdtaddr $fdtfile;"                       \
        "bootm $loadaddr $ramdiskaddr $fdtaddr"
 
-#define CONFIG_BOOTCOMMAND             CONFIG_LINUX
+#define CONFIG_BOOTCOMMAND             LINUXBOOTCOMMAND
 
 #include <asm/fsl_secure_boot.h>
 

diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h
index 09ae468a866b8ad95cf46ca01982d1183deb4e2d..839a7c50f8939514c9ac983bb4b616ff16759e3d 100644 (file)
--- a/include/configs/T4240RDB.h
+++ b/include/configs/T4240RDB.h
@@ -237,7 +237,7 @@
 /* default location for tftp and bootm */
 #define CONFIG_LOADADDR                1000000
 
-#define CONFIG_HVBOOT                                  \
+#define HVBOOT                                 \
        "setenv bootargs config-addr=0x60000000; "      \
        "bootm 0x01000000 - 0x00f00000"
 
@@ -586,11 +586,11 @@ unsigned long get_board_ddr_clk(void);
        "fdtfile=t4240rdb/t4240rdb.dtb\0"                       \
        "bdev=sda3\0"
 
-#define CONFIG_HVBOOT                                  \
+#define HVBOOT                                 \
        "setenv bootargs config-addr=0x60000000; "      \
        "bootm 0x01000000 - 0x00f00000"
 
-#define CONFIG_LINUX                                   \
+#define LINUXBOOTCOMMAND                                       \
        "setenv bootargs root=/dev/ram rw "             \
        "console=$consoledev,$baudrate $othbootargs;"   \
        "setenv ramdiskaddr 0x02000000;"                \
@@ -598,14 +598,14 @@ unsigned long get_board_ddr_clk(void);
        "setenv loadaddr 0x1000000;"                    \
        "bootm $loadaddr $ramdiskaddr $fdtaddr"
 
-#define CONFIG_HDBOOT                                  \
+#define HDBOOT                                 \
        "setenv bootargs root=/dev/$bdev rw "           \
        "console=$consoledev,$baudrate $othbootargs;"   \
        "tftp $loadaddr $bootfile;"                     \
        "tftp $fdtaddr $fdtfile;"                       \
        "bootm $loadaddr - $fdtaddr"
 
-#define CONFIG_NFSBOOTCOMMAND                  \
+#define NFSBOOTCOMMAND                 \
        "setenv bootargs root=/dev/nfs rw "     \
        "nfsroot=$serverip:$rootpath "          \
        "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off " \
@@ -614,7 +614,7 @@ unsigned long get_board_ddr_clk(void);
        "tftp $fdtaddr $fdtfile;"               \
        "bootm $loadaddr - $fdtaddr"
 
-#define CONFIG_RAMBOOTCOMMAND                          \
+#define RAMBOOTCOMMAND                         \
        "setenv bootargs root=/dev/ram rw "             \
        "console=$consoledev,$baudrate $othbootargs;"   \
        "tftp $ramdiskaddr $ramdiskfile;"               \
@@ -622,7 +622,7 @@ unsigned long get_board_ddr_clk(void);
        "tftp $fdtaddr $fdtfile;"                       \
        "bootm $loadaddr $ramdiskaddr $fdtaddr"
 
-#define CONFIG_BOOTCOMMAND             CONFIG_LINUX
+#define CONFIG_BOOTCOMMAND             LINUXBOOTCOMMAND
 
 #include <asm/fsl_secure_boot.h>
 

diff --git a/include/configs/controlcenterdc.h b/include/configs/controlcenterdc.h
index 3b17f75d209348197981e38dd2c7f937429096a8..d03527f40f27a200df7ee3dbfbd5a07677e3bc87 100644 (file)
--- a/include/configs/controlcenterdc.h
+++ b/include/configs/controlcenterdc.h
@@ -134,7 +134,7 @@
                " gpio clear ${gpio1}; gpio set ${gpio2};"                      \
                " fi; sleep 0.12; done\0"
 
-#define CONFIG_NFSBOOTCOMMAND                                                          \
+#define NFSBOOTCOMMAND                                                         \
        "setenv bootargs root=/dev/nfs rw "                                             \
        "nfsroot=${serverip}:${rootpath} "                                              \
        "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}:${netdev}:off "   \
@@ -142,7 +142,7 @@
        "tftpboot ${bootfile_addr} ${bootfile}; "                                               \
        "bootm ${bootfile_addr}"
 
-#define CONFIG_MMCBOOTCOMMAND                                  \
+#define MMCBOOTCOMMAND                                 \
        "setenv bootargs root=/dev/mmcblk0p3 rw rootwait "      \
        "console=${consoledev},${baudrate} ${othbootargs}; "    \
        "ext2load mmc 0:2 ${bootfile_addr} ${bootfile}; "       \

diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index 58c1e9157335930244962434d3d564088b757609..bed469e8825ed3462cbe4f70d770a74aec221fa3 100644 (file)
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -523,14 +523,14 @@
        "fdtfile=p4080ds/p4080ds.dtb\0"                         \
        "bdev=sda3\0"
 
-#define CONFIG_HDBOOT                                  \
+#define HDBOOT                                 \
        "setenv bootargs root=/dev/$bdev rw "           \
        "console=$consoledev,$baudrate $othbootargs;"   \
        "tftp $loadaddr $bootfile;"                     \
        "tftp $fdtaddr $fdtfile;"                       \
        "bootm $loadaddr - $fdtaddr"
 
-#define CONFIG_NFSBOOTCOMMAND                  \
+#define NFSBOOTCOMMAND                 \
        "setenv bootargs root=/dev/nfs rw "     \
        "nfsroot=$serverip:$rootpath "          \
        "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off " \
@@ -539,7 +539,7 @@
        "tftp $fdtaddr $fdtfile;"               \
        "bootm $loadaddr - $fdtaddr"
 
-#define CONFIG_RAMBOOTCOMMAND                          \
+#define RAMBOOTCOMMAND                         \
        "setenv bootargs root=/dev/ram rw "             \
        "console=$consoledev,$baudrate $othbootargs;"   \
        "tftp $ramdiskaddr $ramdiskfile;"               \
@@ -547,7 +547,7 @@
        "tftp $fdtaddr $fdtfile;"                       \
        "bootm $loadaddr $ramdiskaddr $fdtaddr"
 
-#define CONFIG_BOOTCOMMAND             CONFIG_HDBOOT
+#define CONFIG_BOOTCOMMAND             HDBOOT
 
 #include <asm/fsl_secure_boot.h>
 

diff --git a/include/configs/gazerbeam.h b/include/configs/gazerbeam.h
index 560d6a3d10a211dca28c67b66ac5ea7fbbf1074f..f031f154f8dfff9f676705706f464982304e76ef 100644 (file)
--- a/include/configs/gazerbeam.h
+++ b/include/configs/gazerbeam.h
@@ -105,7 +105,7 @@
                __stringify(CONFIG_SYS_MONITOR_BASE) " ${filesize}\0"   \
        "upd=run load update\0"                                         \
 
-#define CONFIG_NFSBOOTCOMMAND                                          \
+#define NFSBOOTCOMMAND                                         \
        "setenv bootargs root=/dev/nfs rw "                             \
        "nfsroot=$serverip:$rootpath "                                  \
        "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off " \
@@ -114,13 +114,13 @@
        "tftp ${fdt_addr} $fdtfile;"                                    \
        "bootm ${kernel_addr} - ${fdt_addr}"
 
-#define CONFIG_MMCBOOTCOMMAND                                          \
+#define MMCBOOTCOMMAND                                         \
        "setenv bootargs root=/dev/mmcblk0p3 rw rootwait "              \
        "console=$consoledev,$baudrate $othbootargs;"                   \
        "ext2load mmc 0:2 ${kernel_addr} $bootfile;"                    \
        "ext2load mmc 0:2 ${fdt_addr} $fdtfile;"                        \
        "bootm ${kernel_addr} - ${fdt_addr}"
 
-#define CONFIG_BOOTCOMMAND             CONFIG_MMCBOOTCOMMAND
+#define CONFIG_BOOTCOMMAND             MMCBOOTCOMMAND
 
 #endif /* __CONFIG_H */

diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h
index 5be3a49d05f7377fb582dee2b54a7e6b8547f7a6..8570b928518353739c5e0d1224c2822d3dead002 100644 (file)
--- a/include/configs/ge_bx50v3.h
+++ b/include/configs/ge_bx50v3.h
@@ -53,7 +53,7 @@
                 "nfs ${loadaddr} /srv/nfs/fitImage; " \
                 "bootm ${loadaddr}\0" \
 
-#define CONFIG_NETWORKBOOTCOMMAND \
+#define NETWORKBOOTCOMMAND \
        "run networkboot; " \
 
 #else
@@ -108,14 +108,14 @@
                "run doboot; " \
                "run failbootcmd\0" \
 
-#define CONFIG_MMCBOOTCOMMAND \
+#define MMCBOOTCOMMAND \
        "run doquiet; " \
        "run tryboot; " \
 
 #ifdef CONFIG_CMD_NFS
-#define CONFIG_BOOTCOMMAND CONFIG_NETWORKBOOTCOMMAND
+#define CONFIG_BOOTCOMMAND NETWORKBOOTCOMMAND
 #else
-#define CONFIG_BOOTCOMMAND CONFIG_MMCBOOTCOMMAND
+#define CONFIG_BOOTCOMMAND MMCBOOTCOMMAND
 #endif
 
 

diff --git a/include/configs/ids8313.h b/include/configs/ids8313.h
index b9d2fe3146c75ecbc25b7992a9b6723d2f74f9ce..d4f4910b31b780156bf28d480a3db6addb8727f2 100644 (file)
--- a/include/configs/ids8313.h
+++ b/include/configs/ids8313.h
@@ -279,7 +279,7 @@
        "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0"                                \
        "\0"
 
-#define CONFIG_NFSBOOTCOMMAND                                          \
+#define NFSBOOTCOMMAND                                         \
        "setenv rootdev /dev/nfs;"                                      \
        "run setipargs;run addmtd;"                                     \
        "tftp ${loadaddr} ${bootfile};"                         \

diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h
index b1e6a5638b6cc46237a327226ecbc5af5271d59d..dae3a5c5380fbaff089fb3815db8f87a47ce6bf8 100644 (file)
--- a/include/configs/mx53ppd.h
+++ b/include/configs/mx53ppd.h
@@ -102,11 +102,11 @@
        "video-mode=" \
                "lcd:800x480-24@60,monitor=lcd\0" \
 
-#define CONFIG_MMCBOOTCOMMAND \
+#define MMCBOOTCOMMAND \
        "run doquiet; " \
        "run tryboot; " \
 
-#define CONFIG_BOOTCOMMAND CONFIG_MMCBOOTCOMMAND
+#define CONFIG_BOOTCOMMAND MMCBOOTCOMMAND
 
 #define CONFIG_ARP_TIMEOUT     200UL
 

diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index cb3dcc0c33af6375da354ad2453100b6b8c786a0..c1571c2235e51737d5d8a151e578ba8dfd819695 100644 (file)
--- a/include/configs/p1_p2_rdb_pc.h
+++ b/include/configs/p1_p2_rdb_pc.h
@@ -675,7 +675,7 @@ __stringify(__SD_RST_CMD)"\0" \
 __stringify(__NAND_RST_CMD)"\0" \
 __stringify(__PCIE_RST_CMD)"\0"
 
-#define CONFIG_NFSBOOTCOMMAND  \
+#define NFSBOOTCOMMAND \
 "setenv bootargs root=/dev/nfs rw "    \
 "nfsroot=$serverip:$rootpath " \
 "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off " \
@@ -684,7 +684,7 @@ __stringify(__PCIE_RST_CMD)"\0"
 "tftp $fdtaddr $fdtfile;"      \
 "bootm $loadaddr - $fdtaddr"
 
-#define CONFIG_HDBOOT  \
+#define HDBOOT \
 "setenv bootargs root=/dev/$bdev rw rootdelay=30 "     \
 "console=$consoledev,$baudrate $othbootargs;" \
 "usb start;"   \
@@ -717,7 +717,7 @@ __stringify(__PCIE_RST_CMD)"\0"
 "console=$consoledev,$baudrate rootfstype=jffs2 $othbootargs;" \
 "bootm $norbootaddr - $norfdtaddr"
 
-#define CONFIG_RAMBOOTCOMMAND  \
+#define RAMBOOTCOMMAND \
 "setenv bootargs root=/dev/ram rw "    \
 "console=$consoledev,$baudrate $othbootargs " \
 "ramdisk_size=$ramdisk_size;"  \
@@ -726,6 +726,6 @@ __stringify(__PCIE_RST_CMD)"\0"
 "tftp $fdtaddr $fdtfile;"      \
 "bootm $loadaddr $ramdiskaddr $fdtaddr"
 
-#define CONFIG_BOOTCOMMAND     CONFIG_HDBOOT
+#define CONFIG_BOOTCOMMAND     HDBOOT
 
 #endif /* __CONFIG_H */

diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h
index 5e8637e4948489a5010951403c5cb38ebf92063b..009a11cd887a602e52f23caf935bd2902ef8e62d 100644 (file)
--- a/include/configs/smartweb.h
+++ b/include/configs/smartweb.h
@@ -101,7 +101,7 @@
 
 /* BOOTP and DHCP options */
 #define CONFIG_BOOTP_BOOTFILESIZE
-#define CONFIG_NFSBOOTCOMMAND                                          \
+#define NFSBOOTCOMMAND                                         \
        "setenv autoload yes; setenv autoboot yes; "                    \
        "setenv bootargs ${basicargs} ${mtdparts} "                     \
        "root=/dev/nfs ip=dhcp nfsroot=${serverip}:/srv/nfs/rootfs; "   \

diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h
index 12028e53e94819212ed969181a65cc1dce44ace6..a81fa9db017c78418bee785ee26db3bfb89b5a1a 100644 (file)
--- a/include/configs/uniphier.h
+++ b/include/configs/uniphier.h
@@ -84,7 +84,7 @@
 #endif
 
 #define CONFIG_ROOTPATH                        "/nfs/root/path"
-#define CONFIG_NFSBOOTCOMMAND                                          \
+#define NFSBOOTCOMMAND                                         \
        "setenv bootargs $bootargs root=/dev/nfs rw "                   \
        "nfsroot=$serverip:$rootpath "                                  \
        "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off;" \

diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h
index ab39b0bbbe8c75b5484b5f41492366bae05e8071..f6ff0c6d21fe979ab3c750d05d0571f9659d6f16 100644 (file)
--- a/include/configs/x86-common.h
+++ b/include/configs/x86-common.h
@@ -109,7 +109,7 @@
        "ramdiskfile=initramfs.gz\0"
 
 
-#define CONFIG_RAMBOOTCOMMAND                          \
+#define RAMBOOTCOMMAND                         \
        "setenv bootargs root=/dev/ram rw "             \
        "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off " \
        "console=$consoledev,$baudrate $othbootargs;"   \
@@ -117,7 +117,7 @@
        "tftpboot $ramdisk_addr_r $ramdiskfile;"        \
        "zboot $kernel_addr_r 0 $ramdisk_addr_r $filesize"
 
-#define CONFIG_NFSBOOTCOMMAND                          \
+#define NFSBOOTCOMMAND                         \
        "setenv bootargs root=/dev/nfs rw "             \
        "nfsroot=$serverip:$rootpath "                  \
        "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off " \