imx9: switch to bootstd for i.MX93/1 EVK/QSB and i.MX8M EVK
Subsystems (4)
v2 cover imx9: switch to bootstd for i.MX93/1 EVK/QSB and i.MX8M EVK
Switch to bootstd for NXP i.MX9/8M boards with a bsp_bootcmd as fallback.
Some cleanups are also included together with this patchset
CI: https://dev.azure.com/pengfan/uboot-ci/_build/results?buildId=16&view=results
---
Changes in v2:
- Separate cleanup headers to separate patch
- Separate drop global data to separate patch
- Drop CONFIG_ENV_SOURCE_FILE since same as default
- Link to v1: https://lore.kernel.org/r/[email protected]
---
Peng Fan (16):
imx: imx93_evk: switch to BOOTSTD
imx: imx93_qsb: switch to BOOTSTD
imx: imx91_evk: switch to BOOTSTD
imx: imx8mp_evk: Enable dynamic settings to mmcdev and mmcroot
imx: imx8mp_evk: Switch to BOOTSTD
imx: imx8mn_evk: Cleanup headers
imx: imx8mn_evk: Drop DECLARE_GLOBAL_DATA_PTR
imx: imx8mn_evk: Enable dynamic settings to mmcdev and mmcroot
imx: imx8mn_evk: Switch to BOOTSTD
imx: imx8mm_evk: Enable dynamic settings to mmcdev and mmcroot
imx: imx8mm_evk: Switch to BOOTSTD
imx: imx8mq_evk: Cleanup headers
imx: imx8mq_evk: Drop DECLARE_GLOBAL_DATA_PTR
imx: imx8mq_evk: Enable dynamic settings to mmcdev and mmcroot
imx: imx8mq_evk: Switch to BOOTSTD
imx: imx93-11x11-evk: drop duplicated nodes
arch/arm/dts/imx93-11x11-evk-u-boot.dtsi | 118 --------------------------- arch/arm/mach-imx/imx8m/Kconfig | 8 ++ arch/arm/mach-imx/imx9/Kconfig | 6 ++ board/freescale/common/Makefile | 2 +- board/freescale/imx8mm_evk/imx8mm_evk.c | 3 + board/freescale/imx8mm_evk/imx8mm_evk.env | 67 +++++++++++++++ board/freescale/imx8mn_evk/imx8mn_evk.c | 12 +-- board/freescale/imx8mn_evk/imx8mn_evk.env | 67 +++++++++++++++ board/freescale/imx8mp_evk/imx8mp_evk.c | 5 ++ board/freescale/imx8mp_evk/imx8mp_evk.env | 57 +++++++++++++ board/freescale/imx8mq_evk/imx8mq_evk.c | 29 ++----- board/freescale/imx8mq_evk/imx8mq_evk.env | 60 ++++++++++++++ board/freescale/imx91_evk/imx91_evk.env | 29 ++++++- board/freescale/imx93_evk/imx93_evk.env | 88 ++++++++++++++++++++ board/freescale/imx93_qsb/imx93_qsb.env | 29 ++++++- configs/imx8mm_evk_defconfig | 3 +- configs/imx8mm_evk_fspi_defconfig | 4 +- configs/imx8mn_evk_defconfig | 2 +- configs/imx8mp_evk_defconfig | 2 +- configs/imx8mq_evk_defconfig | 3 +- configs/imx91_11x11_evk_defconfig | 3 +- configs/imx91_11x11_evk_inline_ecc_defconfig | 3 +- configs/imx93_11x11_evk_defconfig | 2 +- configs/imx93_9x9_qsb_defconfig | 3 +- configs/imx93_9x9_qsb_inline_ecc_defconfig | 3 +- drivers/gpio/adp5585_gpio.c | 2 +- include/configs/imx8mm_evk.h | 22 ----- include/configs/imx8mn_evk.h | 30 ------- include/configs/imx8mp_evk.h | 21 ----- include/configs/imx8mq_evk.h | 22 ----- include/configs/imx93_evk.h | 105 ------------------------ 31 files changed, 444 insertions(+), 366 deletions(-)
---
base-commit: ec9263b4f15c4cf82eb6a211c67baa6385065b8e
change-id: 20241231-imx-bootstd-abbf2e9e0d75
Best regards,
Signature · 1 line
Peng Fan <[email protected]>
PATCH v2 1/16 imx: imx93_evk: switch to BOOTSTD
From: Peng Fan <[email protected]>
Switch to support BOOTSTD with a bsp bootcmd as fallback. Move the env to imx93_evk.env
--- arch/arm/mach-imx/imx9/Kconfig | 2 + board/freescale/imx93_evk/imx93_evk.env | 88 ++++++++++++++++++++++++++ configs/imx93_11x11_evk_defconfig | 2 +- include/configs/imx93_evk.h | 105 -------------------------------- 4 files changed, 91 insertions(+), 106 deletions(-)
arch/arm/mach-imx/imx9/Kconfig +2 -0
@@ -47,6 +47,8 @@ config TARGET_IMX93_11X11_EVK select OF_BOARD_FIXUP select IMX93 imply OF_UPSTREAM + imply BOOTSTD_FULL + imply BOOTSTD_BOOTCOMMAND config TARGET_IMX93_VAR_SOM bool "imx93_var_som"
board/freescale/imx93_evk/imx93_evk.env new file +88 -0
88 lines not on this page · raw message
configs/imx93_11x11_evk_defconfig +1 -1
@@ -26,7 +26,7 @@ CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x88000000 CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0x90000000 CONFIG_REMAKE_ELF=y -CONFIG_DISTRO_DEFAULTS=y +CONFIG_BOOTCOMMAND="bootflow scan -lb; run bsp_bootcmd" CONFIG_DEFAULT_FDT_FILE="imx93-11x11-evk.dtb" CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2074
include/configs/imx93_evk.h +0 -105
117 lines not on this page · raw message
Signature · 1 line
2.35.3
PATCH v2 2/16 imx: imx93_qsb: switch to BOOTSTD
In reply to Peng Fan (OSS)From: Peng Fan <[email protected]>
Switch to support BOOTSTD with a bsp bootcmd as fallback.
--- arch/arm/mach-imx/imx9/Kconfig | 2 ++ board/freescale/imx93_qsb/imx93_qsb.env | 29 +++++++++++++++++++++++++++-- configs/imx93_9x9_qsb_defconfig | 3 +-- configs/imx93_9x9_qsb_inline_ecc_defconfig | 3 +-- 4 files changed, 31 insertions(+), 6 deletions(-)
arch/arm/mach-imx/imx9/Kconfig +2 -0
@@ -41,6 +41,8 @@ config TARGET_IMX93_9X9_QSB select IMX93 select IMX9_LPDDR4X imply OF_UPSTREAM + imply BOOTSTD_FULL + imply BOOTSTD_BOOTCOMMAND config TARGET_IMX93_11X11_EVK bool "imx93_11x11_evk"
board/freescale/imx93_qsb/imx93_qsb.env +27 -2
@@ -10,6 +10,7 @@ fdt_addr_r=0x83000000 fdt_addr=0x83000000 fdtfile=CONFIG_DEFAULT_FDT_FILE image=Image +mmcdev=CONFIG_SYS_MMC_ENV_DEV mmcpart=1 mmcroot=/dev/mmcblk1p2 rootwait rw mmcautodetect=yes
@@ -19,12 +20,13 @@ loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image} loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr_r} ${fdtfile} loadcntr=fatload mmc ${mmcdev}:${mmcpart} ${cntr_addr} ${cntr_file} auth_os=auth_cntr ${cntr_addr} +sec_boot=no boot_os=booti ${loadaddr} - ${fdt_addr_r} mmcboot= echo Booting from mmc ...; run mmcargs; if test ${sec_boot} = yes; then - if run auth_os; then + if run true; then run boot_os; else echo ERR: failed to authenticate;
@@ -48,7 +50,7 @@ netboot= fi; if test ${sec_boot} = yes; then ${get_cmd} ${cntr_addr} ${cntr_file}; - if run auth_os; then + if true; then run boot_os; else echo ERR: failed to authenticate;
@@ -61,3 +63,26 @@ netboot= echo WARN: Cannot load the DT; fi; fi; +bsp_bootcmd= + echo Running BSP bootcmd ...; + mmc dev ${mmcdev}; + if mmc rescan; then + if run loadbootscript; then + run bootscript; + else + if test ${sec_boot} = yes; then + if run loadcntr; then + run mmcboot; + else + run netboot; + fi; + else + if run loadimage; then + run mmcboot; + else + run netboot; + fi; + fi; + fi; + fi; +scriptaddr=0x83500000
configs/imx93_9x9_qsb_defconfig +1 -2
@@ -6,7 +6,6 @@ CONFIG_SYS_MALLOC_F_LEN=0x20000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=2 -CONFIG_ENV_SOURCE_FILE="imx93_qsb" CONFIG_SF_DEFAULT_SPEED=40000000 CONFIG_ENV_SIZE=0x4000 CONFIG_ENV_OFFSET=0x700000
@@ -29,7 +28,7 @@ CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x88000000 CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0x90000000 CONFIG_REMAKE_ELF=y -CONFIG_DISTRO_DEFAULTS=y +CONFIG_BOOTCOMMAND="bootflow scan -lb; run bsp_bootcmd" CONFIG_DEFAULT_FDT_FILE="imx93-9x9-qsb.dtb" CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2074
configs/imx93_9x9_qsb_inline_ecc_defconfig +1 -2
@@ -6,7 +6,6 @@ CONFIG_SYS_MALLOC_F_LEN=0x20000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=2 -CONFIG_ENV_SOURCE_FILE="imx93_qsb" CONFIG_SF_DEFAULT_SPEED=40000000 CONFIG_ENV_SIZE=0x4000 CONFIG_ENV_OFFSET=0x700000
@@ -29,7 +28,7 @@ CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x88000000 CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0x90000000 CONFIG_REMAKE_ELF=y -CONFIG_DISTRO_DEFAULTS=y +CONFIG_BOOTCOMMAND="bootflow scan -lb; run bsp_bootcmd" CONFIG_DEFAULT_FDT_FILE="imx93-9x9-qsb.dtb" CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2074
Signature · 1 line
2.35.3
PATCH v2 3/16 imx: imx91_evk: switch to BOOTSTD
In reply to Peng Fan (OSS)From: Peng Fan <[email protected]>
Switch to support BOOTSTD with a bsp bootcmd as fallback.
--- arch/arm/mach-imx/imx9/Kconfig | 2 ++ board/freescale/imx91_evk/imx91_evk.env | 29 ++++++++++++++++++++++++++-- configs/imx91_11x11_evk_defconfig | 3 +-- configs/imx91_11x11_evk_inline_ecc_defconfig | 3 +-- 4 files changed, 31 insertions(+), 6 deletions(-)
arch/arm/mach-imx/imx9/Kconfig +2 -0
@@ -34,6 +34,8 @@ config TARGET_IMX91_11X11_EVK select OF_BOARD_FIXUP select IMX91 imply OF_UPSTREAM + imply BOOTSTD_FULL + imply BOOTSTD_BOOTCOMMAND config TARGET_IMX93_9X9_QSB bool "imx93_qsb"
board/freescale/imx91_evk/imx91_evk.env +27 -2
@@ -10,6 +10,7 @@ fdt_addr_r=0x83000000 fdt_addr=0x83000000 fdtfile=CONFIG_DEFAULT_FDT_FILE image=Image +mmcdev=CONFIG_SYS_MMC_ENV_DEV mmcpart=1 mmcroot=/dev/mmcblk1p2 rootwait rw mmcautodetect=yes
@@ -19,12 +20,13 @@ loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image} loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr_r} ${fdtfile} loadcntr=fatload mmc ${mmcdev}:${mmcpart} ${cntr_addr} ${cntr_file} auth_os=auth_cntr ${cntr_addr} +sec_boot=no boot_os=booti ${loadaddr} - ${fdt_addr_r} mmcboot= echo Booting from mmc ...; run mmcargs; if test ${sec_boot} = yes; then - if run auth_os; then + if run true; then run boot_os; else echo ERR: failed to authenticate;
@@ -48,7 +50,7 @@ netboot= fi; if test ${sec_boot} = yes; then ${get_cmd} ${cntr_addr} ${cntr_file}; - if run auth_os; then + if true; then run boot_os; else echo ERR: failed to authenticate;
@@ -61,3 +63,26 @@ netboot= echo WARN: Cannot load the DT; fi; fi; +bsp_bootcmd= + echo Running BSP bootcmd ...; + mmc dev ${mmcdev}; + if mmc rescan; then + if run loadbootscript; then + run bootscript; + else + if test ${sec_boot} = yes; then + if run loadcntr; then + run mmcboot; + else + run netboot; + fi; + else + if run loadimage; then + run mmcboot; + else + run netboot; + fi; + fi; + fi; + fi; +scriptaddr=0x83500000
configs/imx91_11x11_evk_defconfig +1 -2
@@ -6,7 +6,6 @@ CONFIG_SYS_MALLOC_F_LEN=0x18000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=2 -CONFIG_ENV_SOURCE_FILE="imx91_evk" CONFIG_SF_DEFAULT_SPEED=40000000 CONFIG_ENV_SIZE=0x4000 CONFIG_ENV_OFFSET=0x700000
@@ -31,7 +30,7 @@ CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x88000000 CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0x90000000 CONFIG_REMAKE_ELF=y -CONFIG_DISTRO_DEFAULTS=y +CONFIG_BOOTCOMMAND="bootflow scan -lb; run bsp_bootcmd" CONFIG_OF_SYSTEM_SETUP=y CONFIG_DEFAULT_FDT_FILE="imx91-11x11-evk.dtb" CONFIG_SYS_CBSIZE=2048
configs/imx91_11x11_evk_inline_ecc_defconfig +1 -2
@@ -6,7 +6,6 @@ CONFIG_SYS_MALLOC_F_LEN=0x18000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_NR_DRAM_BANKS=2 -CONFIG_ENV_SOURCE_FILE="imx91_evk" CONFIG_SF_DEFAULT_SPEED=40000000 CONFIG_ENV_SIZE=0x4000 CONFIG_ENV_OFFSET=0x700000
@@ -31,7 +30,7 @@ CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x88000000 CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_END=0x90000000 CONFIG_REMAKE_ELF=y -CONFIG_DISTRO_DEFAULTS=y +CONFIG_BOOTCOMMAND="bootflow scan -lb; run bsp_bootcmd" CONFIG_OF_SYSTEM_SETUP=y CONFIG_DEFAULT_FDT_FILE="imx91-11x11-evk.dtb" CONFIG_SYS_CBSIZE=2048
Signature · 1 line
2.35.3
PATCH v2 4/16 imx: imx8mp_evk: Enable dynamic settings to mmcdev and mmcroot
In reply to Peng Fan (OSS)From: Peng Fan <[email protected]>
Enable dynamic settings to mmcdev and mmcroot for i.MX8MP-EVK
--- board/freescale/common/Makefile | 2 +- board/freescale/imx8mp_evk/imx8mp_evk.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-)
board/freescale/common/Makefile +1 -1
@@ -59,7 +59,7 @@ obj-$(CONFIG_POWER_PFUZE100) += pfuze.o endif obj-$(CONFIG_DM_PMIC_PFUZE100) += pfuze.o obj-$(CONFIG_POWER_MC34VR500) += mc34vr500.o -ifneq (,$(filter $(SOC), imx8ulp imx9)) +ifneq (,$(filter $(SOC), imx8m imx8ulp imx9)) obj-y += mmc.o endif
board/freescale/imx8mp_evk/imx8mp_evk.c +5 -0
@@ -3,6 +3,7 @@* Copyright 2019 NXP */ +#include <asm/arch/sys_proto.h> #include <env.h> int board_init (void )
@@ -12,6 +13,10 @@ int board_init(void)int board_late_init (void ) { +#if CONFIG_IS_ENABLED (ENV_IS_IN_MMC ) +board_late_mmc_env_init (); +#endif +#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG env_set ("board_name" ,"EVK" );env_set ("board_rev" ,"iMX8MP" );
Signature · 1 line
2.35.3
PATCH v2 5/16 imx: imx8mp_evk: Switch to BOOTSTD
In reply to Peng Fan (OSS)From: Peng Fan <[email protected]>
Move env to imx8mp_evk.env.
Switch to support BOOTSTD with a bsp bootcmd as fallback.
--- arch/arm/mach-imx/imx8m/Kconfig | 2 ++ board/freescale/imx8mp_evk/imx8mp_evk.env | 57 +++++++++++++++++++++++++++++++ configs/imx8mp_evk_defconfig | 2 +- include/configs/imx8mp_evk.h | 21 ------------ 4 files changed, 60 insertions(+), 22 deletions(-)
arch/arm/mach-imx/imx8m/Kconfig +2 -0
@@ -227,6 +227,8 @@ config TARGET_IMX8MP_EVK select ARCH_MISC_INIT select SPL_CRYPTO if SPL imply OF_UPSTREAM + imply BOOTSTD_FULL + imply BOOTSTD_BOOTCOMMAND config TARGET_IMX8MP_NAVQP bool "Emcraft Systems i.MX8M Plus NavQ+ board"
board/freescale/imx8mp_evk/imx8mp_evk.env new file +57 -0
57 lines not on this page · raw message
configs/imx8mp_evk_defconfig +1 -1
@@ -26,8 +26,8 @@ CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x48000000 CONFIG_FIT=y CONFIG_FIT_EXTERNAL_OFFSET=0x3000 CONFIG_SPL_LOAD_FIT=y -CONFIG_DISTRO_DEFAULTS=y CONFIG_OF_SYSTEM_SETUP=y +CONFIG_BOOTCOMMAND="bootflow scan -lb; run bsp_bootcmd" CONFIG_DEFAULT_FDT_FILE="imx8mp-evk.dtb" CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2074
include/configs/imx8mp_evk.h +0 -21
@@ -17,27 +17,6 @@#endif -#define BOOT_TARGET_DEVICES (func) \ - func(MMC, mmc, 1) \ - func(MMC, mmc, 2) - -#include <config_distro_bootcmd.h> - -/* Initial environment variables */ -#define CFG_EXTRA_ENV_SETTINGS \ - BOOTENV \ - "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ - "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ - "image=Image\0" \ - "console=ttymxc1,115200 earlycon=ec_imx6q,0x30890000,115200\0" \ - "fdt_addr_r=0x43000000\0" \ - "boot_fdt=try\0" \ - "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ - "initrd_addr=0x43800000\0" \ - "bootm_size=0x10000000\0" \ - "mmcpart=1\0" \ - "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \ -/* Link Definitions */ #define CFG_SYS_INIT_RAM_ADDR 0x40000000
Signature · 1 line
2.35.3
PATCH v2 6/16 imx: imx8mn_evk: Cleanup headers
In reply to Peng Fan (OSS)From: Peng Fan <[email protected]>
Drop unused headers and sort them
--- board/freescale/imx8mn_evk/imx8mn_evk.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
board/freescale/imx8mn_evk/imx8mn_evk.c +2 -4
@@ -3,12 +3,10 @@* Copyright 2019 NXP */ -#include <env.h> -#include <init.h> #include <asm/global_data.h> -#include <miiphy.h> -#include <netdev.h> #include <asm/io.h> +#include <env.h> +#include <init.h> DECLARE_GLOBAL_DATA_PTR ;
Signature · 1 line
2.35.3
PATCH v2 7/16 imx: imx8mn_evk: Drop DECLARE_GLOBAL_DATA_PTR
In reply to Peng Fan (OSS)From: Peng Fan <[email protected]>
There is no users of global data in imx8mn_evk.c, drop it.
--- board/freescale/imx8mn_evk/imx8mn_evk.c | 3 --- 1 file changed, 3 deletions(-)
board/freescale/imx8mn_evk/imx8mn_evk.c +0 -3
@@ -3,13 +3,10 @@* Copyright 2019 NXP */ -#include <asm/global_data.h> #include <asm/io.h> #include <env.h> #include <init.h> -DECLARE_GLOBAL_DATA_PTR ; -int board_mmc_get_env_dev (int devno) {return devno;
Signature · 1 line
2.35.3
PATCH v2 8/16 imx: imx8mn_evk: Enable dynamic settings to mmcdev and mmcroot
In reply to Peng Fan (OSS)From: Peng Fan <[email protected]>
Enable dynamic settings to mmcdev and mmcroot for i.MX8MN-EVK
--- board/freescale/imx8mn_evk/imx8mn_evk.c | 5 +++++ 1 file changed, 5 insertions(+)
board/freescale/imx8mn_evk/imx8mn_evk.c +5 -0
@@ -3,6 +3,7 @@* Copyright 2019 NXP */ +#include <asm/arch/sys_proto.h> #include <asm/io.h> #include <env.h> #include <init.h>
@@ -30,6 +31,10 @@ int board_init(void)int board_late_init (void ) { +#if CONFIG_IS_ENABLED (ENV_IS_IN_MMC ) +board_late_mmc_env_init (); +#endif +#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG env_set ("board_name" ,"DDR4 EVK" );env_set ("board_rev" ,"iMX8MN" );
Signature · 1 line
2.35.3
PATCH v2 9/16 imx: imx8mn_evk: Switch to BOOTSTD
In reply to Peng Fan (OSS)From: Peng Fan <[email protected]>
Move env to imx8mn_evk.env
Switch to support BOOTSTD with a bsp bootcmd as fallback.
--- board/freescale/imx8mn_evk/imx8mn_evk.env | 67 +++++++++++++++++++++++++++++++ configs/imx8mn_evk_defconfig | 2 +- include/configs/imx8mn_evk.h | 30 -------------- 3 files changed, 68 insertions(+), 31 deletions(-)
board/freescale/imx8mn_evk/imx8mn_evk.env new file +67 -0
@@ -0,0 +1,67 @@ +/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ + +boot_fdt=try +boot_fit=no +boot_targets=mmc1 mmc2 dhcp +bootm_size=0x10000000 +console=ttymxc1,115200 +fdt_addr_r=0x48000000 +fdtfile=CONFIG_DEFAULT_FDT_FILE +fdtoverlay_addr_r=0x49000000 +initrd_addr=0x48080000 +image=Image +ip_dyn=yes +kernel_addr_r=0x42000000 +loadaddr=CONFIG_SYS_LOAD_ADDR +mmcautodetect=yes +mmcdev=CONFIG_SYS_MMC_ENV_DEV +mmcpart=1 +mmcroot=/dev/mmcblk1p2 rootwait rw +prepare_mcore=setenv mcore_clk clk-imx8mn.mcore_booted; +pxefile_addr_r=0x40100000 +ramdisk_addr_r=0x48080000 +scriptaddr=0x40000000 + +mmcargs=setenv bootargs ${jh_clk} ${mcore_clk} console=${console} root=${mmcroot} +prepare_mcore=setenv mcore_clk clk-imx8mn.mcore_booted +loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image} +loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr_r} ${fdtfile} +mmcboot=echo Booting from mmc ...; + run mmcargs; + if test ${boot_fit} = yes || test ${boot_fit} = try; then + bootm ${loadaddr}; + else + if run loadfdt; then + booti ${loadaddr} - ${fdt_addr_r}; + else + echo WARN: Cannot load the DT; + fi; + fi +netargs=setenv bootargs ${jh_clk} ${mcore_clk} console=${console} root=/dev/nfs + ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp +netboot=echo Booting from net ...; + run netargs; + if test ${ip_dyn} = yes; then + setenv get_cmd dhcp; + else + setenv get_cmd tftp; + fi; + ${get_cmd} ${loadaddr} ${image}; + if test ${boot_fit} = yes || test ${boot_fit} = try; then + bootm ${loadaddr}; + else + if ${get_cmd} ${fdt_addr_r} ${fdtfile}; then + booti ${loadaddr} - ${fdt_addr_r}; + else + echo WARN: Cannot load the DT; + fi; + fi; +bsp_bootcmd=echo Running BSP bootcmd ...; + mmc dev ${mmcdev}; + if mmc rescan; then + if run loadimage; then + run mmcboot; + else + run netboot; + fi; + fi;
configs/imx8mn_evk_defconfig +1 -1
@@ -26,8 +26,8 @@ CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x48000000 CONFIG_FIT=y CONFIG_FIT_EXTERNAL_OFFSET=0x3000 CONFIG_SPL_LOAD_FIT=y -CONFIG_DISTRO_DEFAULTS=y CONFIG_OF_SYSTEM_SETUP=y +CONFIG_BOOTCOMMAND="bootflow scan -lb; run bsp_bootcmd" CONFIG_DEFAULT_FDT_FILE="imx8mn-evk.dtb" CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2074
include/configs/imx8mn_evk.h +0 -30
@@ -13,36 +13,6 @@#define CFG_SYS_UBOOT_BASE \ (QSPI0_AMBA_BASE + CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR * 512) -#define BOOT_TARGET_DEVICES (func) \ - func(MMC, mmc, 1) \ - func(MMC, mmc, 2) \ - func(DHCP, dhcp, na) - -#include <config_distro_bootcmd.h> - -/* Initial environment variables */ -/* see include/configs/ti_armv7_common.h */ -#define ENV_MEM_LAYOUT_SETTINGS \ - "loadaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ - "kernel_addr_r=0x42000000\0" \ - "fdt_addr_r=0x48000000\0" \ - "fdtoverlay_addr_r=0x49000000\0" \ - "ramdisk_addr_r=0x48080000\0" \ - "initrd_addr=0x48080000\0" \ - "scriptaddr=0x40000000\0" \ - "pxefile_addr_r=0x40100000\0" - -#define CFG_EXTRA_ENV_SETTINGS \ - "image=Image\0" \ - BOOTENV \ - "console=ttymxc1,115200\0" \ - "boot_fit=no\0" \ - "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ - "bootm_size=0x10000000\0" \ - "mmcpart=1\0" \ - "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \ - ENV_MEM_LAYOUT_SETTINGS -/* Link Definitions */ #define CFG_SYS_INIT_RAM_ADDR 0x40000000
Signature · 1 line
2.35.3
PATCH v2 10/16 imx: imx8mm_evk: Enable dynamic settings to mmcdev and mmcroot
In reply to Peng Fan (OSS)From: Peng Fan <[email protected]>
Enable dynamic settings to mmcdev and mmcroot for i.MX8MM-EVK
--- board/freescale/imx8mm_evk/imx8mm_evk.c | 3 +++ 1 file changed, 3 insertions(+)
board/freescale/imx8mm_evk/imx8mm_evk.c +3 -0
@@ -59,6 +59,9 @@ int board_mmc_get_env_dev(int devno)int board_late_init (void ) { +if (IS_ENABLED (CONFIG_ENV_IS_IN_MMC )) +board_late_mmc_env_init (); +if (IS_ENABLED (CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG )) {env_set ("board_name" ,"EVK" );env_set ("board_rev" ,"iMX8MM" );
Signature · 1 line
2.35.3
PATCH v2 11/16 imx: imx8mm_evk: Switch to BOOTSTD
In reply to Peng Fan (OSS)From: Peng Fan <[email protected]>
Move env to imx8mm_evk.env
Switch to support BOOTSTD with a bsp bootcmd as fallback.
--- arch/arm/mach-imx/imx8m/Kconfig | 4 ++ board/freescale/imx8mm_evk/imx8mm_evk.env | 67 +++++++++++++++++++++++++++++++ configs/imx8mm_evk_defconfig | 3 +- configs/imx8mm_evk_fspi_defconfig | 4 +- include/configs/imx8mm_evk.h | 22 ---------- 5 files changed, 76 insertions(+), 24 deletions(-)
arch/arm/mach-imx/imx8m/Kconfig +4 -0
@@ -154,6 +154,8 @@ config TARGET_IMX8MN_EVK select FSL_CAAM select SPL_CRYPTO if SPL imply OF_UPSTREAM + imply BOOTSTD_FULL + imply BOOTSTD_BOOTCOMMAND config TARGET_IMX8MN_DDR4_EVK bool "imx8mn DDR4 EVK board"
@@ -163,6 +165,8 @@ config TARGET_IMX8MN_DDR4_EVK select FSL_CAAM select SPL_CRYPTO if SPL imply OF_UPSTREAM + imply BOOTSTD_FULL + imply BOOTSTD_BOOTCOMMAND config TARGET_IMX8MN_VENICE bool "Support Gateworks Venice iMX8M Nano module"
board/freescale/imx8mm_evk/imx8mm_evk.env new file +67 -0
67 lines not on this page · raw message
configs/imx8mm_evk_defconfig +2 -1
@@ -24,8 +24,9 @@ CONFIG_SPL=y CONFIG_FIT=y CONFIG_FIT_EXTERNAL_OFFSET=0x3000 CONFIG_SPL_LOAD_FIT=y -CONFIG_DISTRO_DEFAULTS=y CONFIG_OF_SYSTEM_SETUP=y +CONFIG_BOOTCOMMAND="bootflow scan -lb; run bsp_bootcmd" +CONFIG_DEFAULT_FDT_FILE="imx8mp-evk.dtb" CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2074 CONFIG_BOARD_LATE_INIT=y
configs/imx8mm_evk_fspi_defconfig +3 -1
@@ -5,6 +5,7 @@ CONFIG_SYS_MALLOC_LEN=0x2000000 CONFIG_SPL_GPIO=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_ENV_SOURCE_FILE="imx8mn_evk" CONFIG_SF_DEFAULT_SPEED=40000000 CONFIG_SF_DEFAULT_MODE=0 CONFIG_ENV_SIZE=0x1000
@@ -27,8 +28,9 @@ CONFIG_SPL=y CONFIG_FIT=y CONFIG_FIT_EXTERNAL_OFFSET=0x3000 CONFIG_SPL_LOAD_FIT=y -CONFIG_DISTRO_DEFAULTS=y CONFIG_OF_SYSTEM_SETUP=y +CONFIG_BOOTCOMMAND="bootflow scan -lb; run bsp_bootcmd" +CONFIG_DEFAULT_FDT_FILE="imx8mp-evk.dtb" CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_PBSIZE=2074 CONFIG_BOARD_LATE_INIT=y
include/configs/imx8mm_evk.h +0 -22
@@ -29,28 +29,6 @@#endif -#define BOOT_TARGET_DEVICES (func) \ - func(MMC, mmc, 1) \ - func(MMC, mmc, 2) \ - func(DHCP, dhcp, na) - -#include <config_distro_bootcmd.h> - -/* Initial environment variables */ -#define CFG_EXTRA_ENV_SETTINGS \ - BOOTENV \ - "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ - "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ - "image=Image\0" \ - "console=ttymxc1,115200\0" \ - "fdt_addr_r=0x43000000\0" \ - "boot_fit=no\0" \ - "fdtfile=imx8mm-evk.dtb\0" \ - "initrd_addr=0x43800000\0" \ - "bootm_size=0x10000000\0" \ - "mmcpart=1\0" \ - "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \ -/* Link Definitions */ #define CFG_SYS_INIT_RAM_ADDR 0x40000000
Signature · 1 line
2.35.3
PATCH v2 12/16 imx: imx8mq_evk: Cleanup headers
In reply to Peng Fan (OSS)From: Peng Fan <[email protected]>
Drop unused headers and sort the order.
--- board/freescale/imx8mq_evk/imx8mq_evk.c | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-)
board/freescale/imx8mq_evk/imx8mq_evk.c +4 -20
@@ -3,28 +3,12 @@* Copyright 2018 NXP */ -#include <env.h> -#include <init.h> -#include <malloc.h> -#include <errno.h> -#include <asm/global_data.h> -#include <asm/io.h> -#include <miiphy.h> -#include <netdev.h> -#include <asm/mach-imx/iomux-v3.h> -#include <asm-generic/gpio.h> -#include <fsl_esdhc_imx.h> -#include <mmc.h> +#include <asm/arch/clock.h> #include <asm/arch/imx8mq_pins.h> #include <asm/arch/sys_proto.h> -#include <asm/mach-imx/gpio.h> -#include <asm/mach-imx/mxc_i2c.h> -#include <asm/arch/clock.h> -#include <spl.h> -#include <linux/bitops.h> -#include <power/pmic.h> -#include <power/pfuze100_pmic.h> -#include "../common/pfuze.h" +#include <asm/global_data.h> +#include <asm/mach-imx/iomux-v3.h> +#include <env.h> DECLARE_GLOBAL_DATA_PTR ;
Signature · 1 line
2.35.3
PATCH v2 13/16 imx: imx8mq_evk: Drop DECLARE_GLOBAL_DATA_PTR
In reply to Peng Fan (OSS)From: Peng Fan <[email protected]>
There is no gd used in the board file, so drop DECLARE_GLOBAL_DATA_PTR.
--- board/freescale/imx8mq_evk/imx8mq_evk.c | 3 --- 1 file changed, 3 deletions(-)
board/freescale/imx8mq_evk/imx8mq_evk.c +0 -3
@@ -6,12 +6,9 @@#include <asm/arch/clock.h> #include <asm/arch/imx8mq_pins.h> #include <asm/arch/sys_proto.h> -#include <asm/global_data.h> #include <asm/mach-imx/iomux-v3.h> #include <env.h> -DECLARE_GLOBAL_DATA_PTR ; -#define UART_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_FSEL1)#define WDOG_PAD_CTRL (PAD_CTL_DSE6 | PAD_CTL_HYS | PAD_CTL_PUE)
Signature · 1 line
2.35.3
PATCH v2 14/16 imx: imx8mq_evk: Enable dynamic settings to mmcdev and mmcroot
In reply to Peng Fan (OSS)From: Peng Fan <[email protected]>
Enable dynamic settings to mmcdev and mmcroot for i.MX8MQ-EVK Since we are here, clean up the including headers
--- board/freescale/imx8mq_evk/imx8mq_evk.c | 4 ++++ 1 file changed, 4 insertions(+)
board/freescale/imx8mq_evk/imx8mq_evk.c +4 -0
@@ -50,6 +50,10 @@ int board_mmc_get_env_dev(int devno)int board_late_init (void ) { +#if CONFIG_IS_ENABLED (ENV_IS_IN_MMC ) +board_late_mmc_env_init (); +#endif +#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG env_set ("board_name" ,"EVK" );env_set ("board_rev" ,"iMX8MQ" );
Signature · 1 line
2.35.3
PATCH v2 15/16 imx: imx8mq_evk: Switch to BOOTSTD
In reply to Peng Fan (OSS)From: Peng Fan <[email protected]>
Move env to imx8mq_evk.env
Switch to support BOOTSTD with a bsp bootcmd as fallback.
--- arch/arm/mach-imx/imx8m/Kconfig | 2 ++ board/freescale/imx8mq_evk/imx8mq_evk.env | 60 +++++++++++++++++++++++++++++++ configs/imx8mq_evk_defconfig | 3 +- include/configs/imx8mq_evk.h | 22 ------------ 4 files changed, 64 insertions(+), 23 deletions(-)
arch/arm/mach-imx/imx8m/Kconfig +2 -0
@@ -54,6 +54,8 @@ config TARGET_IMX8MQ_EVK select ARCH_MISC_INIT select SPL_CRYPTO if SPL imply OF_UPSTREAM + imply BOOTSTD_FULL + imply BOOTSTD_BOOTCOMMAND config TARGET_IMX8MQ_PHANBELL bool "imx8mq_phanbell"
board/freescale/imx8mq_evk/imx8mq_evk.env new file +60 -0
60 lines not on this page · raw message
configs/imx8mq_evk_defconfig +2 -1
@@ -30,8 +30,9 @@ CONFIG_REMAKE_ELF=y CONFIG_FIT=y CONFIG_FIT_EXTERNAL_OFFSET=0x3000 CONFIG_SPL_LOAD_FIT=y -CONFIG_DISTRO_DEFAULTS=y CONFIG_OF_SYSTEM_SETUP=y +CONFIG_BOOTCOMMAND="bootflow scan -lb; run bsp_bootcmd" +CONFIG_DEFAULT_FDT_FILE="imx8mp-evk.dtb" CONFIG_SYS_PBSIZE=1050 CONFIG_BOARD_EARLY_INIT_F=y CONFIG_BOARD_LATE_INIT=y
include/configs/imx8mq_evk.h +0 -22
@@ -26,28 +26,6 @@#define CFG_FEC_MXC_PHYADDR 0#endif -#define BOOT_TARGET_DEVICES (func) \ - func(MMC, mmc, 0) \ - func(MMC, mmc, 1) \ - func(DHCP, dhcp, na) - -#include <config_distro_bootcmd.h> - -/* Initial environment variables */ -#define CFG_EXTRA_ENV_SETTINGS \ - BOOTENV \ - "scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ - "kernel_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \ - "image=Image\0" \ - "console=ttymxc0,115200\0" \ - "fdt_addr_r=0x43000000\0" \ - "boot_fdt=try\0" \ - "fdtfile=imx8mq-evk.dtb\0" \ - "initrd_addr=0x43800000\0" \ - "bootm_size=0x10000000\0" \ - "mmcpart=1\0" \ - "mmcroot=/dev/mmcblk1p2 rootwait rw\0" \ -/* Link Definitions */ #define CFG_SYS_INIT_RAM_ADDR 0x40000000
Signature · 1 line
2.35.3
PATCH v2 16/16 imx: imx93-11x11-evk: drop duplicated nodes
In reply to Peng Fan (OSS)From: Peng Fan <[email protected]>
The upstream dts already has the lpi2c2 subnodes, so drop the duplicated ones in u-boot dtsi.
Since the adp5585 compatible string changes, update the driver compatible string. i.MX93 11x11 EVK is the only user of the driver as of now, so it is safe to drop legacy compatible string.
--- arch/arm/dts/imx93-11x11-evk-u-boot.dtsi | 118 ------------------------------- drivers/gpio/adp5585_gpio.c | 2 +- 2 files changed, 1 insertion(+), 119 deletions(-)
arch/arm/dts/imx93-11x11-evk-u-boot.dtsi +0 -118
@@ -26,111 +26,6 @@ bootph-pre-ram; }; -&lpi2c2 { - #address-cells = <1>; - #size-cells = <0>; - clock-frequency = <400000>; - pinctrl-names = "default", "sleep"; - pinctrl-0 = <&pinctrl_lpi2c2>; - pinctrl-1 = <&pinctrl_lpi2c2>; - status = "okay"; - - pmic@25 { - compatible = "nxp,pca9451a"; - reg = <0x25>; - interrupt-parent = <&pcal6524>; - interrupts = <11 IRQ_TYPE_LEVEL_LOW>; - - regulators { - buck1: BUCK1 { - regulator-name = "BUCK1"; - regulator-min-microvolt = <650000>; - regulator-max-microvolt = <2237500>; - regulator-boot-on; - regulator-always-on; - regulator-ramp-delay = <3125>; - }; - - buck2: BUCK2 { - regulator-name = "BUCK2"; - regulator-min-microvolt = <600000>; - regulator-max-microvolt = <2187500>; - regulator-boot-on; - regulator-always-on; - regulator-ramp-delay = <3125>; - }; - - buck4: BUCK4{ - regulator-name = "BUCK4"; - regulator-min-microvolt = <600000>; - regulator-max-microvolt = <3400000>; - regulator-boot-on; - regulator-always-on; - }; - - buck5: BUCK5{ - regulator-name = "BUCK5"; - regulator-min-microvolt = <600000>; - regulator-max-microvolt = <3400000>; - regulator-boot-on; - regulator-always-on; - }; - - buck6: BUCK6 { - regulator-name = "BUCK6"; - regulator-min-microvolt = <600000>; - regulator-max-microvolt = <3400000>; - regulator-boot-on; - regulator-always-on; - }; - - ldo1: LDO1 { - regulator-name = "LDO1"; - regulator-min-microvolt = <1600000>; - regulator-max-microvolt = <3300000>; - regulator-boot-on; - regulator-always-on; - }; - - ldo4: LDO4 { - regulator-name = "LDO4"; - regulator-min-microvolt = <800000>; - regulator-max-microvolt = <3300000>; - regulator-boot-on; - regulator-always-on; - }; - - ldo5: LDO5 { - regulator-name = "LDO5"; - regulator-min-microvolt = <1800000>; - regulator-max-microvolt = <3300000>; - regulator-boot-on; - regulator-always-on; - }; - }; - }; - - pcal6524: gpio@22 { - compatible = "nxp,pcal6524"; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_pcal6524>; - reg = <0x22>; - gpio-controller; - #gpio-cells = <2>; - interrupt-controller; - #interrupt-cells = <2>; - interrupt-parent = <&gpio3>; - interrupts = <27 IRQ_TYPE_LEVEL_LOW>; - }; - - adp5585gpio: gpio@34 { - compatible = "adp5585"; - reg = <0x34>; - gpio-controller; - #gpio-cells = <2>; - }; -}; - &aips1 { bootph-pre-ram; bootph-all;
@@ -149,19 +44,6 @@ &iomuxc { bootph-pre-ram; bootph-some-ram; - - pinctrl_lpi2c2: lpi2c2grp { - fsl,pins = < - MX93_PAD_I2C2_SCL__LPI2C2_SCL 0x40000b9e - MX93_PAD_I2C2_SDA__LPI2C2_SDA 0x40000b9e - >; - }; - - pinctrl_pcal6524: pcal6524grp { - fsl,pins = < - MX93_PAD_CCM_CLKO2__GPIO3_IO27 0x31e - >; - }; }; ®_usdhc2_vmmc {
drivers/gpio/adp5585_gpio.c +1 -1
@@ -224,7 +224,7 @@ static int adp5585_probe(struct udevice *dev) }static const struct udevice_id adp5585_ids[] = { - { .compatible ="adp5585" }, + { .compatible ="adi,adp5585" }, { } };
Signature · 1 line
2.35.3
Fabio Estevam
reviewerRe: [PATCH v2 16/16] imx: imx93-11x11-evk: drop duplicated nodes
Hi Peng,
drivers/gpio/adp5585_gpio.c static int adp5585_probe(struct udevice *dev) · line 227
Quoted 8 lines · Peng Fan (OSS)
drivers/gpio/adp5585_gpio.c +1
-1@@ -224,7 +224,7 @@ static int adp5585_probe(struct udevice *dev) }static const struct udevice_id adp5585_ids[] = { - { .compatible ="adp5585" }, + { .compatible ="adi,adp5585" },
Please don't mix dts with driver changes.
Make this driver change a separate patch.
RE: [PATCH v2 16/16] imx: imx93-11x11-evk: drop duplicated nodes
Quoted 13 lines
Subject: Re: [PATCH v2 16/16] imx: imx93-11x11-evk: drop duplicated nodes
Hi Peng,
drivers/gpio/adp5585_gpio.c static int adp5585_probe(struct udevice
Quoted 3 lines · Peng Fan (OSS)
drivers/gpio/adp5585_gpio.c +0
-0@@ -224,7 +224,7 @@ static int adp5585_probe(struct udevice*dev) }
Quoted 1 line
Quoted 7 lines
drivers/gpio/adp5585_gpio.c static int adp5585_probe(struct udevice *dev) · line 227
Quoted 3 lines
static const struct
udevice_idadp5585_ids[] = {drivers/gpio/adp5585_gpio.c +1
-1- { .compatible = "adp5585" }, + { .compatible = "adi,adp5585" },Please don't mix dts with driver changes.
Make this driver change a separate patch.
Could I just send out two patches for this change without resending the whole patchset? Or you expect me to send out v3 for this patchset?
Thanks,
Peng.
Fabio Estevam
reviewerRe: [PATCH v2 16/16] imx: imx93-11x11-evk: drop duplicated nodes
Quoted 3 lines · Peng Fan
Could I just send out two patches for this change without resending the whole patchset? Or you expect me to send out v3 for this patchset?
Please send an updated v3 as it is easier to handle it via patchwork.
I will then apply it soon.