From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew F. Davis Date: Mon, 1 Aug 2016 10:30:23 -0500 Subject: [U-Boot] [PATCH 1/4] Introduce CONFIG_SPL_PANIC_ON_NON_FIT_IMAGE In-Reply-To: <20160801153026.7341-1-afd@ti.com> References: <20160801153026.7341-1-afd@ti.com> Message-ID: <20160801153026.7341-2-afd@ti.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Introduce CONFIG_SPL_PANIC_ON_NON_FIT_IMAGE. An SPL which define this will panic() if the image it has loaded is not a FIT image. Signed-off-by: Andrew F. Davis --- Kconfig | 8 ++++++++ common/spl/spl.c | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/Kconfig b/Kconfig index ef12f9f..4c03716 100644 --- a/Kconfig +++ b/Kconfig @@ -336,6 +336,14 @@ config SPL_FIT_IMAGE_POST_PROCESS injected into the FIT creation (i.e. the blobs would have been pre- processed before being added to the FIT image). +config SPL_PANIC_ON_NON_FIT_IMAGE + bool "Disable SPL loading of non-FIT images" + help + SPL will panic() if the image loaded is not a FIT image. This is + useful for devices that only support authentication/encryption + through SPL FIT loading paths and do not want SPL falling back + to legacy image loading when a non-FIT image is present. + config SYS_CLK_FREQ depends on ARC || ARCH_SUNXI int "CPU clock frequency" diff --git a/common/spl/spl.c b/common/spl/spl.c index b7ec333..7a30c7d 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -93,6 +93,9 @@ void spl_set_header_raw_uboot(void) int spl_parse_image_header(const struct image_header *header) { +#ifdef CONFIG_SPL_PANIC_ON_NON_FIT_IMAGE + panic("** non-FIT images are not supported"); +#else u32 header_size = sizeof(struct image_header); if (image_get_magic(header) == IH_MAGIC) { @@ -153,6 +156,7 @@ int spl_parse_image_header(const struct image_header *header) spl_set_header_raw_uboot(); #endif } +#endif return 0; } -- 2.9.2