diff options
| author | Tom Rini <trini@konsulko.com> | 2021-03-23 08:11:30 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-03-23 08:11:30 -0400 |
| commit | bf3b0d69dae24d2566bba5f0d6723f1b413e1057 (patch) | |
| tree | 62e83490e5f24906cf0d36450e0e222b66a76f6f | |
| parent | 1f9c3f13f6ad8595a0fb5ab2cb830583cdc0b60a (diff) | |
| parent | 2dbcc037ccf3a16a2a0225133f8721b87ae7fffb (diff) | |
| download | u-boot-bf3b0d69dae24d2566bba5f0d6723f1b413e1057.zip u-boot-bf3b0d69dae24d2566bba5f0d6723f1b413e1057.tar.gz u-boot-bf3b0d69dae24d2566bba5f0d6723f1b413e1057.tar.bz2 | |
Merge branch 'v2021.04-rc5' of https://github.com/lftan/u-boot
| -rw-r--r-- | arch/arm/mach-socfpga/board.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-socfpga/board.c b/arch/arm/mach-socfpga/board.c index 81aa07c..650122f 100644 --- a/arch/arm/mach-socfpga/board.c +++ b/arch/arm/mach-socfpga/board.c @@ -115,7 +115,8 @@ void board_fit_image_post_process(void **p_image, size_t *p_size) #if !IS_ENABLED(CONFIG_SPL_BUILD) && IS_ENABLED(CONFIG_FIT) void board_prep_linux(bootm_headers_t *images) { - if (!IS_ENABLED(CONFIG_SECURE_VAB_AUTH_ALLOW_NON_FIT_IMAGE)) { + 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 |