Julius Werner merged this change.

View Change

Approvals:
  build bot (Jenkins): Verified
  HAOUAS Elyes: Looks good to me, but someone else must approve
  Julius Werner: Looks good to me, approved

arch/arm: Make ARM stages select ARCH_ARM

This removes the need to select ARCH_ARM in SOC Kconfig

Also don't define the default as this result in spurious lines in the
.config.

Change-Id: I1ed4a71599641db606510e5304b9f0acf9b7eb88
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/31313
Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
M src/arch/arm/Kconfig
M src/arch/arm/armv4/Kconfig
M src/arch/arm/armv7/Kconfig
M src/mainboard/google/nyan_blaze/Kconfig
4 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/src/arch/arm/Kconfig b/src/arch/arm/Kconfig
index 6d9cc78..47c333b 100644
--- a/src/arch/arm/Kconfig
+++ b/src/arch/arm/Kconfig
@@ -1,24 +1,22 @@
 config ARCH_ARM
 	bool
-	default n
 
 config ARCH_BOOTBLOCK_ARM
 	bool
-	default n
 	select ARCH_ARM
 	select C_ENVIRONMENT_BOOTBLOCK
 
 config ARCH_VERSTAGE_ARM
 	bool
-	default n
+	select ARCH_ARM
 
 config ARCH_ROMSTAGE_ARM
 	bool
-	default n
+	select ARCH_ARM
 
 config ARCH_RAMSTAGE_ARM
 	bool
-	default n
+	select ARCH_ARM
 
 source src/arch/arm/armv4/Kconfig
 source src/arch/arm/armv7/Kconfig
diff --git a/src/arch/arm/armv4/Kconfig b/src/arch/arm/armv4/Kconfig
index aa5fab9..0b50165 100644
--- a/src/arch/arm/armv4/Kconfig
+++ b/src/arch/arm/armv4/Kconfig
@@ -1,15 +1,15 @@
 config ARCH_BOOTBLOCK_ARMV4
-	def_bool n
+	bool
 	select ARCH_BOOTBLOCK_ARM
 
 config ARCH_VERSTAGE_ARMV4
-	def_bool n
+	bool
 	select ARCH_VERSTAGE_ARM
 
 config ARCH_ROMSTAGE_ARMV4
-	def_bool n
+	bool
 	select ARCH_ROMSTAGE_ARM
 
 config ARCH_RAMSTAGE_ARMV4
-	def_bool n
+	bool
 	select ARCH_RAMSTAGE_ARM
diff --git a/src/arch/arm/armv7/Kconfig b/src/arch/arm/armv7/Kconfig
index 3734426..6d5fb9e 100644
--- a/src/arch/arm/armv7/Kconfig
+++ b/src/arch/arm/armv7/Kconfig
@@ -1,37 +1,39 @@
 config ARCH_BOOTBLOCK_ARMV7
-	def_bool n
+	bool
 	select ARCH_BOOTBLOCK_ARM
 
 config ARCH_VERSTAGE_ARMV7
-	def_bool n
+	bool
 	select ARCH_VERSTAGE_ARM
 
 config ARCH_ROMSTAGE_ARMV7
-	def_bool n
+	bool
 	select ARCH_ROMSTAGE_ARM
 
 config ARCH_RAMSTAGE_ARMV7
-	def_bool n
+	bool
 	select ARCH_RAMSTAGE_ARM
+
 config ARCH_BOOTBLOCK_ARMV7_M
-	def_bool n
+	bool
 	select ARCH_BOOTBLOCK_ARM
+
 config ARCH_VERSTAGE_ARMV7_M
-	def_bool n
+	bool
 	select ARCH_VERSTAGE_ARM
 
 config ARCH_BOOTBLOCK_ARMV7_R
-	def_bool n
+	bool
 	select ARCH_BOOTBLOCK_ARM
 
 config ARCH_VERSTAGE_ARMV7_R
-	def_bool n
+	bool
 	select ARCH_VERSTAGE_ARM
 
 config ARCH_ROMSTAGE_ARMV7_R
-	def_bool n
+	bool
 	select ARCH_ROMSTAGE_ARM
 
 config ARCH_RAMSTAGE_ARMV7_R
-	def_bool n
+	bool
 	select ARCH_RAMSTAGE_ARM
diff --git a/src/mainboard/google/nyan_blaze/Kconfig b/src/mainboard/google/nyan_blaze/Kconfig
index a5b1747..1e91da9 100644
--- a/src/mainboard/google/nyan_blaze/Kconfig
+++ b/src/mainboard/google/nyan_blaze/Kconfig
@@ -17,7 +17,6 @@
 
 config BOARD_SPECIFIC_OPTIONS
 	def_bool y
-	select ARCH_ARM
 	select COMMON_CBFS_SPI_WRAPPER
 	select EC_GOOGLE_CHROMEEC
 	select EC_GOOGLE_CHROMEEC_SPI

To view, visit change 31313. To unsubscribe, or for help writing mail filters, visit settings.