imx31_phycore: Split the eet variant out into a different TARGET

Rename CONFIG_IMX31_PHYCORE_EET to CONFIG_TARGET_IMX31_PHYCORE_EET and
make this a distinct config target.

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 2554a2cd14b09a14593dfbc1a170e8410c19cd1b..1f596792485daeec7af326d2ce73a7b37b59cb5e 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -315,7 +315,11 @@ config TARGET_X600
        select SUPPORT_SPL
 
 config TARGET_IMX31_PHYCORE
-       bool "Support imx31_phycore"
+       bool "Support imx31_phycore_eet"
+       select CPU_ARM1136
+
+config TARGET_IMX31_PHYCORE_EET
+       bool "Support imx31_phycore_eet"
        select CPU_ARM1136
 
 config TARGET_MX31ADS

diff --git a/board/imx31_phycore/Kconfig b/board/imx31_phycore/Kconfig
index d3d202556dc95e8afe88e3d8eac52d47a2e64e48..e897ee1c3acae89bcda1a92c056299dde17d89c7 100644 (file)
--- a/board/imx31_phycore/Kconfig
+++ b/board/imx31_phycore/Kconfig
@@ -1,4 +1,4 @@
-if TARGET_IMX31_PHYCORE
+if TARGET_IMX31_PHYCORE || TARGET_IMX31_PHYCORE_EET
 
 config SYS_BOARD
        default "imx31_phycore"

diff --git a/configs/imx31_phycore_eet_defconfig b/configs/imx31_phycore_eet_defconfig
index 1137194d60aa6d4bc7d69e514685bdc9d39bb445..bc9dea69cd21aff4d67d4c37ef7a3351339cbf2a 100644 (file)
--- a/configs/imx31_phycore_eet_defconfig
+++ b/configs/imx31_phycore_eet_defconfig
@@ -1,7 +1,6 @@
 CONFIG_ARM=y
-CONFIG_TARGET_IMX31_PHYCORE=y
+CONFIG_TARGET_IMX31_PHYCORE_EET=y
 CONFIG_VIDEO=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX31_PHYCORE_EET"
 CONFIG_BOOTDELAY=3
 # CONFIG_CONSOLE_MUX is not set
 CONFIG_SYS_CONSOLE_IS_IN_ENV=y

diff --git a/include/configs/imx31_phycore.h b/include/configs/imx31_phycore.h
index efeb008b6b258f2453a7deea52ec4adb24be9398..de333e94c237e039409671f271aa8fc947df8650 100644 (file)
--- a/include/configs/imx31_phycore.h
+++ b/include/configs/imx31_phycore.h
@@ -168,7 +168,7 @@
 #define CONFIG_JFFS2_DEV       "nor0"
 
 /* EET platform additions */
-#ifdef CONFIG_IMX31_PHYCORE_EET
+#ifdef CONFIG_TARGET_IMX31_PHYCORE_EET
 #define CONFIG_MXC_GPIO
 
 #define CONFIG_HARD_SPI