Arthur Heymans has uploaded this change for review.

View Change

arch/arm: Make ARM specific options depend on select ARCH_ARM

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>
---
M src/arch/arm/Kconfig
M src/soc/nvidia/tegra124/Kconfig
M src/soc/nvidia/tegra210/Kconfig
M src/soc/qualcomm/ipq40xx/Kconfig
M src/soc/qualcomm/ipq806x/Kconfig
M src/soc/rockchip/rk3288/Kconfig
M src/soc/samsung/exynos5250/Kconfig
M src/soc/samsung/exynos5420/Kconfig
8 files changed, 11 insertions(+), 2 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/13/31313/1

diff --git a/src/arch/arm/Kconfig b/src/arch/arm/Kconfig
index 6d9cc78..14d054a 100644
--- a/src/arch/arm/Kconfig
+++ b/src/arch/arm/Kconfig
@@ -1,11 +1,11 @@
 config ARCH_ARM
 	bool
-	default n
+
+if ARCH_ARM
 
 config ARCH_BOOTBLOCK_ARM
 	bool
 	default n
-	select ARCH_ARM
 	select C_ENVIRONMENT_BOOTBLOCK
 
 config ARCH_VERSTAGE_ARM
@@ -26,3 +26,5 @@
 config ARM_LPAE
 	bool
 	default n
+
+endif #if ARCH_ARM
diff --git a/src/soc/nvidia/tegra124/Kconfig b/src/soc/nvidia/tegra124/Kconfig
index eecb59b..e9e43a5 100644
--- a/src/soc/nvidia/tegra124/Kconfig
+++ b/src/soc/nvidia/tegra124/Kconfig
@@ -1,6 +1,7 @@
 config SOC_NVIDIA_TEGRA124
 	bool
 	default n
+	select ARCH_ARM
 	select ARCH_BOOTBLOCK_ARMV4
 	select BOOTBLOCK_CUSTOM
 	select ARCH_VERSTAGE_ARMV7
diff --git a/src/soc/nvidia/tegra210/Kconfig b/src/soc/nvidia/tegra210/Kconfig
index 8883baa..52118c3 100644
--- a/src/soc/nvidia/tegra210/Kconfig
+++ b/src/soc/nvidia/tegra210/Kconfig
@@ -1,6 +1,7 @@
 config SOC_NVIDIA_TEGRA210
 	bool
 	default n
+	select ARCH_ARM
 	select ARCH_BOOTBLOCK_ARMV4
 	select BOOTBLOCK_CUSTOM
 	select ARCH_VERSTAGE_ARMV4
diff --git a/src/soc/qualcomm/ipq40xx/Kconfig b/src/soc/qualcomm/ipq40xx/Kconfig
index 72e05fa..7a0648c 100644
--- a/src/soc/qualcomm/ipq40xx/Kconfig
+++ b/src/soc/qualcomm/ipq40xx/Kconfig
@@ -1,6 +1,7 @@
 config SOC_QC_IPQ40XX
 	bool
 	default n
+	select ARCH_ARM
 	select ARCH_BOOTBLOCK_ARMV7
 	select ARCH_VERSTAGE_ARMV7
 	select ARCH_ROMSTAGE_ARMV7
diff --git a/src/soc/qualcomm/ipq806x/Kconfig b/src/soc/qualcomm/ipq806x/Kconfig
index 0b112d9..3bea529 100644
--- a/src/soc/qualcomm/ipq806x/Kconfig
+++ b/src/soc/qualcomm/ipq806x/Kconfig
@@ -1,6 +1,7 @@
 config SOC_QC_IPQ806X
 	bool
 	default n
+	select ARCH_ARM
 	select ARCH_BOOTBLOCK_ARMV7
 	select ARCH_VERSTAGE_ARMV7
 	select ARCH_ROMSTAGE_ARMV7
diff --git a/src/soc/rockchip/rk3288/Kconfig b/src/soc/rockchip/rk3288/Kconfig
index 53666c2..654374c 100644
--- a/src/soc/rockchip/rk3288/Kconfig
+++ b/src/soc/rockchip/rk3288/Kconfig
@@ -16,6 +16,7 @@
 config SOC_ROCKCHIP_RK3288
 	bool
 	default n
+	select ARCH_ARM
 	select ARCH_BOOTBLOCK_ARMV7
 	select ARCH_VERSTAGE_ARMV7
 	select ARCH_ROMSTAGE_ARMV7
diff --git a/src/soc/samsung/exynos5250/Kconfig b/src/soc/samsung/exynos5250/Kconfig
index 5b39724..149d703 100644
--- a/src/soc/samsung/exynos5250/Kconfig
+++ b/src/soc/samsung/exynos5250/Kconfig
@@ -1,4 +1,5 @@
 config CPU_SAMSUNG_EXYNOS5250
+	select ARCH_ARM
 	select ARCH_BOOTBLOCK_ARMV7
 	select ARCH_VERSTAGE_ARMV7
 	select ARCH_ROMSTAGE_ARMV7
diff --git a/src/soc/samsung/exynos5420/Kconfig b/src/soc/samsung/exynos5420/Kconfig
index 7b87650..4ffbf7f 100644
--- a/src/soc/samsung/exynos5420/Kconfig
+++ b/src/soc/samsung/exynos5420/Kconfig
@@ -1,4 +1,5 @@
 config CPU_SAMSUNG_EXYNOS5420
+	select ARCH_ARM
 	select ARCH_BOOTBLOCK_ARMV7
 	select ARCH_VERSTAGE_ARMV7
 	select ARCH_ROMSTAGE_ARMV7

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