Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-24 13:43:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

arm: imx: Check header before calling spl_load_imx_container

Browse source 
Make sure we have an IMX header before calling spl_load_imx_container,
since if we don't it will fail with -ENOENT. This allows us to fall back to
legacy/raw images if they are also enabled.

This is a functional change, one which likely should have been in place
from the start, but a functional change nonetheless. Previously, all
non-IMX8 images (except FITs without FIT_FULL) would be optimized out if
the only image load method enabled supported IMX8 images. With this change,
support for other image types now has an effect.

There are seven boards with SPL_LOAD_IMX_CONTAINER enabled: three with
SPL_BOOTROM_SUPPORT:

    imx93_11x11_evk_ld imx93_11x11_evk imx8ulp_evk

and four with SPL_MMC:

    deneb imx8qxp_mek giedi imx8qm_mek

All of these boards also have SPL_RAW_IMAGE_SUPPORT and
SPL_LEGACY_IMAGE_FORMAT enabled as well. However, none have FIT support
enabled. Of the six load methods affected by this patch, only SPL_MMC and
SPL_BOOTROM_SUPPORT are enabled with SPL_LOAD_IMX_CONTAINER.
spl_romapi_load_image_seekable does not support legacy or raw images, so
there is no growth. However, mmc_load_image_raw_sector does support loading
legacy/raw images. Since these images could not have been booted before, I
have disabled support for legacy/raw images on these four boards. This
reduces bloat from around 800 bytes to around 200.

There are no in-tree boards with SPL_LOAD_IMX_CONTAINER and AHAB_BOOT both
enabled, so we do not need to worry about potentially falling back to
legacy images in a secure boot scenario.

Future work could include merging imx_container.h with imx8image.h, since
they appear to define mostly the same structures.

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

1
MAINTAINERS
View file

@ -301,6 +301,7 @@ F: arch/arm/include/asm/mach-imx/
F: board/freescale/*mx*/ F: board/freescale/*mx*/
F: board/freescale/common/ F: board/freescale/common/
F: drivers/serial/serial_mxc.c F: drivers/serial/serial_mxc.c
F: include/imx_container.h
ARM HISILICON ARM HISILICON
M: Peter Griffin <peter.griffin@linaro.org> M: Peter Griffin <peter.griffin@linaro.org>

2
arch/arm/include/asm/mach-imx/ahab.h
View file

@ -6,7 +6,7 @@
#ifndef __IMX_AHAB_H__ #ifndef __IMX_AHAB_H__
#define __IMX_AHAB_H__ #define __IMX_AHAB_H__
#include <asm/mach-imx/image.h> #include <imx_container.h>
int ahab_auth_cntr_hdr(struct container_hdr *container, u16 length); int ahab_auth_cntr_hdr(struct container_hdr *container, u16 length);
int ahab_auth_release(void); int ahab_auth_release(void);

4
arch/arm/mach-imx/cmd_dek.c
View file

@ -18,12 +18,12 @@
#include <mapmem.h> #include <mapmem.h>
#include <tee.h> #include <tee.h>
#ifdef CONFIG_IMX_SECO_DEK_ENCAP #ifdef CONFIG_IMX_SECO_DEK_ENCAP
#include <imx_container.h>
#include <firmware/imx/sci/sci.h> #include <firmware/imx/sci/sci.h>
#include <asm/mach-imx/image.h>
#endif #endif
#ifdef CONFIG_IMX_ELE_DEK_ENCAP #ifdef CONFIG_IMX_ELE_DEK_ENCAP
#include <imx_container.h>
#include <asm/mach-imx/ele_api.h> #include <asm/mach-imx/ele_api.h>
#include <asm/mach-imx/image.h>
#endif #endif
#include <cpu_func.h> #include <cpu_func.h>

2
arch/arm/mach-imx/ele_ahab.c
View file

