colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

imx: imx91_evk: switch to BOOTSTD

Browse Source 
Switch to support BOOTSTD with a bsp bootcmd as fallback.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
This commit is contained in:
Peng Fan
2025-01-09 11:29:04 +08:00
committed by Fabio Estevam
parent d489e27c35
commit 4854b2777c
4 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-imx/imx9/Kconfig
View File

@@ -34,6 +34,8 @@ config TARGET_IMX91_11X11_EVK
select OF_BOARD_FIXUP select OF_BOARD_FIXUP
select IMX91 select IMX91
imply OF_UPSTREAM imply OF_UPSTREAM
imply BOOTSTD_FULL
imply BOOTSTD_BOOTCOMMAND
config TARGET_IMX93_9X9_QSB config TARGET_IMX93_9X9_QSB
bool "imx93_qsb" bool "imx93_qsb"

29
board/freescale/imx91_evk/imx91_evk.env
View File

@@ -10,6 +10,7 @@ fdt_addr_r=0x83000000
fdt_addr=0x83000000 fdt_addr=0x83000000
fdtfile=CONFIG_DEFAULT_FDT_FILE fdtfile=CONFIG_DEFAULT_FDT_FILE
image=Image image=Image
mmcdev=CONFIG_SYS_MMC_ENV_DEV
mmcpart=1 mmcpart=1
mmcroot=/dev/mmcblk1p2 rootwait rw mmcroot=/dev/mmcblk1p2 rootwait rw
mmcautodetect=yes mmcautodetect=yes
@@ -19,12 +20,13 @@ loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}
loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr_r} ${fdtfile} loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr_r} ${fdtfile}
loadcntr=fatload mmc ${mmcdev}:${mmcpart} ${cntr_addr} ${cntr_file} loadcntr=fatload mmc ${mmcdev}:${mmcpart} ${cntr_addr} ${cntr_file}
auth_os=auth_cntr ${cntr_addr} auth_os=auth_cntr ${cntr_addr}
sec_boot=no
boot_os=booti ${loadaddr} - ${fdt_addr_r} boot_os=booti ${loadaddr} - ${fdt_addr_r}
mmcboot= mmcboot=
echo Booting from mmc ...; echo Booting from mmc ...;
run mmcargs; run mmcargs;
if test ${sec_boot} = yes; then if test ${sec_boot} = yes; then
if run auth_os; then if run true; then
run boot_os; run boot_os;
else else
echo ERR: failed to authenticate; echo ERR: failed to authenticate;
@@ -48,7 +50,7 @@ netboot=
fi; fi;
if test ${sec_boot} = yes; then if test ${sec_boot} = yes; then
${get_cmd} ${cntr_addr} ${cntr_file}; ${get_cmd} ${cntr_addr} ${cntr_file};
if run auth_os; then if true; then
run boot_os; run boot_os;
else else
echo ERR: failed to authenticate; echo ERR: failed to authenticate;
@@ -61,3 +63,26 @@ netboot=
echo WARN: Cannot load the DT; echo WARN: Cannot load the DT;
fi; fi;
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

3
configs/imx91_11x11_evk_defconfig
View File

@@ -6,7 +6,6 @@ CONFIG_SYS_MALLOC_F_LEN=0x18000
CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_NR_DRAM_BANKS=2 CONFIG_NR_DRAM_BANKS=2
CONFIG_ENV_SOURCE_FILE="imx91_evk"
CONFIG_SF_DEFAULT_SPEED=40000000 CONFIG_SF_DEFAULT_SPEED=40000000
CONFIG_ENV_SIZE=0x4000 CONFIG_ENV_SIZE=0x4000
CONFIG_ENV_OFFSET=0x700000 CONFIG_ENV_OFFSET=0x700000
@@ -31,7 +30,7 @@ CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x88000000
CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_START=0x80000000
CONFIG_SYS_MEMTEST_END=0x90000000 CONFIG_SYS_MEMTEST_END=0x90000000
CONFIG_REMAKE_ELF=y CONFIG_REMAKE_ELF=y
CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTCOMMAND="bootflow scan -lb; run bsp_bootcmd"
CONFIG_OF_SYSTEM_SETUP=y CONFIG_OF_SYSTEM_SETUP=y
CONFIG_DEFAULT_FDT_FILE="imx91-11x11-evk.dtb" CONFIG_DEFAULT_FDT_FILE="imx91-11x11-evk.dtb"
CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_CBSIZE=2048

3
configs/imx91_11x11_evk_inline_ecc_defconfig
View File

@@ -6,7 +6,6 @@ CONFIG_SYS_MALLOC_F_LEN=0x18000
CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_NR_DRAM_BANKS=2 CONFIG_NR_DRAM_BANKS=2
CONFIG_ENV_SOURCE_FILE="imx91_evk"
CONFIG_SF_DEFAULT_SPEED=40000000 CONFIG_SF_DEFAULT_SPEED=40000000
CONFIG_ENV_SIZE=0x4000 CONFIG_ENV_SIZE=0x4000
CONFIG_ENV_OFFSET=0x700000 CONFIG_ENV_OFFSET=0x700000
@@ -31,7 +30,7 @@ CONFIG_SPL_IMX_ROMAPI_LOADADDR=0x88000000
CONFIG_SYS_MEMTEST_START=0x80000000 CONFIG_SYS_MEMTEST_START=0x80000000
CONFIG_SYS_MEMTEST_END=0x90000000 CONFIG_SYS_MEMTEST_END=0x90000000
CONFIG_REMAKE_ELF=y CONFIG_REMAKE_ELF=y
CONFIG_DISTRO_DEFAULTS=y CONFIG_BOOTCOMMAND="bootflow scan -lb; run bsp_bootcmd"
CONFIG_OF_SYSTEM_SETUP=y CONFIG_OF_SYSTEM_SETUP=y
CONFIG_DEFAULT_FDT_FILE="imx91-11x11-evk.dtb" CONFIG_DEFAULT_FDT_FILE="imx91-11x11-evk.dtb"
CONFIG_SYS_CBSIZE=2048 CONFIG_SYS_CBSIZE=2048