summaryrefslogtreecommitdiff
path: root/include/configs/p1_p2_rdb_pc.h
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2021-08-19 21:29:00 +0300
committerTom Rini <trini@konsulko.com>2021-08-30 21:13:28 +0300
commit7ae1b0804d8837ecec14538f18903793d187f328 (patch)
tree65bc3afb87449a5f65470daea89cf6acccf3b828 /include/configs/p1_p2_rdb_pc.h
parent5afdcca019915153db59ea9551bdd0eda11707f1 (diff)
downloadu-boot-7ae1b0804d8837ecec14538f18903793d187f328.tar.xz
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>
Diffstat (limited to 'include/configs/p1_p2_rdb_pc.h')
-rw-r--r--include/configs/p1_p2_rdb_pc.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h
index cb3dcc0c33..c1571c2235 100644
--- 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 */