@ -6,12 +6,12 @@
#include <common.h> #include <common.h>
#include <command.h> #include <command.h>
#include <errno.h> #include <errno.h>
#include <imx_container.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/mach-imx/ele_api.h> #include <asm/mach-imx/ele_api.h>
#include <asm/mach-imx/sys_proto.h> #include <asm/mach-imx/sys_proto.h>
#include <asm/arch-imx/cpu.h> #include <asm/arch-imx/cpu.h>
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>
#include <asm/mach-imx/image.h>
#include <console.h> #include <console.h>
#include <cpu_func.h> #include <cpu_func.h>
#include <asm/global_data.h> #include <asm/global_data.h>

2
arch/arm/mach-imx/image-container.c
View file

@ -5,6 +5,7 @@
#include <common.h> #include <common.h>
#include <errno.h> #include <errno.h>
#include <imx_container.h>
#include <log.h> #include <log.h>
#include <malloc.h> #include <malloc.h>
#include <asm/io.h> #include <asm/io.h>
@ -12,7 +13,6 @@
#include <spi_flash.h> #include <spi_flash.h>
#include <spl.h> #include <spl.h>
#include <nand.h> #include <nand.h>
#include <asm/mach-imx/image.h>
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>
#include <asm/mach-imx/boot_mode.h> #include <asm/mach-imx/boot_mode.h>

2
arch/arm/mach-imx/imx8/ahab.c
View file

@ -6,6 +6,7 @@
#include <common.h> #include <common.h>
#include <command.h> #include <command.h>
#include <errno.h> #include <errno.h>
#include <imx_container.h>
#include <log.h> #include <log.h>
#include <asm/global_data.h> #include <asm/global_data.h>
#include <asm/io.h> #include <asm/io.h>
@ -13,7 +14,6 @@
#include <asm/mach-imx/sys_proto.h> #include <asm/mach-imx/sys_proto.h>
#include <asm/arch-imx/cpu.h> #include <asm/arch-imx/cpu.h>
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>
#include <asm/mach-imx/image.h>
#include <console.h> #include <console.h>
#include <cpu_func.h> #include <cpu_func.h>
#include "u-boot/sha256.h" #include "u-boot/sha256.h"

2
arch/arm/mach-imx/parse-container.c
View file

@ -7,9 +7,9 @@
#include <common.h> #include <common.h>
#include <stdlib.h> #include <stdlib.h>
#include <errno.h> #include <errno.h>
#include <imx_container.h>
#include <log.h> #include <log.h>
#include <spl.h> #include <spl.h>
#include <asm/mach-imx/image.h>
#ifdef CONFIG_AHAB_BOOT #ifdef CONFIG_AHAB_BOOT
#include <asm/mach-imx/ahab.h> #include <asm/mach-imx/ahab.h>
#endif #endif

5
arch/arm/mach-imx/spl_imx_romapi.c
View file

