diff options
| author | Tom Rini <trini@konsulko.com> | 2017-01-22 19:43:09 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-01-24 10:33:53 -0500 |
| commit | f428268adb7b632e3477f1f2b98df07eb0cb6040 (patch) | |
| tree | d114e7688c5baf3d5dcde4cde43a262cdcbf8b6c | |
| parent | 5d3c4ba19f0537313aa23f29894bc05952f08206 (diff) | |
| download | u-boot-f428268adb7b632e3477f1f2b98df07eb0cb6040.tar.gz u-boot-f428268adb7b632e3477f1f2b98df07eb0cb6040.tar.xz u-boot-f428268adb7b632e3477f1f2b98df07eb0cb6040.zip | |
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>
| -rw-r--r-- | arch/arm/Kconfig | 6 | ||||
| -rw-r--r-- | board/imx31_phycore/Kconfig | 2 | ||||
| -rw-r--r-- | configs/imx31_phycore_eet_defconfig | 3 | ||||
| -rw-r--r-- | include/configs/imx31_phycore.h | 2 |
4 files changed, 8 insertions, 5 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 2554a2cd14..1f59679248 100644 --- 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 d3d202556d..e897ee1c3a 100644 --- 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 1137194d60..bc9dea69cd 100644 --- 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 efeb008b6b..de333e94c2 100644 --- 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 |