November 2022 - U-Boot

[PATCH v5 1/5] imx8m: USDHC3 base address definition for i.MX8MP
by Martyn Welch 08 Nov '22

08 Nov '22

The i.MX8MP also has USDHC3, allow access to the relvant base address definition. Signed-off-by: Martyn Welch <martyn.welch(a)collabora.com> --- Changes in v2: - None Changes in v3: - None Changes in v4: - None Changes in v5: - None arch/arm/include/asm/arch-imx8m/imx-regs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/include/asm/arch-imx8m/imx-regs.h b/arch/arm/include/asm/arch-imx8m/imx-regs.h index 29d5baaab8..c46d4f7e00 100644 --- a/arch/arm/include/asm/arch-imx8m/imx-regs.h +++ b/arch/arm/include/asm/arch-imx8m/imx-regs.h @@ -47,7 +47,7 @@ #define USDHC1_BASE_ADDR 0x30B40000 #define USDHC2_BASE_ADDR 0x30B50000 #define QSPI0_AMBA_BASE 0x08000000 -#ifdef CONFIG_IMX8MM +#if defined(CONFIG_IMX8MM) || defined(CONFIG_IMX8MP) #define USDHC3_BASE_ADDR 0x30B60000 #endif #define UART_BASE_ADDR(n) ( \ -- 2.35.1

4 12

[PATCH] ARM: mx7: psci: fix suspend/resume e10133 workaround
by Matthias Schiffer 08 Nov '22

08 Nov '22

