diff options
| author | Tom Rini <[email protected]> | 2025-08-11 11:58:25 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2025-08-11 11:58:25 -0600 |
| commit | 6d3382fad32baa0c09d43b526c99ea75838b3ca8 (patch) | |
| tree | c490023305a1557a0ab86a81d016c47e2383ebe3 | |
| parent | 83ce0b483c1680cb39565a9d91c6ef113a309c38 (diff) | |
arm: socfpga: Correct how we set BOOTFILE
In order to set the BOOTFILE symbol we first need to have USE_BOOTFILE
be set, or some of the logic might not work as expected later on when
building. Second, defaults like this belong with the symbol itself.
Fixes: da595d236b97 ("include: configs: soc64: Use CONFIG_SPL_ATF to differentiate bootfile")
Signed-off-by: Tom Rini <[email protected]>
| -rw-r--r-- | arch/arm/Kconfig | 4 | ||||
| -rw-r--r-- | env/Kconfig | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index e7257ff3e03..40368abc297 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -22,9 +22,6 @@ config ARM64_CRC32 not be present on all ARMv8.0, but is always present on ARMv8.1 and newer. -config BOOTFILE - default kernel.itb if SPL_ATF && TARGET_SOCFPGA_SOC64 - config COUNTER_FREQUENCY int "Timer clock frequency" depends on ARM64 || CPU_V7A @@ -1178,6 +1175,7 @@ config ARCH_SOCFPGA select SYSRESET_SOCFPGA_SOC64 if !TARGET_SOCFPGA_AGILEX5 && \ TARGET_SOCFPGA_SOC64 select SYSRESET_PSCI if TARGET_SOCFPGA_AGILEX5 + select USE_BOOTFILE if SPL_ATF && TARGET_SOCFPGA_SOC64 imply CMD_DM imply CMD_MTDPARTS imply CRC32_VERIFY diff --git a/env/Kconfig b/env/Kconfig index c667e8f2da1..1df7ebd547e 100644 --- a/env/Kconfig +++ b/env/Kconfig @@ -957,6 +957,7 @@ config USE_BOOTFILE config BOOTFILE string "'bootfile' environment variable value" + default kernel.itb if SPL_ATF && TARGET_SOCFPGA_SOC64 depends on USE_BOOTFILE help The value to set the "bootfile" variable to. |