2 files changed, 11 insertions, 9 deletions

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