From: Ye Li ye.li@nxp.com
Since we will re-use the container parser on imx8ulp, move the codes to mach-imx
Signed-off-by: Ye Li ye.li@nxp.com --- arch/arm/mach-imx/Makefile | 4 ++++ arch/arm/mach-imx/{imx8/image.c => image-container.c} | 0 arch/arm/mach-imx/imx8/Makefile | 3 --- arch/arm/mach-imx/{imx8 => }/parse-container.c | 0 4 files changed, 4 insertions(+), 3 deletions(-) rename arch/arm/mach-imx/{imx8/image.c => image-container.c} (100%) rename arch/arm/mach-imx/{imx8 => }/parse-container.c (100%)
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile index 36224d8db9..0ef269563d 100644 --- a/arch/arm/mach-imx/Makefile +++ b/arch/arm/mach-imx/Makefile @@ -68,6 +68,10 @@ obj-$(CONFIG_CMD_DEKBLOB) += cmd_dek.o obj-$(CONFIG_CMD_NANDBCB) += cmd_nandbcb.o endif
+ifeq ($(CONFIG_SPL_BUILD),y) +obj-$(CONFIG_SPL_LOAD_IMX_CONTAINER) += image-container.o parse-container.o +endif + PLUGIN = board/$(BOARDDIR)/plugin
ifeq ($(CONFIG_USE_IMXIMG_PLUGIN),y) diff --git a/arch/arm/mach-imx/imx8/image.c b/arch/arm/mach-imx/image-container.c similarity index 100% rename from arch/arm/mach-imx/imx8/image.c rename to arch/arm/mach-imx/image-container.c diff --git a/arch/arm/mach-imx/imx8/Makefile b/arch/arm/mach-imx/imx8/Makefile index bbb41adbe4..4ca4c14bdd 100644 --- a/arch/arm/mach-imx/imx8/Makefile +++ b/arch/arm/mach-imx/imx8/Makefile @@ -8,7 +8,4 @@ obj-y += cpu.o iomux.o misc.o lowlevel_init.o obj-$(CONFIG_OF_SYSTEM_SETUP) += fdt.o obj-$(CONFIG_AHAB_BOOT) += ahab.o
-ifdef CONFIG_SPL_BUILD -obj-$(CONFIG_SPL_LOAD_IMX_CONTAINER) += image.o parse-container.o -endif obj-$(CONFIG_IMX_SNVS_SEC_SC) += snvs_security_sc.o diff --git a/arch/arm/mach-imx/imx8/parse-container.c b/arch/arm/mach-imx/parse-container.c similarity index 100% rename from arch/arm/mach-imx/imx8/parse-container.c rename to arch/arm/mach-imx/parse-container.c