From: Alice Guo <[email protected]> Using this patch, a bootable flash.bin can be generated. It contains seco container image, scfw image, u-boot-spl.bin, atf and u-boot.bin.
Signed-off-by: Alice Guo <[email protected]> --- arch/arm/dts/imx8qm-u-boot.dtsi | 38 ++++++-------------------- board/freescale/imx8qm_mek/imximage.cfg | 1 + board/freescale/imx8qm_mek/uboot-container.cfg | 2 +- configs/imx8qm_mek_defconfig | 1 + 4 files changed, 12 insertions(+), 30 deletions(-) diff --git a/arch/arm/dts/imx8qm-u-boot.dtsi b/arch/arm/dts/imx8qm-u-boot.dtsi index af229501a4d..85ddcc38993 100644 --- a/arch/arm/dts/imx8qm-u-boot.dtsi +++ b/arch/arm/dts/imx8qm-u-boot.dtsi @@ -10,32 +10,6 @@ }; &binman { -#ifdef CONFIG_XPL_BUILD - u-boot-spl-ddr { - align = <4>; - align-size = <4>; - filename = "u-boot-spl-ddr.bin"; - pad-byte = <0xff>; - - u-boot-spl { - align-end = <4>; - filename = "u-boot-spl.bin"; - }; - }; - - spl { - filename = "spl.bin"; - - mkimage { - args = "-n spl/u-boot-spl.cfgout -T imx8image -e 0x100000"; - - blob { - filename = "u-boot-spl-ddr.bin"; - }; - }; - }; -#endif - itb { filename = "u-boot.itb"; @@ -127,9 +101,15 @@ pad-byte = <0x00>; spl { - filename = "spl.bin"; - offset = <0x0>; - type = "blob-ext"; + align = <0x400>; + align-size = <0x400>; + type = "mkimage"; + args = "-n spl/u-boot-spl.cfgout -T imx8image"; + }; + + u-boot { + type = "mkimage"; + args = "-n u-boot-dtb.cfgout -T imx8image"; }; }; }; diff --git a/board/freescale/imx8qm_mek/imximage.cfg b/board/freescale/imx8qm_mek/imximage.cfg index 71612678c99..bead3a90d3c 100644 --- a/board/freescale/imx8qm_mek/imximage.cfg +++ b/board/freescale/imx8qm_mek/imximage.cfg @@ -6,6 +6,7 @@ /* Boot from SD, sector size 0x400 */ BOOT_FROM SD 0x400 +DCD_SKIP true /* SoC type IMX8QM */ SOC_TYPE IMX8QM /* Append seco container image */ diff --git a/board/freescale/imx8qm_mek/uboot-container.cfg b/board/freescale/imx8qm_mek/uboot-container.cfg index e25aa76fe18..2bc6e5ba572 100644 --- a/board/freescale/imx8qm_mek/uboot-container.cfg +++ b/board/freescale/imx8qm_mek/uboot-container.cfg @@ -9,4 +9,4 @@ BOOT_FROM SD 0x400 SOC_TYPE IMX8QM CONTAINER IMAGE A35 bl31.bin 0x80000000 -IMAGE A35 u-boot.bin CONFIG_TEXT_BASE +IMAGE A35 u-boot.bin 0x80020000 diff --git a/configs/imx8qm_mek_defconfig b/configs/imx8qm_mek_defconfig index afcb0f30594..6cfe840ba6b 100644 --- a/configs/imx8qm_mek_defconfig +++ b/configs/imx8qm_mek_defconfig @@ -42,6 +42,7 @@ CONFIG_SPL_BOARD_INIT=y # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set # CONFIG_SPL_LEGACY_IMAGE_FORMAT is not set CONFIG_SPL_LOAD_IMX_CONTAINER=y +CONFIG_IMX_CONFIG="board/freescale/imx8qm_mek/imximage.cfg" CONFIG_IMX_CONTAINER_CFG="board/freescale/imx8qm_mek/uboot-container.cfg" CONFIG_SPL_SYS_MALLOC_SIMPLE=y # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set -- 2.43.0
