diff options
| author | Tom Rini <trini@konsulko.com> | 2021-08-25 07:48:06 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-08-25 08:23:42 -0400 |
| commit | 7bfa565453ec5f63668a3464da21629055c3053f (patch) | |
| tree | 8cb976f3d61707fb80110dfb2449e337db0a6e6c /arch/arm/mach-socfpga/board.c | |
| parent | 4865db07169126ca0205f1a6265adf01bd69b3df (diff) | |
| parent | 31b51cb1d2b4114085cb5565502d39d6f6daa2a7 (diff) | |
Merge branch 'next-socfpga' of https://github.com/tienfong/uboot_mainline
Diffstat (limited to 'arch/arm/mach-socfpga/board.c')
| -rw-r--r-- | arch/arm/mach-socfpga/board.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/arch/arm/mach-socfpga/board.c b/arch/arm/mach-socfpga/board.c index 36eecdc0577..72671632220 100644 --- a/arch/arm/mach-socfpga/board.c +++ b/arch/arm/mach-socfpga/board.c @@ -116,17 +116,18 @@ void board_fit_image_post_process(const void *fit, int node, void **p_image, #if !IS_ENABLED(CONFIG_SPL_BUILD) && IS_ENABLED(CONFIG_FIT) void board_prep_linux(bootm_headers_t *images) { - if (IS_ENABLED(CONFIG_SOCFPGA_SECURE_VAB_AUTH) && - !IS_ENABLED(CONFIG_SOCFPGA_SECURE_VAB_AUTH_ALLOW_NON_FIT_IMAGE)) { - /* - * Ensure the OS is always booted from FIT and with - * VAB signed certificate - */ - if (!images->fit_uname_cfg) { + if (!images->fit_uname_cfg) { + if (IS_ENABLED(CONFIG_SOCFPGA_SECURE_VAB_AUTH) && + !IS_ENABLED(CONFIG_SOCFPGA_SECURE_VAB_AUTH_ALLOW_NON_FIT_IMAGE)) { + /* + * Ensure the OS is always booted from FIT and with + * VAB signed certificate + */ printf("Please use FIT with VAB signed images!\n"); hang(); } - + } else { + /* Update fdt_addr in enviroment variable */ env_set_hex("fdt_addr", (ulong)images->ft_addr); debug("images->ft_addr = 0x%08lx\n", (ulong)images->ft_addr); } |