ppc: Rework some hard-coded BOOTCOMMANDS
PATCH 1/1 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 <[email protected]>
--- include/configs/MPC8349EMDS.h | 4 ++-- include/configs/MPC8349EMDS_SDRAM.h | 4 ++-- include/configs/MPC837XERDB.h | 4 ++-- include/configs/MPC8540ADS.h | 6 +++--- include/configs/MPC8548CDS.h | 6 +++--- include/configs/MPC8560ADS.h | 6 +++--- include/configs/P1010RDB.h | 4 ++-- include/configs/P2041RDB.h | 8 ++++---- include/configs/T102xRDB.h | 6 +++--- include/configs/T104xRDB.h | 10 +++++----- include/configs/T208xQDS.h | 16 ++++++++-------- include/configs/T208xRDB.h | 16 ++++++++-------- include/configs/T4240RDB.h | 14 +++++++------- include/configs/controlcenterdc.h | 4 ++-- include/configs/corenet_ds.h | 8 ++++---- include/configs/gazerbeam.h | 6 +++--- include/configs/ge_bx50v3.h | 8 ++++---- include/configs/ids8313.h | 2 +- include/configs/mx53ppd.h | 4 ++-- include/configs/p1_p2_rdb_pc.h | 8 ++++---- include/configs/smartweb.h | 2 +- include/configs/uniphier.h | 2 +- include/configs/x86-common.h | 4 ++-- 23 files changed, 76 insertions(+), 76 deletions(-)
include/configs/MPC8349EMDS.h +2 -2
@@ -350,7 +350,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:" \
@@ -360,7 +360,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;" \
include/configs/MPC8349EMDS_SDRAM.h +2 -2
@@ -407,7 +407,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:" \
@@ -417,7 +417,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;" \
include/configs/MPC837XERDB.h +2 -2
@@ -392,7 +392,7 @@"$netdev:off " \"root=$rootdev rw console=$console,$baudrate $othbootargs\0" -#define CONFIG_NFSBOOTCOMMAND \ +#define NFSBOOTCOMMAND \"setenv rootdev /dev/nfs;" \"run setbootargs;" \"run setipargs;" \
@@ -400,7 +400,7 @@"tftp $fdtaddr $fdtfile;" \"bootm $loadaddr - $fdtaddr" -#define CONFIG_RAMBOOTCOMMAND \ +#define RAMBOOTCOMMAND \"setenv rootdev /dev/ram;" \"run setbootargs;" \"tftp $ramdiskaddr $ramdiskfile;" \
include/configs/MPC8540ADS.h +3 -3
@@ -332,7 +332,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 " \
@@ -341,7 +341,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;" \
@@ -349,6 +349,6 @@"tftp $fdtaddr $fdtfile;" \ "bootm $loadaddr $ramdiskaddr $fdtaddr" -#define CONFIG_BOOTCOMMAND CONFIG_NFSBOOTCOMMAND +#define CONFIG_BOOTCOMMAND NFSBOOTCOMMAND#endif /* __CONFIG_H */
include/configs/MPC8548CDS.h +3 -3
@@ -478,7 +478,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 " \
@@ -487,7 +487,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;" \
@@ -495,6 +495,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 */
include/configs/MPC8560ADS.h +3 -3
@@ -366,7 +366,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 " \
@@ -375,7 +375,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;" \
@@ -383,6 +383,6 @@"tftp $fdtaddr $fdtfile;" \ "bootm $loadaddr $ramdiskaddr $fdtaddr" -#define CONFIG_BOOTCOMMAND CONFIG_NFSBOOTCOMMAND +#define CONFIG_BOOTCOMMAND NFSBOOTCOMMAND#endif /* __CONFIG_H */
include/configs/P1010RDB.h +2 -2
@@ -715,7 +715,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;" \
@@ -723,7 +723,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>
include/configs/P2041RDB.h +4 -4
@@ -525,14 +525,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 " \
@@ -541,7 +541,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;" \
@@ -549,7 +549,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>
include/configs/T102xRDB.h +3 -3
@@ -668,7 +668,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;" \
@@ -676,7 +676,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 " \
@@ -685,7 +685,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>
include/configs/T104xRDB.h +5 -5
@@ -746,7 +746,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;" \
@@ -754,14 +754,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 " \
@@ -770,7 +770,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;" \
@@ -778,7 +778,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>
include/configs/T208xQDS.h +8 -8
@@ -664,7 +664,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 - - -;" \
@@ -676,11 +676,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 - - -;" \
@@ -692,7 +692,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;" \
@@ -700,14 +700,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 " \
@@ -716,7 +716,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;" \
@@ -724,7 +724,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>
include/configs/T208xRDB.h +8 -8
@@ -622,7 +622,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 - - -;" \
@@ -634,11 +634,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 - - -;" \
@@ -650,7 +650,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;" \
@@ -658,14 +658,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 " \
@@ -674,7 +674,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;" \
@@ -682,7 +682,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>
include/configs/T4240RDB.h +7 -7
@@ -249,7 +249,7 @@/* default location for tftp and bootm */ #define CONFIG_LOADADDR 1000000 -#define CONFIG_HVBOOT \ +#define HVBOOT \ "setenv bootargs config-addr=0x60000000; " \ "bootm 0x01000000 - 0x00f00000"
@@ -602,11 +602,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;" \
@@ -614,14 +614,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 " \
@@ -630,7 +630,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;" \
@@ -638,7 +638,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>
include/configs/controlcenterdc.h +2 -2
@@ -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}; " \
include/configs/corenet_ds.h +4 -4
@@ -539,14 +539,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 " \
@@ -555,7 +555,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;" \
@@ -563,7 +563,7 @@"tftp $fdtaddr $fdtfile;" \ "bootm $loadaddr $ramdiskaddr $fdtaddr" -#define CONFIG_BOOTCOMMAND CONFIG_HDBOOT +#define CONFIG_BOOTCOMMAND HDBOOT#include <asm/fsl_secure_boot.h>
include/configs/gazerbeam.h +3 -3
@@ -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 */
include/configs/ge_bx50v3.h +4 -4
@@ -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
include/configs/ids8313.h +1 -1
@@ -284,7 +284,7 @@"mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \"\0" -#define CONFIG_NFSBOOTCOMMAND \ +#define NFSBOOTCOMMAND \"setenv rootdev /dev/nfs;" \"run setipargs;run addmtd;" \"tftp ${loadaddr} ${bootfile};" \
include/configs/mx53ppd.h +2 -2
@@ -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
include/configs/p1_p2_rdb_pc.h +4 -4
@@ -691,7 +691,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 " \
@@ -700,7 +700,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;" \
@@ -733,7 +733,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;" \
@@ -742,6 +742,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 */
include/configs/smartweb.h +1 -1
@@ -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; " \
include/configs/uniphier.h +1 -1
@@ -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;" \
include/configs/x86-common.h +2 -2
@@ -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 " \
Signature · 1 line
2.17.1
Quoted 5 lines · Tom Rini
There are an assortment of hard-coded
CONFIG_BOOTCOMMANDoptions in some board headers. Rework these so that they do not add to the CONFIG namespace.Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/next, thanks!
Signature · 1 line
Tom