diff options
| author | Alexander Shiyan <shc_work@mail.ru> | 2016-08-06 06:56:26 +0200 |
|---|---|---|
| committer | Shawn Guo <shawnguo@kernel.org> | 2016-08-09 16:47:29 +0200 |
| commit | 9a008da21f5ecf5b3c8345a2dfb91c7e95958935 (patch) | |
| tree | 9127e04f68d5d7839026e90e73c38615865ec513 /arch/arm/mach-imx/Kconfig | |
| parent | ARM: i.MX: Remove i.MX1 non-DT support (diff) | |
| download | linux-9a008da21f5ecf5b3c8345a2dfb91c7e95958935.tar.xz linux-9a008da21f5ecf5b3c8345a2dfb91c7e95958935.zip | |
ARM: i.MX: Move SOC_IMX1 into 'Device tree only'
This patch moves SOC_IMX1 into 'Device tree only' category and renames
imx1-dt.c to mach-imx1.c to align with the name schema of other
i.MX DT only platforms.
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Diffstat (limited to 'arch/arm/mach-imx/Kconfig')
| -rw-r--r-- | arch/arm/mach-imx/Kconfig | 31 |
1 files changed, 12 insertions, 19 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index ca7db3293a4f..9da32847a43b 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -64,12 +64,6 @@ config IMX_HAVE_IOMUX_V1 config ARCH_MXC_IOMUX_V3 bool -config SOC_IMX1 - bool - select CPU_ARM920T - select MXC_AVIC - select PINCTRL_IMX1 - config SOC_IMX21 bool select CPU_ARM926T @@ -97,19 +91,6 @@ config SOC_IMX35 select PINCTRL_IMX35 select SMP_ON_UP if SMP -if ARCH_MULTI_V4T - -comment "MX1 platforms:" - -config MACH_IMX1_DT - bool "Support i.MX1 platforms from device tree" - select SOC_IMX1 - help - Include support for Freescale i.MX1 based platforms - using the device tree for discovery. - -endif - if ARCH_MULTI_V5 comment "MX21 platforms:" @@ -445,6 +426,18 @@ endif comment "Device tree only" +if ARCH_MULTI_V4T + +config SOC_IMX1 + bool "i.MX1 support" + select CPU_ARM920T + select MXC_AVIC + select PINCTRL_IMX1 + help + This enables support for Freescale i.MX1 processor + +endif + if ARCH_MULTI_V5 config SOC_IMX25 |