GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-19 05:31:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'v2021.04-rc5' of https://github.com/lftan/u-boot

Browse source
This commit is contained in:
Tom Rini 2021-03-23 08:11:30 -04:00
commit bf3b0d69da
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
arch/arm/mach-socfpga/board.c
View file

@ -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) #if !IS_ENABLED(CONFIG_SPL_BUILD) && IS_ENABLED(CONFIG_FIT)
void board_prep_linux(bootm_headers_t *images) 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 * Ensure the OS is always booted from FIT and with
* VAB signed certificate * VAB signed certificate