diff options
| author | Christophe Leroy <christophe.leroy@csgroup.eu> | 2023-02-06 21:17:24 +0300 |
|---|---|---|
| committer | Christophe Leroy <christophe.leroy@csgroup.eu> | 2023-02-11 10:44:53 +0300 |
| commit | d126006635aa345269d8502a90f634e89742ae85 (patch) | |
| tree | 3de129ca71ea6d68150f59c4d8749a469283b8ba | |
| parent | d8809bac482508ea7a961c12f64311d12e8f5594 (diff) | |
| download | u-boot-d126006635aa345269d8502a90f634e89742ae85.tar.xz | |
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>
| -rw-r--r-- | board/cssi/mcr3000/mcr3000.env | 14 | ||||
| -rw-r--r-- | include/configs/mcr3000.h | 43 |
2 files changed, 14 insertions, 43 deletions
diff --git a/board/cssi/mcr3000/mcr3000.env b/board/cssi/mcr3000/mcr3000.env new file mode 100644 index 0000000000..542d90e3ae --- /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 c6929c1b98..8d78fd362a 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) */ |