Skip to content

Commit

Permalink
Move i.MX8 container image loading support to common/spl
Browse files Browse the repository at this point in the history
To facilitate testing loading i.MX8 container images, move the
parse-container code to common/spl.

Signed-off-by: Sean Anderson <[email protected]>
  • Loading branch information
Forty-Bot authored and trini committed Oct 18, 2023
1 parent ab12179 commit 12b3339
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 14 deletions.
1 change: 1 addition & 0 deletions MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -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: common/spl/spl_imx_container.c
F: drivers/serial/serial_mxc.c
F: include/imx_container.h

Expand Down
13 changes: 0 additions & 13 deletions arch/arm/mach-imx/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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.

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

Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mach-imx/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ 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
obj-$(CONFIG_SPL_LOAD_IMX_CONTAINER) += image-container.o
endif

ifeq ($(SOC),$(filter $(SOC),imx8ulp imx9))
Expand Down
14 changes: 14 additions & 0 deletions common/spl/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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.

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
Expand Down
1 change: 1 addition & 0 deletions common/spl/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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_)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
Expand Down
File renamed without changes.

0 comments on commit 12b3339

Please sign in to comment.