@ -6,11 +6,11 @@
#include <common.h> #include <common.h>
#include <errno.h> #include <errno.h>
#include <image.h> #include <image.h>
#include <imx_container.h>
#include <log.h> #include <log.h>
#include <asm/global_data.h> #include <asm/global_data.h>
#include <linux/libfdt.h> #include <linux/libfdt.h>
#include <spl.h> #include <spl.h>
#include <asm/mach-imx/image.h>
#include <asm/arch/sys_proto.h> #include <asm/arch/sys_proto.h>
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
@ -111,7 +111,8 @@ static int spl_romapi_load_image_seekable(struct spl_image_info *spl_image,
load.read = spl_romapi_read_seekable; load.read = spl_romapi_read_seekable;
load.priv = &pagesize; load.priv = &pagesize;
return spl_load_simple_fit(spl_image, &load, offset / pagesize, header); return spl_load_simple_fit(spl_image, &load, offset / pagesize, header);
} else if (IS_ENABLED(CONFIG_SPL_LOAD_IMX_CONTAINER)) { } else if (IS_ENABLED(CONFIG_SPL_LOAD_IMX_CONTAINER) &&
valid_container_hdr((void *)header)) {
struct spl_load_info load; struct spl_load_info load;
memset(&load, 0, sizeof(load)); memset(&load, 0, sizeof(load));

4
common/spl/spl_mmc.c
View file

@ -16,6 +16,7 @@
#include <errno.h> #include <errno.h>
#include <mmc.h> #include <mmc.h>
#include <image.h> #include <image.h>
#include <imx_container.h>
static int mmc_load_legacy(struct spl_image_info *spl_image, static int mmc_load_legacy(struct spl_image_info *spl_image,
struct spl_boot_device *bootdev, struct spl_boot_device *bootdev,
@ -108,7 +109,8 @@ int mmc_load_image_raw_sector(struct spl_image_info *spl_image,
load.bl_len = mmc->read_bl_len; load.bl_len = mmc->read_bl_len;
load.read = h_spl_load_read; load.read = h_spl_load_read;
ret = spl_load_simple_fit(spl_image, &load, sector, header); ret = spl_load_simple_fit(spl_image, &load, sector, header);
} else if (IS_ENABLED(CONFIG_SPL_LOAD_IMX_CONTAINER)) { } else if (IS_ENABLED(CONFIG_SPL_LOAD_IMX_CONTAINER) &&
valid_container_hdr((void *)header)) {
struct spl_load_info load; struct spl_load_info load;
load.dev = mmc; load.dev = mmc;

4
common/spl/spl_nand.c
View file

@ -7,6 +7,7 @@
#include <config.h> #include <config.h>
#include <fdt_support.h> #include <fdt_support.h>
#include <image.h> #include <image.h>
#include <imx_container.h>
#include <log.h> #include <log.h>
#include <spl.h> #include <spl.h>
#include <asm/io.h> #include <asm/io.h>
@ -99,7 +100,8 @@ static int spl_nand_load_element(struct spl_image_info *spl_image,
load.bl_len = bl_len; load.bl_len = bl_len;
load.read = spl_nand_fit_read; load.read = spl_nand_fit_read;
return spl_load_simple_fit(spl_image, &load, offset / bl_len, header); return spl_load_simple_fit(spl_image, &load, offset / bl_len, header);
} else if (IS_ENABLED(CONFIG_SPL_LOAD_IMX_CONTAINER)) { } else if (IS_ENABLED(CONFIG_SPL_LOAD_IMX_CONTAINER) &&
valid_container_hdr((void *)header)) {
struct spl_load_info load; struct spl_load_info load;
load.dev = NULL; load.dev = NULL;

4
common/spl/spl_nor.c
View file

@ -5,6 +5,7 @@
#include <common.h> #include <common.h>
#include <image.h> #include <image.h>
#include <imx_container.h>
#include <log.h> #include <log.h>
#include <spl.h> #include <spl.h>
@ -102,7 +103,8 @@ static int spl_nor_load_image(struct spl_image_info *spl_image,
(void *)header); (void *)header);
} }
#endif #endif
if (IS_ENABLED(CONFIG_SPL_LOAD_IMX_CONTAINER)) { if (IS_ENABLED(CONFIG_SPL_LOAD_IMX_CONTAINER) &&
valid_container_hdr((void *)header)) {
load.bl_len = 1; load.bl_len = 1;
load.read = spl_nor_load_read; load.read = spl_nor_load_read;
return spl_load_imx_container(spl_image, &load, return spl_load_imx_container(spl_image, &load,

4
common/spl/spl_spi.c
View file

@ -10,6 +10,7 @@
#include <common.h> #include <common.h>
#include <image.h> #include <image.h>
#include <imx_container.h>
#include <log.h> #include <log.h>
#include <spi.h> #include <spi.h>
#include <spi_flash.h> #include <spi_flash.h>
@ -153,7 +154,8 @@ static int spl_spi_load_image(struct spl_image_info *spl_image,
err = spl_load_simple_fit(spl_image, &load, err = spl_load_simple_fit(spl_image, &load,
payload_offs, payload_offs,
header); header);
} else if (IS_ENABLED(CONFIG_SPL_LOAD_IMX_CONTAINER)) { } else if (IS_ENABLED(CONFIG_SPL_LOAD_IMX_CONTAINER) &&
valid_container_hdr((void *)header)) {
struct spl_load_info load; struct spl_load_info load;
load.dev = flash; load.dev = flash;

2
configs/deneb_defconfig
View file

@ -44,6 +44,8 @@ CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
CONFIG_SPL_BSS_START_ADDR=0x128000 CONFIG_SPL_BSS_START_ADDR=0x128000
CONFIG_SPL_BSS_MAX_SIZE=0x1000 CONFIG_SPL_BSS_MAX_SIZE=0x1000
CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_BOARD_INIT=y
# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
# CONFIG_SPL_LEGACY_IMAGE_FORMAT is not set
CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y
# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
CONFIG_SPL_SYS_MALLOC=y CONFIG_SPL_SYS_MALLOC=y

2
configs/giedi_defconfig
View file

@ -44,6 +44,8 @@ CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
CONFIG_SPL_BSS_START_ADDR=0x128000 CONFIG_SPL_BSS_START_ADDR=0x128000
CONFIG_SPL_BSS_MAX_SIZE=0x1000 CONFIG_SPL_BSS_MAX_SIZE=0x1000
CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_BOARD_INIT=y
# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
# CONFIG_SPL_LEGACY_IMAGE_FORMAT is not set
CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y
# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
CONFIG_SPL_SYS_MALLOC=y CONFIG_SPL_SYS_MALLOC=y

2
configs/imx8qm_mek_defconfig
View file

@ -38,6 +38,8 @@ CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
CONFIG_SPL_BSS_START_ADDR=0x128000 CONFIG_SPL_BSS_START_ADDR=0x128000
CONFIG_SPL_BSS_MAX_SIZE=0x1000 CONFIG_SPL_BSS_MAX_SIZE=0x1000
CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_BOARD_INIT=y
# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
# CONFIG_SPL_LEGACY_IMAGE_FORMAT is not set
CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y
# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
CONFIG_SPL_SYS_MALLOC=y CONFIG_SPL_SYS_MALLOC=y

2
configs/imx8qxp_mek_defconfig
View file

@ -38,6 +38,8 @@ CONFIG_SPL_HAS_BSS_LINKER_SECTION=y
CONFIG_SPL_BSS_START_ADDR=0x128000 CONFIG_SPL_BSS_START_ADDR=0x128000
CONFIG_SPL_BSS_MAX_SIZE=0x1000 CONFIG_SPL_BSS_MAX_SIZE=0x1000
CONFIG_SPL_BOARD_INIT=y CONFIG_SPL_BOARD_INIT=y
# CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
# CONFIG_SPL_LEGACY_IMAGE_FORMAT is not set
CONFIG_SPL_SYS_MALLOC_SIMPLE=y CONFIG_SPL_SYS_MALLOC_SIMPLE=y
# CONFIG_SPL_SHARES_INIT_SP_ADDR is not set # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set
CONFIG_SPL_SYS_MALLOC=y CONFIG_SPL_SYS_MALLOC=y

4
drivers/usb/gadget/f_sdp.c
View file

@ -34,6 +34,7 @@
#include <spl.h> #include <spl.h>
#include <image.h> #include <image.h>
#include <imximage.h> #include <imximage.h>
#include <imx_container.h>
#include <watchdog.h> #include <watchdog.h>
#define HID_REPORT_ID_MASK 0x000000ff #define HID_REPORT_ID_MASK 0x000000ff
@ -852,7 +853,8 @@ static int sdp_handle_in_ep(struct spl_image_info *spl_image,
return SDP_EXIT; return SDP_EXIT;
} }
#endif #endif
if (IS_ENABLED(CONFIG_SPL_LOAD_IMX_CONTAINER)) { if (IS_ENABLED(CONFIG_SPL_LOAD_IMX_CONTAINER) &&
valid_container_hdr((void *)header)) {
struct spl_load_info load; struct spl_load_info load;
load.dev = header; load.dev = header;

0
arch/arm/include/asm/mach-imx/image.h → include/imx_container.h
View file