diff options
| author | Tom Rini <trini@konsulko.com> | 2022-11-14 07:29:51 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-11-14 09:33:36 -0500 |
| commit | c4ee4fe92e9be120be6d12718273dec6b63cc7d9 (patch) | |
| tree | 31d45f462b8b4b85f525308a22e0bebb9f80f27c /include/configs/imx8mp_venice.h | |
| parent | fac432652f38724994a99c2613183fc04534a2cd (diff) | |
| parent | fc1c1760de38823edbdc2cdd9606dff938a07f6e (diff) | |
| download | u-boot-c4ee4fe92e9be120be6d12718273dec6b63cc7d9.zip u-boot-c4ee4fe92e9be120be6d12718273dec6b63cc7d9.tar.gz u-boot-c4ee4fe92e9be120be6d12718273dec6b63cc7d9.tar.bz2 | |
Merge tag 'u-boot-imx-20221114' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx
For 2022.01
-----------
CI: https://source.denx.de/u-boot/custodians/u-boot-imx/-/pipelines/14083
- Fix UART
- moved to binman (MX8 boards)
- Toradex: sync DTS with Linux
- Gateworks: fixes
- New boards : MSC SM2S iMX8MP
Diffstat (limited to 'include/configs/imx8mp_venice.h')
| -rw-r--r-- | include/configs/imx8mp_venice.h | 51 |
1 files changed, 2 insertions, 49 deletions
diff --git a/include/configs/imx8mp_venice.h b/include/configs/imx8mp_venice.h index ef507c3..b1c213c 100644 --- a/include/configs/imx8mp_venice.h +++ b/include/configs/imx8mp_venice.h @@ -12,17 +12,6 @@ #define CONFIG_SYS_UBOOT_BASE \ (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512) -#ifdef CONFIG_SPL_BUILD -/* For RAW image gives a error info not panic */ -#endif - -#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) \ @@ -30,45 +19,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 |