On 20/05/2022 17:10, Peng Fan (OSS) wrote: > From: Peng Fan <peng....@nxp.com> > > Use BINMAN instead of imx specific packing method. > > Signed-off-by: Peng Fan <peng....@nxp.com> > --- > arch/arm/mach-imx/imx8m/Kconfig | 1 + > arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg | 10 +---------
Maybe this could be done for other imximage*.cfg files as well? > configs/imx8mm-icore-mx8mm-ctouch2_defconfig | 2 +- > configs/imx8mm-icore-mx8mm-edimm2.2_defconfig | 2 +- > 4 files changed, 4 insertions(+), 11 deletions(-) > > diff --git a/arch/arm/mach-imx/imx8m/Kconfig b/arch/arm/mach-imx/imx8m/Kconfig > index 24299ae037f..75ad7aab081 100644 > --- a/arch/arm/mach-imx/imx8m/Kconfig > +++ b/arch/arm/mach-imx/imx8m/Kconfig > @@ -68,6 +68,7 @@ config TARGET_IMX8MM_EVK > > config TARGET_IMX8MM_ICORE_MX8MM > bool "Engicam i.Core MX8M Mini SOM" > + select BINMAN > select IMX8MM > select SUPPORT_SPL > select IMX8M_LPDDR4 > diff --git a/arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg > b/arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg > index e06d53ef417..5dcb8ae72f0 100644 > --- a/arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg > +++ b/arch/arm/mach-imx/imx8m/imximage-8mm-lpddr4.cfg > @@ -3,13 +3,5 @@ > * Copyright 2019 NXP > */ > > - > -FIT > BOOT_FROM sd > -LOADER spl/u-boot-spl-ddr.bin 0x7E1000 > -SECOND_LOADER u-boot.itb 0x40200000 0x60000 > - > -DDR_FW lpddr4_pmu_train_1d_imem.bin > -DDR_FW lpddr4_pmu_train_1d_dmem.bin > -DDR_FW lpddr4_pmu_train_2d_imem.bin > -DDR_FW lpddr4_pmu_train_2d_dmem.bin > +LOADER u-boot-spl-ddr.bin 0x7E1000 > diff --git a/configs/imx8mm-icore-mx8mm-ctouch2_defconfig > b/configs/imx8mm-icore-mx8mm-ctouch2_defconfig > index d95a74a7237..dcb12e5d026 100644 > --- a/configs/imx8mm-icore-mx8mm-ctouch2_defconfig > +++ b/configs/imx8mm-icore-mx8mm-ctouch2_defconfig > @@ -20,7 +20,7 @@ CONFIG_DISTRO_DEFAULTS=y > CONFIG_FIT=y > CONFIG_FIT_EXTERNAL_OFFSET=0x3000 > CONFIG_SPL_LOAD_FIT=y > -CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh" > +# CONFIG_USE_SPL_FIT_GENERATOR is not set > CONFIG_OF_SYSTEM_SETUP=y > CONFIG_DEFAULT_FDT_FILE="imx8mm-icore-mx8mm-ctouch2.dtb" > CONFIG_SPL_BOARD_INIT=y > diff --git a/configs/imx8mm-icore-mx8mm-edimm2.2_defconfig > b/configs/imx8mm-icore-mx8mm-edimm2.2_defconfig > index 43c697a39d8..22acf7317b4 100644 > --- a/configs/imx8mm-icore-mx8mm-edimm2.2_defconfig > +++ b/configs/imx8mm-icore-mx8mm-edimm2.2_defconfig > @@ -20,7 +20,7 @@ CONFIG_DISTRO_DEFAULTS=y > CONFIG_FIT=y > CONFIG_FIT_EXTERNAL_OFFSET=0x3000 > CONFIG_SPL_LOAD_FIT=y > -CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-imx/mkimage_fit_atf.sh" > +# CONFIG_USE_SPL_FIT_GENERATOR is not set > CONFIG_OF_SYSTEM_SETUP=y > CONFIG_DEFAULT_FDT_FILE="imx8mm-icore-mx8mm-edimm2.2.dtb" > CONFIG_SPL_BOARD_INIT=y
