imx: imx8m{m,n,p}_venice: migrate to CONFIG_EXTRA_ENV_TEXT
Move the majority of the environment from the board headers to
a separate text file.
Signed-off-by: Tim Harvey <tharvey@gateworks.com>
diff --git a/include/configs/imx8mn_venice.h b/include/configs/imx8mn_venice.h
index 4266eb0..022db00 100644
--- a/include/configs/imx8mn_venice.h
+++ b/include/configs/imx8mn_venice.h
@@ -13,13 +13,6 @@
#define CONFIG_SYS_UBOOT_BASE \
(QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512)
-#define MEM_LAYOUT_ENV_SETTINGS \
- "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
- "fdt_addr_r=0x50200000\0" \
- "scriptaddr=0x50280000\0" \
- "ramdisk_addr_r=0x50300000\0" \
- "kernel_comp_addr_r=0x40200000\0"
-
/* Enable Distro Boot */
#define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 1) \
@@ -27,45 +20,9 @@
func(USB, usb, 0) \
func(DHCP, dhcp, na)
#include <config_distro_bootcmd.h>
-
-/* Initial environment variables */
#define CONFIG_EXTRA_ENV_SETTINGS \
- BOOTENV \
- MEM_LAYOUT_ENV_SETTINGS \
- "script=boot.scr\0" \
- "bootm_size=0x10000000\0" \
- "dev=2\0" \
- "preboot=gsc wd-disable\0" \
- "console=ttymxc1,115200\0" \
- "update_firmware=" \
- "tftpboot $loadaddr $image && " \
- "setexpr blkcnt $filesize + 0x1ff && " \
- "setexpr blkcnt $blkcnt / 0x200 && " \
- "mmc dev $dev && " \
- "mmc write $loadaddr 0x40 $blkcnt\0" \
- "loadfdt=" \
- "if $fsload $fdt_addr_r $dir/$fdt_file1; " \
- "then echo loaded $fdt_file1; " \
- "elif $fsload $fdt_addr_r $dir/$fdt_file2; " \
- "then echo loaded $fdt_file2; " \
- "elif $fsload $fdt_addr_r $dir/$fdt_file3; " \
- "then echo loaded $fdt_file3; " \
- "elif $fsload $fdt_addr_r $dir/$fdt_file4; " \
- "then echo loaded $fdt_file4; " \
- "elif $fsload $fdt_addr_r $dir/$fdt_file5; " \
- "then echo loaded $fdt_file5; " \
- "fi\0" \
- "boot_net=" \
- "setenv fsload tftpboot; " \
- "run loadfdt && tftpboot $kernel_addr_r $dir/Image && " \
- "booti $kernel_addr_r - $fdt_addr_r\0" \
- "update_rootfs=" \
- "tftpboot $loadaddr $image && " \
- "gzwrite mmc $dev $loadaddr $filesize 100000 1000000\0" \
- "update_all=" \
- "tftpboot $loadaddr $image && " \
- "gzwrite mmc $dev $loadaddr $filesize\0" \
- "erase_env=mmc dev $dev; mmc erase 0x7f08 0x40\0"
+ "splblk=0x40\0" \
+ BOOTENV
#define CONFIG_SYS_INIT_RAM_ADDR 0x40000000
#define CONFIG_SYS_INIT_RAM_SIZE SZ_2M