LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arm: socfpga: Move linux_qspi_enable from bootcommand to board_prep_linux function 

Move 'linux_qspi_enable' from bootcommand to board_prep_linux function when
OS booted from FIT image for Stratix 10 and Agilex. This flow is common for
all Intel SOC64 devices.

U-Boot will update 'fdt_addr' environment value based on FIT image in
board_prep_linux function, and 'linux_qspi_enable' will refer to 'fdt_addr'
environment value to retrieve the device tree node.

Signed-off-by: Siew Chin Lim <elly.siew.chin.lim@intel.com>
This commit is contained in:
Siew Chin Lim 2021-08-10 11:26:26 +08:00 committed by Tien Fong Chee
parent 4865db0716
commit 510c277a2e
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
arch/arm/mach-socfpga/board.c
View File

@ -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) #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_SOCFPGA_SECURE_VAB_AUTH) && if (!images->fit_uname_cfg) {
!IS_ENABLED(CONFIG_SOCFPGA_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 * Ensure the OS is always booted from FIT and with
*/ * VAB signed certificate
if (!images->fit_uname_cfg) { */
printf("Please use FIT with VAB signed images!\n"); printf("Please use FIT with VAB signed images!\n");
hang(); hang();
} }
} else {
/* Update fdt_addr in enviroment variable */
env_set_hex("fdt_addr", (ulong)images->ft_addr); env_set_hex("fdt_addr", (ulong)images->ft_addr);
debug("images->ft_addr = 0x%08lx\n", (ulong)images->ft_addr); debug("images->ft_addr = 0x%08lx\n", (ulong)images->ft_addr);
} }

2
configs/socfpga_agilex_atf_defconfig
View File

@ -21,7 +21,7 @@ CONFIG_BOOTDELAY=5
CONFIG_USE_BOOTARGS=y CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="earlycon" CONFIG_BOOTARGS="earlycon"
CONFIG_USE_BOOTCOMMAND=y CONFIG_USE_BOOTCOMMAND=y
CONFIG_BOOTCOMMAND="run fatscript; run mmcfitload; run linux_qspi_enable; run mmcfitboot" CONFIG_BOOTCOMMAND="run fatscript; run mmcfitload; run mmcfitboot"
CONFIG_SPL_CRC32=y CONFIG_SPL_CRC32=y
CONFIG_SPL_CACHE=y CONFIG_SPL_CACHE=y
CONFIG_SPL_SPI_LOAD=y CONFIG_SPL_SPI_LOAD=y

2
configs/socfpga_stratix10_atf_defconfig
View File

@ -21,7 +21,7 @@ CONFIG_BOOTDELAY=5
CONFIG_USE_BOOTARGS=y CONFIG_USE_BOOTARGS=y
CONFIG_BOOTARGS="earlycon" CONFIG_BOOTARGS="earlycon"
CONFIG_USE_BOOTCOMMAND=y CONFIG_USE_BOOTCOMMAND=y
CONFIG_BOOTCOMMAND="run fatscript; run mmcfitload; run linux_qspi_enable; run mmcfitboot" CONFIG_BOOTCOMMAND="run fatscript; run mmcfitload; run mmcfitboot"
CONFIG_SPL_CRC32=y CONFIG_SPL_CRC32=y
CONFIG_SPL_SPI_LOAD=y CONFIG_SPL_SPI_LOAD=y
CONFIG_SYS_SPI_U_BOOT_OFFS=0x02000000 CONFIG_SYS_SPI_U_BOOT_OFFS=0x02000000