Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-26 23:41:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

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

Signed-off-by: Sean Anderson <seanga2@gmail.com>
This commit is contained in:
Sean Anderson 2023-10-14 16:47:45 -04:00 • committed by Tom Rini
parent ab12179b3e
commit 12b3339070
6 changed files with 17 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
MAINTAINERS
View file

@ -300,6 +300,7 @@ F: arch/arm/include/asm/arch-vf610/
F: arch/arm/include/asm/mach-imx/ F: arch/arm/include/asm/mach-imx/
F: board/freescale/*mx*/ F: board/freescale/*mx*/
F: board/freescale/common/ F: board/freescale/common/
F: common/spl/spl_imx_container.c
F: drivers/serial/serial_mxc.c F: drivers/serial/serial_mxc.c
F: include/imx_container.h F: include/imx_container.h

13
arch/arm/mach-imx/Kconfig
View file

@ -194,19 +194,6 @@ config IMX_DCD_ADDR
This information is shared with the user via mkimage -l just so the This information is shared with the user via mkimage -l just so the
image can be signed. 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 config IOMUX_LPSR
bool bool

2
arch/arm/mach-imx/Makefile
View file

@ -79,7 +79,7 @@ obj-$(CONFIG_CMD_NANDBCB) += cmd_nandbcb.o
endif endif
ifeq ($(CONFIG_SPL_BUILD),y) 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 endif
ifeq ($(SOC),$(filter $(SOC),imx8ulp imx9)) ifeq ($(SOC),$(filter $(SOC),imx8ulp imx9))

14
common/spl/Kconfig
View file

@ -330,6 +330,20 @@ config SPL_LEGACY_IMAGE_CRC_CHECK
If disabled, Legacy images are booted if the image magic and size If disabled, Legacy images are booted if the image magic and size
are correct, without further integrity checks. 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 config SPL_SYS_MALLOC_SIMPLE
bool "Only use malloc_simple functions in the SPL" bool "Only use malloc_simple functions in the SPL"
help help

1
common/spl/Makefile
View file

@ -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_)USB_STORAGE) += spl_usb.o
obj-$(CONFIG_$(SPL_TPL_)FS_FAT) += spl_fat.o obj-$(CONFIG_$(SPL_TPL_)FS_FAT) += spl_fat.o
obj-$(CONFIG_$(SPL_TPL_)FS_EXT4) += spl_ext.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_)SATA) += spl_sata.o
obj-$(CONFIG_$(SPL_TPL_)NVME) += spl_nvme.o obj-$(CONFIG_$(SPL_TPL_)NVME) += spl_nvme.o
obj-$(CONFIG_$(SPL_TPL_)SEMIHOSTING) += spl_semihosting.o obj-$(CONFIG_$(SPL_TPL_)SEMIHOSTING) += spl_semihosting.o

0
arch/arm/mach-imx/parse-container.c → common/spl/spl_imx_container.c
View file