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>
7 years ago · f428268adb
parent 5d3c4ba19f
commit f428268adb
4 changed files with 8 additions and 5 deletions
--- 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
--- 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"
--- 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
--- 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