board: MCR3000: Migrate to using CONFIG_EXTRA_ENV_TEXT
We can move all of the environment changes to come
from CONFIG_EXTRA_ENV_TEXT.
Suggested-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
diff --git a/board/cssi/mcr3000/mcr3000.env b/board/cssi/mcr3000/mcr3000.env
new file mode 100644
index 0000000..542d90e
--- /dev/null
+++ b/board/cssi/mcr3000/mcr3000.env
@@ -0,0 +1,14 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+
+sdram_type=SDRAM
+flash_type=AM29LV160DB
+loadaddr=0x400000
+filename=uImage.lzma
+nfsroot=/opt/ofs
+dhcp_ip=ip=:::::eth0:dhcp
+console_args=console=ttyCPM0,115200N8
+flashboot=setenv bootargs ${console_args} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:mcr3k:eth0:off;${ofl_args}; bootm 0x04060000 - 0x04050000
+tftpboot=setenv bootargs ${console_args} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:mcr3k:eth0:off ${ofl_args}; tftp ${loadaddr} ${filename};tftp 0xf00000 mcr3000.dtb;bootm ${loadaddr} - 0xf00000
+netboot=dhcp ${loadaddr} ${filename};tftp 0xf00000 mcr3000.dtb;setenv bootargs root=/dev/nfs rw ${console_args} ${dhcp_ip};bootm ${loadaddr} - 0xf00000
+nfsboot=setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${nfsroot} ${console_args} ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:mcr3k:eth0:off;bootm 0x04060000 - 0x04050000
+dhcpboot=dhcp ${loadaddr} ${filename};tftp 0xf00000 mcr3000.dtb;setenv bootargs ${console_args} ${dhcp_ip} ${ofl_args}; bootm ${loadaddr} - 0xf00000
diff --git a/include/configs/mcr3000.h b/include/configs/mcr3000.h
index c6929c1..8d78fd3 100644
--- a/include/configs/mcr3000.h
+++ b/include/configs/mcr3000.h
@@ -9,49 +9,6 @@
/* High Level Configuration Options */
-#define CFG_EXTRA_ENV_SETTINGS \
- "sdram_type=SDRAM\0" \
- "flash_type=AM29LV160DB\0" \
- "loadaddr=0x400000\0" \
- "filename=uImage.lzma\0" \
- "nfsroot=/opt/ofs\0" \
- "dhcp_ip=ip=:::::eth0:dhcp\0" \
- "console_args=console=ttyCPM0,115200N8\0" \
- "flashboot=setenv bootargs " \
- "${console_args} " \
- "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:" \
- "mcr3k:eth0:off;" \
- "${ofl_args}; " \
- "bootm 0x04060000 - 0x04050000\0" \
- "tftpboot=setenv bootargs " \
- "${console_args} " \
- "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:" \
- "mcr3k:eth0:off " \
- "${ofl_args}; " \
- "tftp ${loadaddr} ${filename};" \
- "tftp 0xf00000 mcr3000.dtb;" \
- "bootm ${loadaddr} - 0xf00000\0" \
- "netboot=dhcp ${loadaddr} ${filename};" \
- "tftp 0xf00000 mcr3000.dtb;" \
- "setenv bootargs " \
- "root=/dev/nfs rw " \
- "${console_args} " \
- "${dhcp_ip};" \
- "bootm ${loadaddr} - 0xf00000\0" \
- "nfsboot=setenv bootargs " \
- "root=/dev/nfs rw nfsroot=${serverip}:${nfsroot} " \
- "${console_args} " \
- "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:" \
- "mcr3k:eth0:off;" \
- "bootm 0x04060000 - 0x04050000\0" \
- "dhcpboot=dhcp ${loadaddr} ${filename};" \
- "tftp 0xf00000 mcr3000.dtb;" \
- "setenv bootargs " \
- "${console_args} " \
- "${dhcp_ip} " \
- "${ofl_args}; " \
- "bootm ${loadaddr} - 0xf00000\0"
-
/* Miscellaneous configurable options */
/* Definitions for initial stack pointer and data area (in DPRAM) */