The e10133 workaround was broken in two places: - The code intended to temporarily mask all interrupts in GPC_IMRx_CORE0. While the old register values were saved, the actual masking was missing. - imx_udelay() expects the system counter to run at its base frequency, but the system counter is switched to a lower frequency earlier in psci_system_suspend(), leading to a much longer delay than intended. Replace the call with an equivalent loop (linux-imx 5.15 does the same) This fixes the SoC hanging forever when there was already a wakeup IRQ pending while suspending. Fixes: 57b620255e ("imx: mx7: add system suspend/resume support") Signed-off-by: Matthias Schiffer <matthias.schiffer(a)ew.tq-group.com> --- arch/arm/mach-imx/mx7/psci-mx7.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-imx/mx7/psci-mx7.c b/arch/arm/mach-imx/mx7/psci-mx7.c index f32945ea37..699a2569cb 100644 --- a/arch/arm/mach-imx/mx7/psci-mx7.c +++ b/arch/arm/mach-imx/mx7/psci-mx7.c @@ -643,8 +643,10 @@ __secure void psci_system_suspend(u32 __always_unused function_id, /* disable GIC distributor */ writel(0, GIC400_ARB_BASE_ADDR + GIC_DIST_OFFSET); - for (i = 0; i < 4; i++) + for (i = 0; i < 4; i++) { gpc_mask[i] = readl(GPC_IPS_BASE_ADDR + GPC_IMR1_CORE0 + i * 4); + writel(~0, GPC_IPS_BASE_ADDR + GPC_IMR1_CORE0 + i * 4); + } /* * enable the RBC bypass counter here @@ -668,7 +670,7 @@ __secure void psci_system_suspend(u32 __always_unused function_id, writel(gpc_mask[i], GPC_IPS_BASE_ADDR + GPC_IMR1_CORE0 + i * 4); /* - * now delay for a short while (3usec) + * now delay for a short while (~3usec) * ARM is at 1GHz at this point * so a short loop should be enough. * this delay is required to ensure that @@ -677,7 +679,8 @@ __secure void psci_system_suspend(u32 __always_unused function_id, * or in case an interrupt arrives just * as ARM is about to assert DSM_request. */ - imx_udelay(3); + for (i = 0; i < 2000; i++) + asm volatile(""); /* save resume entry and sp in CPU0 GPR registers */ asm volatile("mov %0, sp" : "=r" (val)); -- 2.25.1

2 2

[PATCH v5 0/8] arm: dts: imx: sync device trees with upstream linux kernel part 1
by Marcel Ziswiler 08 Nov '22

08 Nov '22

From: Marcel Ziswiler <marcel.ziswiler(a)toradex.com> This series synchronises them imx device trees with the upstream Linux kernel (v6.1-rc3). I split it into two parts. This is part 1. It also fixes a few issues as discussed during/after the pre-mature application of my first series [1]. I am not touching kontron-sl-mx6ul as Frieder already took care of those [2]. Feedback welcome. Thanks! [1] https://patchwork.ozlabs.org/project/uboot/cover/20220721132748.1052244-1-m… [2] https://patchwork.ozlabs.org/project/uboot/cover/20220823142917.306176-1-fr… Changes in v5: - Add Giulio's reviewed-by and tested-by. Thanks! - Add clock-names "per" to lpuart and re-add lcdif and usb* nodes as pointed out by Giulio. - Add Tim's tested-by. Thanks! Changes in v4: - Re-synched with v6.1-rc3 which now already contains the recent DDR pinmux addition. - Re-named commit subject and re-worded commit message to indicate migration to automatic build system included -u-boot.dtsi device tree include files. Thanks to Giulio for pointing this out. - Use imxrt1050-evk-u-boot.dtsi as provided/tested by Jesse. - Explain intent in commit message as pointed out by Giulio. - Re-synched with v6.1-rc3. - Re-based after Adam's common imx8mn-u-boot device tree creation. Changes in v3: - Incorporate feedback from Jesse. Changes in v2: - imxrt1050: Re-added DDR timings aka semc node as pointed out by Fabio. Thanks! - imx8ulp: Re-added s400_mu device tree node. Marcel Ziswiler (8): vf610: synchronise device tree with linux imxrt1020: migrate to build system included -u-boot.dtsi imxrt1050: synchronise device tree with linux imx8ulp: synchronise device tree with linux imx8mq: synchronise device tree with linux imx8mp: synchronise device tree with linux imx8mn: synchronise device tree with linux imx8mm: synchronise device tree with linux arch/arm/dts/imx8mm-beacon-baseboard.dtsi | 4 +- arch/arm/dts/imx8mm-evk.dtsi | 43 ++ arch/arm/dts/imx8mm-icore-mx8mm.dtsi | 14 +- arch/arm/dts/imx8mm-mx8menlo.dts | 14 +- arch/arm/dts/imx8mm-u-boot.dtsi | 2 +- arch/arm/dts/imx8mm-venice-gw700x.dtsi | 24 +- arch/arm/dts/imx8mm-venice-gw7901.dts | 12 +- arch/arm/dts/imx8mm-venice-gw7902.dts | 14 +- arch/arm/dts/imx8mm-venice-gw7903.dts | 6 +- arch/arm/dts/imx8mm-venice-gw7904.dts | 4 + arch/arm/dts/imx8mm-verdin.dtsi | 50 +- arch/arm/dts/imx8mn-beacon-baseboard.dtsi | 4 +- arch/arm/dts/imx8mn-evk.dtsi | 45 +- arch/arm/dts/imx8mn-var-som-symphony.dts | 6 +- arch/arm/dts/imx8mn-venice-gw7902.dts | 9 +- arch/arm/dts/imx8mn.dtsi | 14 +- arch/arm/dts/imx8mp-dhcom-pdk2.dts | 29 +- arch/arm/dts/imx8mp-dhcom-som.dtsi | 20 +- arch/arm/dts/imx8mp-evk.dts | 179 ++++-- arch/arm/dts/imx8mp-icore-mx8mp-edimm2.2.dts | 2 +- arch/arm/dts/imx8mp-icore-mx8mp.dtsi | 2 +- arch/arm/dts/imx8mp-phyboard-pollux-rdk.dts | 48 +- arch/arm/dts/imx8mp-u-boot.dtsi | 2 +- arch/arm/dts/imx8mp-venice-gw74xx.dts | 284 ++++++--- arch/arm/dts/imx8mp-verdin.dtsi | 32 +- arch/arm/dts/imx8mp.dtsi | 147 ++++- arch/arm/dts/imx8mq-evk.dts | 43 ++ arch/arm/dts/imx8mq-librem5-r3.dtsi | 45 ++ arch/arm/dts/imx8mq-librem5-r4.dts | 20 +- arch/arm/dts/imx8mq-librem5.dtsi | 153 ++++- arch/arm/dts/imx8mq-u-boot.dtsi | 10 +- arch/arm/dts/imx8mq.dtsi | 19 +- arch/arm/dts/imx8ulp-evk-u-boot.dtsi | 15 +- arch/arm/dts/imx8ulp-evk.dts | 240 ++----- arch/arm/dts/imx8ulp-pinfunc.h | 4 +- arch/arm/dts/imx8ulp.dtsi | 594 +++++------------- arch/arm/dts/imxrt1020-evk-u-boot.dtsi | 7 +- arch/arm/dts/imxrt1020-evk.dts | 1 - arch/arm/dts/imxrt1050-evk-u-boot.dtsi | 274 +++++++- arch/arm/dts/imxrt1050-evk.dts | 257 +------- arch/arm/dts/imxrt1050-pinfunc.h | 2 +- arch/arm/dts/imxrt1050.dtsi | 168 +++-- arch/arm/dts/vf610-pinfunc.h | 2 +- include/dt-bindings/clock/imx8mp-clock.h | 13 +- include/dt-bindings/clock/imx8ulp-clock.h | 53 +- include/dt-bindings/clock/imxrt1050-clock.h | 9 +- include/dt-bindings/interconnect/fsl,imx8mp.h | 59 ++ include/dt-bindings/interconnect/imx8mm.h | 50 ++ include/dt-bindings/interconnect/imx8mn.h | 41 ++ include/dt-bindings/power/imx8mp-power.h | 21 +- include/dt-bindings/power/imx8ulp-power.h | 26 + include/dt-bindings/reset/imx8mp-reset.h | 50 ++ include/dt-bindings/reset/imx8mq-reset.h | 61 +- include/dt-bindings/reset/imx8ulp-pcc-reset.h | 59 ++ 54 files changed, 1984 insertions(+), 1322 deletions(-) create mode 100644 arch/arm/dts/imx8mq-librem5-r3.dtsi create mode 100644 include/dt-bindings/interconnect/fsl,imx8mp.h create mode 100644 include/dt-bindings/interconnect/imx8mm.h create mode 100644 include/dt-bindings/interconnect/imx8mn.h create mode 100644 include/dt-bindings/power/imx8ulp-power.h create mode 100644 include/dt-bindings/reset/imx8mp-reset.h create mode 100644 include/dt-bindings/reset/imx8ulp-pcc-reset.h -- 2.35.1

4 18

[PATCH] configs: imx8m{m,n,p}_venice: disable autoload
by Tim Harvey 08 Nov '22

08 Nov '22

disable network autoload Signed-off-by: Tim Harvey <tharvey(a)gateworks.com> --- configs/imx8mm_venice_defconfig | 1 + configs/imx8mn_venice_defconfig | 1 + configs/imx8mp_venice_defconfig | 1 + 3 files changed, 3 insertions(+) diff --git a/configs/imx8mm_venice_defconfig b/configs/imx8mm_venice_defconfig index 5652e1bb66f4..06775b39dba4 100644 --- a/configs/imx8mm_venice_defconfig +++ b/configs/imx8mm_venice_defconfig @@ -61,6 +61,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y +CONFIG_SYS_DISABLE_AUTOLOAD=y CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y CONFIG_CMD_UUID=y diff --git a/configs/imx8mn_venice_defconfig b/configs/imx8mn_venice_defconfig index e7b2b5ce9f5d..6c31a333f298 100644 --- a/configs/imx8mn_venice_defconfig +++ b/configs/imx8mn_venice_defconfig @@ -64,6 +64,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y CONFIG_CMD_USB_MASS_STORAGE=y +CONFIG_SYS_DISABLE_AUTOLOAD=y CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y CONFIG_CMD_UUID=y diff --git a/configs/imx8mp_venice_defconfig b/configs/imx8mp_venice_defconfig index 5c0ea11efc4e..5a4abbd0d895 100644 --- a/configs/imx8mp_venice_defconfig +++ b/configs/imx8mp_venice_defconfig @@ -63,6 +63,7 @@ CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_USB=y +CONFIG_SYS_DISABLE_AUTOLOAD=y CONFIG_CMD_CACHE=y CONFIG_CMD_TIME=y CONFIG_CMD_UUID=y -- 2.25.1

2 1

[PATCH v2] configs: imx8m: Enable CONFIG_ARMV8_CRYPTO support
by Loic Poulain 08 Nov '22

08 Nov '22

This enables armv8 crypto extension usage for SHA1/SHA256. Which speed up sha1/sha256 operations, about 10x faster with a imx8mm evk for a 20MiB kernel hash verification (12ms vs 165ms). Signed-off-by: Loic Poulain <loic.poulain(a)linaro.org> --- v2: Select ARMV8_CRYPTO in the imx8m common Kconfig arch/arm/mach-imx/imx8m/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/mach-imx/imx8m/Kconfig b/arch/arm/mach-imx/imx8m/Kconfig index 3470160..fe7ef0b 100644 --- a/arch/arm/mach-imx/imx8m/Kconfig +++ b/arch/arm/mach-imx/imx8m/Kconfig @@ -4,6 +4,7 @@ config IMX8M bool select HAS_CAAM select ROM_UNIFIED_SECTIONS + select ARMV8_CRYPTO config IMX8MQ bool -- 2.7.4

3 2

[PATCH] board: gateworks: venice: remove redundance adjustment of thermal trip points
by Tim Harvey 08 Nov '22

08 Nov '22

commit 0543a1ed2787 ("imx8m: fixup thermal trips") moved updating the thermal trip points to all IMX8M so we can remove it from our board specific dt config. Signed-off-by: Tim Harvey <tharvey(a)gateworks.com> --- board/gateworks/venice/venice.c | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/board/gateworks/venice/venice.c b/board/gateworks/venice/venice.c index d94f6b8a577d..c4d86c26a9b5 100644 --- a/board/gateworks/venice/venice.c +++ b/board/gateworks/venice/venice.c @@ -179,22 +179,6 @@ int ft_board_setup(void *fdt, struct bd_info *bd) /* set board model dt prop */ fdt_setprop_string(fdt, 0, "board", eeprom_get_model()); - /* update temp thresholds */ - off = fdt_path_offset(fdt, "/thermal-zones/cpu-thermal/trips"); - if (off >= 0) { - int minc, maxc, prop; - - get_cpu_temp_grade(&minc, &maxc); - fdt_for_each_subnode(prop, fdt, off) { - const char *type = fdt_getprop(fdt, prop, "type", NULL); - - if (type && (!strcmp("critical", type))) - fdt_setprop_u32(fdt, prop, "temperature", maxc * 1000); - else if (type && (!strcmp("passive", type))) - fdt_setprop_u32(fdt, prop, "temperature", (maxc - 10) * 1000); - } - } - if (!strncmp(base_model, "GW73", 4)) { pcbrev = get_pcb_rev(base_model); -- 2.25.1

2 1

[PATCH 1/3] imx: imx8mm_beacon: Eliminate a few extras to free up SPL space
by Adam Ford 08 Nov '22

08 Nov '22

There are a few functions which are not essential for use in SPL, but they take up enough space to make other preferred features not fit. Remove the extras. Signed-off-by: Adam Ford <aford173(a)gmail.com> diff --git a/board/beacon/imx8mm/spl.c b/board/beacon/imx8mm/spl.c index a93cc93878..b0e9d918da 100644 --- a/board/beacon/imx8mm/spl.c +++ b/board/beacon/imx8mm/spl.c @@ -44,11 +44,6 @@ static void spl_dram_init(void) ddr_init(&dram_timing); } -void spl_board_init(void) -{ - debug("Normal Boot\n"); -} - #ifdef CONFIG_SPL_LOAD_FIT int board_fit_config_name_match(const char *name) { diff --git a/configs/imx8mm_beacon_defconfig b/configs/imx8mm_beacon_defconfig index e37ce01c19..f6a1012d8a 100644 --- a/configs/imx8mm_beacon_defconfig +++ b/configs/imx8mm_beacon_defconfig @@ -29,7 +29,6 @@ CONFIG_DEFAULT_FDT_FILE="imx8mm-beacon-kit.dtb" CONFIG_SPL_HAS_BSS_LINKER_SECTION=y CONFIG_SPL_BSS_START_ADDR=0x910000 CONFIG_SPL_BSS_MAX_SIZE=0x2000 -CONFIG_SPL_BOARD_INIT=y # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set CONFIG_SPL_STACK=0x920000 CONFIG_SYS_SPL_MALLOC=y @@ -88,12 +87,9 @@ CONFIG_DM_PCA953X=y CONFIG_DM_I2C=y CONFIG_SUPPORT_EMMC_BOOT=y CONFIG_MMC_IO_VOLTAGE=y -CONFIG_SPL_MMC_IO_VOLTAGE=y CONFIG_MMC_UHS_SUPPORT=y -CONFIG_SPL_MMC_UHS_SUPPORT=y CONFIG_MMC_HS400_ES_SUPPORT=y CONFIG_MMC_HS400_SUPPORT=y -CONFIG_SPL_MMC_HS400_SUPPORT=y CONFIG_FSL_USDHC=y CONFIG_MTD=y CONFIG_DM_MTD=y @@ -113,14 +109,12 @@ CONFIG_PINCTRL_IMX8M=y CONFIG_POWER_DOMAIN=y CONFIG_IMX8M_POWER_DOMAIN=y CONFIG_DM_PMIC=y +# CONFIG_SPL_PMIC_CHILDREN is not set CONFIG_DM_PMIC_BD71837=y CONFIG_SPL_DM_PMIC_BD71837=y CONFIG_DM_REGULATOR=y -CONFIG_SPL_DM_REGULATOR=y CONFIG_DM_REGULATOR_BD71837=y -CONFIG_SPL_DM_REGULATOR_BD71837=y CONFIG_DM_REGULATOR_FIXED=y -CONFIG_SPL_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_DM_SERIAL=y CONFIG_MXC_UART=y -- 2.34.1

5 15

[PATCH] configs: imx8mn_venice: fix include header protection
by Tim Harvey 08 Nov '22

08 Nov '22

Fix typo in the include header protection. Signed-off-by: Tim Harvey <tharvey(a)gateworks.com> --- include/configs/imx8mn_venice.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/configs/imx8mn_venice.h b/include/configs/imx8mn_venice.h index c43c4da6fbf8..5fbfdf4602f2 100644 --- a/include/configs/imx8mn_venice.h +++ b/include/configs/imx8mn_venice.h @@ -3,8 +3,8 @@ * Copyright 2022 Gateworks Corporation */ -#ifndef __IMX8MM_VENICE_H -#define __IMX8MM_VENICE_H +#ifndef __IMX8MN_VENICE_H +#define __IMX8MN_VENICE_H #include <asm/arch/imx-regs.h> #include <linux/sizes.h> -- 2.25.1

2 1

[PATCH] ARM: imx: Add version variable to DHSOM
by Marek Vasut 08 Nov '22

08 Nov '22

Enable insertion of version variable into U-Boot environment on DHSOM, to make it possible to check U-Boot version e.g. in U-Boot scripts. Signed-off-by: Marek Vasut <marex(a)denx.de> --- Cc: Fabio Estevam <festevam(a)denx.de> Cc: Peng Fan <peng.fan(a)nxp.com> Cc: Stefano Babic <sbabic(a)denx.de> Cc: uboot-imx <uboot-imx(a)nxp.com> --- configs/dh_imx6_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/dh_imx6_defconfig b/configs/dh_imx6_defconfig index 463c6d4477d..2d675c1f6d7 100644 --- a/configs/dh_imx6_defconfig +++ b/configs/dh_imx6_defconfig @@ -66,6 +66,7 @@ CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_USE_ETHPRIME=y CONFIG_ETHPRIME="FEC" +CONFIG_VERSION_VARIABLE=y CONFIG_ARP_TIMEOUT=200 CONFIG_BOUNCE_BUFFER=y CONFIG_DWC_AHSATA=y -- 2.35.1

2 1

[PATCH] imx: imx8m{m,n,p}_venice: migrate to CONFIG_EXTRA_ENV_TEXT
by Tim Harvey 08 Nov '22

08 Nov '22

Move the majority of the environment from the board headers to a separate text file. Signed-off-by: Tim Harvey <tharvey(a)gateworks.com> --- board/gateworks/venice/venice.env | 34 ++++++++++++++++++++++ include/configs/imx8mm_venice.h | 47 ++----------------------------- include/configs/imx8mn_venice.h | 47 ++----------------------------- include/configs/imx8mp_venice.h | 47 ++----------------------------- 4 files changed, 40 insertions(+), 135 deletions(-) create mode 100644 board/gateworks/venice/venice.env diff --git a/board/gateworks/venice/venice.env b/board/gateworks/venice/venice.env new file mode 100644 index 000000000000..f81804ca12c1 --- /dev/null +++ b/board/gateworks/venice/venice.env @@ -0,0 +1,34 @@ +kernel_addr_r=0x48200000 +fdt_addr_r=0x50200000 +scriptaddr=0x50280000 +ramdisk_addr_r=0x50300000 +kernel_comp_addr_r=0x40200000 +script=boot.scr +bootm_size=0x10000000 +dev=2 +preboot=gsc wd-disable +console=ttymxc1,115200 +update_firmware=tftpboot $loadaddr $image && + setexpr blkcnt $filesize + 0x1ff && + setexpr blkcnt $blkcnt / 0x200 && + mmc dev $dev && + mmc write $loadaddr $splblk $blkcnt +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 +boot_net=setenv fsload tftpboot; + run loadfdt && tftpboot $kernel_addr_r $dir/Image && + booti $kernel_addr_r - $fdt_addr_r +update_rootfs=tftpboot $loadaddr $image && + gzwrite mmc $dev $loadaddr $filesize 100000 1000000 +update_all=tftpboot $loadaddr $image && + gzwrite mmc $dev $loadaddr $filesize +erase_env=mmc dev $dev; mmc erase 0x7f08 0x40 diff --git a/include/configs/imx8mm_venice.h b/include/configs/imx8mm_venice.h index 6ecc3477f1b6..f754126854f9 100644 --- a/include/configs/imx8mm_venice.h +++ b/include/configs/imx8mm_venice.h @@ -18,13 +18,6 @@ #define CONFIG_MALLOC_F_ADDR 0x930000 #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) \ @@ -33,45 +26,9 @@ func(USB, usb, 1) \ 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 0x42 $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=0x42\0" \ + BOOTENV #define CONFIG_SYS_INIT_RAM_ADDR 0x40000000 #define CONFIG_SYS_INIT_RAM_SIZE SZ_2M diff --git a/include/configs/imx8mn_venice.h b/include/configs/imx8mn_venice.h index 4266eb076029..022db009e8af 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 diff --git a/include/configs/imx8mp_venice.h b/include/configs/imx8mp_venice.h index 71962c54bca2..6b87f0dbc48f 100644 --- a/include/configs/imx8mp_venice.h +++ b/include/configs/imx8mp_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 -- 2.25.1

2 1