Use the new helper for i.MX8MP/MM EVK boards. Also add the necessary gencsf header to the imxcfg. Signed-off-by: Rouven Czerwinski <r.czerwinski@xxxxxxxxxxxxxx> --- .../nxp-imx8mm-evk/flash-header-imx8mm-evk.imxcfg | 1 + .../nxp-imx8mp-evk/flash-header-imx8mp-evk.imxcfg | 1 + images/Makefile.imx | 10 ++-------- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/arch/arm/boards/nxp-imx8mm-evk/flash-header-imx8mm-evk.imxcfg b/arch/arm/boards/nxp-imx8mm-evk/flash-header-imx8mm-evk.imxcfg index d6a536053e..a89243a78a 100644 --- a/arch/arm/boards/nxp-imx8mm-evk/flash-header-imx8mm-evk.imxcfg +++ b/arch/arm/boards/nxp-imx8mm-evk/flash-header-imx8mm-evk.imxcfg @@ -8,3 +8,4 @@ ivtofs 0x400 flexspi_ivtofs 0x1000 flexspi_fcfbofs 0x0 +#include <mach/imx/habv4-imx8-gencsf.h> diff --git a/arch/arm/boards/nxp-imx8mp-evk/flash-header-imx8mp-evk.imxcfg b/arch/arm/boards/nxp-imx8mp-evk/flash-header-imx8mp-evk.imxcfg index 3bb44d199c..6b05c2c38c 100644 --- a/arch/arm/boards/nxp-imx8mp-evk/flash-header-imx8mp-evk.imxcfg +++ b/arch/arm/boards/nxp-imx8mp-evk/flash-header-imx8mp-evk.imxcfg @@ -8,3 +8,4 @@ ivtofs 0x0 flexspi_ivtofs 0x0 flexspi_fcfbofs 0x400 +#include <mach/imx/habv4-imx8-gencsf.h> diff --git a/images/Makefile.imx b/images/Makefile.imx index 5691f2d70f..c988c68ded 100644 --- a/images/Makefile.imx +++ b/images/Makefile.imx @@ -444,10 +444,7 @@ FILE_barebox-kamstrup-mx7-concentrator.img = start_kamstrup_mx7_concentrator.pbl image-$(CONFIG_MACH_KAMSTRUP_MX7_CONCENTRATOR) += barebox-kamstrup-mx7-concentrator.img # ----------------------- i.MX8mm based boards -------------------------- -pblb-$(CONFIG_MACH_NXP_IMX8MM_EVK) += start_nxp_imx8mm_evk -CFG_start_nxp_imx8mm_evk.pblb.imximg = $(board)/nxp-imx8mm-evk/flash-header-imx8mm-evk.imxcfg -FILE_barebox-nxp-imx8mm-evk.img = start_nxp_imx8mm_evk.pblb.pimximg -image-$(CONFIG_MACH_NXP_IMX8MM_EVK) += barebox-nxp-imx8mm-evk.img +$(call build_imx8m_habv4img, CONFIG_MACH_NXP_IMX8MM_EVK, start_nxp_imx8mm_evk, nxp-imx8mm-evk/flash-header-imx8mm-evk, nxp-imx8mm-evk) pblb-$(CONFIG_MACH_PROTONIC_IMX8M) += start_prt_prt8mm CFG_start_prt_prt8mm.pblb.imximg = $(board)/protonic-imx8m/flash-header-prt8mm.imxcfg @@ -466,10 +463,7 @@ FILE_barebox-nxp-imx8mn-evk.img = start_nxp_imx8mn_evk.pblb.pimximg image-$(CONFIG_MACH_NXP_IMX8MN_EVK) += barebox-nxp-imx8mn-evk.img # ----------------------- i.MX8mp based boards -------------------------- -pblb-$(CONFIG_MACH_NXP_IMX8MP_EVK) += start_nxp_imx8mp_evk -CFG_start_nxp_imx8mp_evk.pblb.imximg = $(board)/nxp-imx8mp-evk/flash-header-imx8mp-evk.imxcfg -FILE_barebox-nxp-imx8mp-evk.img = start_nxp_imx8mp_evk.pblb.pimximg -image-$(CONFIG_MACH_NXP_IMX8MP_EVK) += barebox-nxp-imx8mp-evk.img +$(call build_imx8m_habv4img, CONFIG_MACH_NXP_IMX8MP_EVK, start_nxp_imx8mp_evk, nxp-imx8mp-evk/flash-header-imx8mp-evk.imxcfg, nxp-imx8mp-evk) pblb-$(CONFIG_MACH_TQ_MBA8MPXL) += start_tqma8mpxl CFG_start_tqma8mpxl.pblb.imximg = $(board)/tqma8mpxl/flash-header-tqma8mpxl.imxcfg -- 2.41.0
