From 792098c45e5bf95ab08fe01a9a973ca35deadc55 Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Sun, 10 Feb 2019 16:42:36 +0100 Subject: arch/arm64: Make ARM64 stages select ARCH_ARM64 Also don't define the default as this result in spurious lines in the .config. The only difference in config.h is on boards with the Nvidia tegra210 SOC that now select ARCH_ARM64, because its ramstage runs in that mode. The resulting binary is identical however. Change-Id: Iaa9cd902281e51f823717f6ea4c72e5736fefb31 Signed-off-by: Arthur Heymans Reviewed-on: https://review.coreboot.org/c/coreboot/+/31315 Reviewed-by: Julius Werner Reviewed-by: HAOUAS Elyes Tested-by: build bot (Jenkins) --- src/arch/arm64/Kconfig | 12 +++++++----- src/arch/arm64/armv8/Kconfig | 8 ++++---- 2 files changed, 11 insertions(+), 9 deletions(-) (limited to 'src/arch/arm64') diff --git a/src/arch/arm64/Kconfig b/src/arch/arm64/Kconfig index 71c9f042f5..3d1d1843e0 100644 --- a/src/arch/arm64/Kconfig +++ b/src/arch/arm64/Kconfig @@ -1,27 +1,27 @@ config ARCH_ARM64 bool - default n config ARCH_BOOTBLOCK_ARM64 bool - default n select ARCH_ARM64 select C_ENVIRONMENT_BOOTBLOCK config ARCH_VERSTAGE_ARM64 bool - default n + select ARCH_ARM64 config ARCH_ROMSTAGE_ARM64 bool - default n + select ARCH_ARM64 config ARCH_RAMSTAGE_ARM64 bool - default n + select ARCH_ARM64 source src/arch/arm64/armv8/Kconfig +if ARCH_ARM64 + config ARM64_USE_ARCH_TIMER bool default n @@ -58,3 +58,5 @@ config ARM64_A53_ERRATUM_843419 incorrect address calculations in rare cases. This option enables a linker workaround to avoid those cases if your toolchain supports it. Should be selected automatically by SoCs that are affected. + +endif # if ARCH_ARM64 diff --git a/src/arch/arm64/armv8/Kconfig b/src/arch/arm64/armv8/Kconfig index 2070bea197..f70b529972 100644 --- a/src/arch/arm64/armv8/Kconfig +++ b/src/arch/arm64/armv8/Kconfig @@ -1,17 +1,17 @@ config ARCH_BOOTBLOCK_ARMV8_64 - def_bool n + bool select ARCH_BOOTBLOCK_ARM64 config ARCH_VERSTAGE_ARMV8_64 - def_bool n + bool select ARCH_VERSTAGE_ARM64 config ARCH_ROMSTAGE_ARMV8_64 - def_bool n + bool select ARCH_ROMSTAGE_ARM64 config ARCH_RAMSTAGE_ARMV8_64 - def_bool n + bool select ARCH_RAMSTAGE_ARM64 config ARCH_ARMV8_EXTENSION -- cgit v1.2.3