[PATCH 2/2] ARM: i.MX: let boards depend on 32/64bit

[Sascha Hauer]

So far we can enable support for 32bit and 64bit SoCs at the same time
which results in an unbuildable barebox. This is annying, let the board
visibility depend on the selected code model.

Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
---
 arch/arm/Kconfig                  | 2 ++
 arch/arm/configs/imx_v8_defconfig | 1 +
 arch/arm/mach-imx/Kconfig         | 9 ++++++++-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index c5645c540e..9f8ef4fa12 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -106,6 +106,8 @@ config ARCH_IMX
 	select HAS_DEBUG_LL
 	select HAVE_PBL_MULTI_IMAGES
 	select RELOCATABLE
+	select CPU_SUPPORTS_32BIT_KERNEL
+	select CPU_SUPPORTS_64BIT_KERNEL
 
 config ARCH_LAYERSCAPE
 	bool "NXP Layerscape based"
diff --git a/arch/arm/configs/imx_v8_defconfig b/arch/arm/configs/imx_v8_defconfig
index 5cd2bab035..104863f05f 100644
--- a/arch/arm/configs/imx_v8_defconfig
+++ b/arch/arm/configs/imx_v8_defconfig
@@ -11,6 +11,7 @@ CONFIG_MACH_PHYTEC_SOM_IMX8MQ=y
 CONFIG_MACH_TQ_MBA8MPXL=y
 CONFIG_MACH_POLYHEX_DEBIX=y
 CONFIG_MACH_VARISCITE_DT8MCUSTOMBOARD_IMX8MP=y
+CONFIG_64BIT=y
 CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
 CONFIG_MMU=y
 CONFIG_MALLOC_SIZE=0x0
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index ac696359b4..90a2c4ece0 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -140,7 +140,6 @@ config ARCH_IMX8M
 	select CPU_V8
 	select PINCTRL_IMX_IOMUX_V3
 	select OFTREE
-	select CPU_SUPPORTS_64BIT_KERNEL
 	select COMMON_CLK_OF_PROVIDER
 	select ARCH_HAS_FEC_IMX
 	select HW_HAS_PCI
@@ -182,6 +181,8 @@ config ARCH_VF610
 config MACH_ZII_COMMON
 	bool
 
+if 32BIT
+
 comment "i.MX1 boards"
 
 config MACH_SCB9328
@@ -548,6 +549,10 @@ config MACH_ZII_VF610_DEV
 	select MACH_ZII_COMMON
 	select ARM_USE_COMPRESSED_DTB
 
+endif
+
+if 64BIT
+
 comment "i.MX8M boards"
 
 config MACH_INNOCOMM_WB15
@@ -668,6 +673,8 @@ config MACH_ZII_IMX8MQ_DEV
 	select MCI_IMX_ESDHC_PBL
 	select MACH_ZII_COMMON
 
+endif
+
 # ----------------------------------------------------------
 
 menu "i.MX specific settings"
-- 
2.30.2