[U-Boot] [PATCH 06/12] arm: mx6: cm-fx6: move cm-fx6 target under ARCH_MX6

Nikita Kiryanov
2015-07-23T14:19:33Z

cm-fx6 is an MX6 based board, and the menuconfig hierarchy should
reflect that. Make TARGET_CM_FX6 dependant on ARCH_MX6.

Cc: Stefano Babic <sbabic@denx.de>
Cc: Igor Grinberg <grinberg@compulab.co.il>
Signed-off-by: Nikita Kiryanov <nikita@compulab.co.il>
---
arch/arm/Kconfig | 8 --------
arch/arm/cpu/armv7/mx6/Kconfig | 8 ++++++++
configs/cm_fx6_defconfig | 1 +
3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 506463c..fc8c435 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -625,14 +625,6 @@ config RMOBILE
bool "Renesas ARM SoCs"
select CPU_V7

-config TARGET_CM_FX6
- bool "Support cm_fx6"
- select CPU_V7
- select SUPPORT_SPL
- select DM
- select DM_SERIAL
- select DM_GPIO
-
config ARCH_SOCFPGA
bool "Altera SOCFPGA family"
select CPU_V7
diff --git a/arch/arm/cpu/armv7/mx6/Kconfig b/arch/arm/cpu/armv7/mx6/Kconfig
index 10908c4..2c18bcd 100644
--- a/arch/arm/cpu/armv7/mx6/Kconfig
+++ b/arch/arm/cpu/armv7/mx6/Kconfig
@@ -29,6 +29,14 @@ choice
prompt "MX6 board select"
optional

+config TARGET_CM_FX6
+ bool "Support CM-FX6"
+ select CPU_V7
+ select SUPPORT_SPL
+ select DM
+ select DM_SERIAL
+ select DM_GPIO
+
config TARGET_SECOMX6
bool "Support secomx6 boards"
select CPU_V7
diff --git a/configs/cm_fx6_defconfig b/configs/cm_fx6_defconfig
index 25829db..7ad5c21 100644
--- a/configs/cm_fx6_defconfig
+++ b/configs/cm_fx6_defconfig
@@ -1,4 +1,5 @@
CONFIG_ARM=y
+CONFIG_ARCH_MX6=y
CONFIG_TARGET_CM_FX6=y
CONFIG_SPL=y
CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6QDL,SPL"
--
1.9.1