ab12179b3e
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>
79 lines
1.4 KiB
C
79 lines
1.4 KiB
C
/* SPDX-License-Identifier: GPL-2.0+ */
|
|
/*
|
|
* Copyright 2018-2019 NXP
|
|
*/
|
|
|
|
#ifndef __CONTAINER_HEADER_H_
|
|
#define __CONTAINER_HEADER_H_
|
|
|
|
#include <linux/sizes.h>
|
|
#include <linux/types.h>
|
|
|
|
#define IV_MAX_LEN 32
|
|
#define HASH_MAX_LEN 64
|
|
|
|
#define CONTAINER_HDR_ALIGNMENT 0x400
|
|
#define CONTAINER_HDR_EMMC_OFFSET 0
|
|
#define CONTAINER_HDR_MMCSD_OFFSET SZ_32K
|
|
#define CONTAINER_HDR_QSPI_OFFSET SZ_4K
|
|
#define CONTAINER_HDR_NAND_OFFSET SZ_128M
|
|
|
|
#define CONTAINER_HDR_TAG 0x87
|
|
#define CONTAINER_HDR_VERSION 0
|
|
|
|
struct container_hdr {
|
|
u8 version;
|
|
u8 length_lsb;
|
|
u8 length_msb;
|
|
u8 tag;
|
|
u32 flags;
|
|
u16 sw_version;
|
|
u8 fuse_version;
|
|
u8 num_images;
|
|
u16 sig_blk_offset;
|
|
u16 reserved;
|
|
} __packed;
|
|
|
|
struct boot_img_t {
|
|
u32 offset;
|
|
u32 size;
|
|
u64 dst;
|
|
u64 entry;
|
|
u32 hab_flags;
|
|
u32 meta;
|
|
u8 hash[HASH_MAX_LEN];
|
|
u8 iv[IV_MAX_LEN];
|
|
} __packed;
|
|
|
|
struct signature_block_hdr {
|
|
u8 version;
|
|
u8 length_lsb;
|
|
u8 length_msb;
|
|
u8 tag;
|
|
u16 srk_table_offset;
|
|
u16 cert_offset;
|
|
u16 blob_offset;
|
|
u16 signature_offset;
|
|
u32 reserved;
|
|
} __packed;
|
|
|
|
struct generate_key_blob_hdr {
|
|
u8 version;
|
|
u8 length_lsb;
|
|
u8 length_msb;
|
|
u8 tag;
|
|
u8 flags;
|
|
u8 size;
|
|
u8 algorithm;
|
|
u8 mode;
|
|
} __packed;
|
|
|
|
int get_container_size(ulong addr, u16 *header_length);
|
|
|
|
static inline bool valid_container_hdr(struct container_hdr *container)
|
|
{
|
|
return container->tag == CONTAINER_HDR_TAG &&
|
|
container->version == CONTAINER_HDR_VERSION;
|
|
}
|
|
#endif
|