Move i.MX8 container image loading support to common/spl

To facilitate testing loading i.MX8 container images, move the
parse-container code to common/spl.

Signed-off-by: Sean Anderson <seanga2@gmail.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index 67f0fe8..cde778b 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -300,6 +300,7 @@ F:  arch/arm/include/asm/arch-vf610/
 F:     arch/arm/include/asm/mach-imx/
 F:     board/freescale/*mx*/
 F:     board/freescale/common/
 F:     arch/arm/include/asm/mach-imx/
 F:     board/freescale/*mx*/
 F:     board/freescale/common/

+F:     common/spl/spl_imx_container.c

 F:     drivers/serial/serial_mxc.c
 F:     include/imx_container.h
 
 F:     drivers/serial/serial_mxc.c
 F:     include/imx_container.h
 

diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 266bb20..08ab706 100644 (file)
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -194,19 +194,6 @@ config IMX_DCD_ADDR
          This information is shared with the user via mkimage -l just so the
          image can be signed.
 
          This information is shared with the user via mkimage -l just so the
          image can be signed.
 

-config SPL_LOAD_IMX_CONTAINER
-       bool "Enable SPL loading U-Boot as a i.MX Container image"
-       depends on SPL
-       help
-         This is to let SPL could load i.MX Container image
-
-config IMX_CONTAINER_CFG
-       string "i.MX Container config file"
-       depends on SPL
-       help
-         This is to specific the cfg file for generating container
-         image which will be loaded by SPL.
-

 config IOMUX_LPSR
        bool
 
 config IOMUX_LPSR
        bool
 

diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
index 6904cf3..a3b44c9 100644 (file)
--- a/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@ -79,7 +79,7 @@ obj-$(CONFIG_CMD_NANDBCB) += cmd_nandbcb.o
 endif
 
 ifeq ($(CONFIG_SPL_BUILD),y)
 endif
 
 ifeq ($(CONFIG_SPL_BUILD),y)

-obj-$(CONFIG_SPL_LOAD_IMX_CONTAINER) += image-container.o parse-container.o
+obj-$(CONFIG_SPL_LOAD_IMX_CONTAINER) += image-container.o

 endif
 
 ifeq ($(SOC),$(filter $(SOC),imx8ulp imx9))
 endif
 
 ifeq ($(SOC),$(filter $(SOC),imx8ulp imx9))

diff --git a/common/spl/Kconfig b/common/spl/Kconfig
index 4632359..ad574a6 100644 (file)
--- a/common/spl/Kconfig
+++ b/common/spl/Kconfig
@@ -330,6 +330,20 @@ config SPL_LEGACY_IMAGE_CRC_CHECK
          If disabled, Legacy images are booted if the image magic and size
          are correct, without further integrity checks.
 
          If disabled, Legacy images are booted if the image magic and size
          are correct, without further integrity checks.
 

+config SPL_LOAD_IMX_CONTAINER
+       bool "Enable SPL loading and booting of i.MX8 Containers"
+       depends on SPL
+       help
+         Support booting U-Boot from an i.MX8 container image. If you are not
+         using i.MX8, say 'n'.
+
+config IMX_CONTAINER_CFG
+       string "i.MX8 Container config file"
+       depends on SPL && SPL_LOAD_IMX_CONTAINER
+       help
+         Specify the cfg file for generating the container image which will be
+         loaded by SPL.
+

 config SPL_SYS_MALLOC_SIMPLE
        bool "Only use malloc_simple functions in the SPL"
        help
 config SPL_SYS_MALLOC_SIMPLE
        bool "Only use malloc_simple functions in the SPL"
        help

diff --git a/common/spl/Makefile b/common/spl/Makefile
index bad2bbf..4f8eb2e 100644 (file)
--- a/common/spl/Makefile
+++ b/common/spl/Makefile
@@ -28,6 +28,7 @@ obj-$(CONFIG_$(SPL_TPL_)OPENSBI) += spl_opensbi.o
 obj-$(CONFIG_$(SPL_TPL_)USB_STORAGE) += spl_usb.o
 obj-$(CONFIG_$(SPL_TPL_)FS_FAT) += spl_fat.o
 obj-$(CONFIG_$(SPL_TPL_)FS_EXT4) += spl_ext.o
 obj-$(CONFIG_$(SPL_TPL_)USB_STORAGE) += spl_usb.o
 obj-$(CONFIG_$(SPL_TPL_)FS_FAT) += spl_fat.o
 obj-$(CONFIG_$(SPL_TPL_)FS_EXT4) += spl_ext.o

+obj-$(CONFIG_$(SPL_TPL_)LOAD_IMX_CONTAINER) += spl_imx_container.o

 obj-$(CONFIG_$(SPL_TPL_)SATA) += spl_sata.o
 obj-$(CONFIG_$(SPL_TPL_)NVME) += spl_nvme.o
 obj-$(CONFIG_$(SPL_TPL_)SEMIHOSTING) += spl_semihosting.o
 obj-$(CONFIG_$(SPL_TPL_)SATA) += spl_sata.o
 obj-$(CONFIG_$(SPL_TPL_)NVME) += spl_nvme.o
 obj-$(CONFIG_$(SPL_TPL_)SEMIHOSTING) += spl_semihosting.o

diff --git a/arch/arm/mach-imx/parse-container.c b/common/spl/spl_imx_container.c
similarity index 100%
rename from arch/arm/mach-imx/parse-container.c
rename to common/spl/spl_imx_container.c