aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Shiyan <shc_work@mail.ru>2014-07-05 00:51:57 -0400
committerShawn Guo <shawn.guo@freescale.com>2014-07-18 04:11:37 -0400
commit7a1c0259ee2f167b4025066d26a03f992a19e65e (patch)
tree0028ebd7ce1c8311401f3dac0ba4bd4b4aad777d
parent35e3bc535d0437ca5f32985a294703ce48c75d88 (diff)
ARM: i.MX: Remove excess symbols ARCH_MX1, ARCH_MX25 and MACH_MX27
This patch removes excess symbols ARCH_MX1, ARCH_MX25 and MACH_MX27. Instead we use SOC_IMX*. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
-rw-r--r--arch/arm/mach-imx/Kconfig12
-rw-r--r--arch/arm/mach-imx/devices/Kconfig2
2 files changed, 1 insertions, 13 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 325a8d325363..7cbfc0d70161 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -65,18 +65,8 @@ config IMX_HAVE_IOMUX_V1
65config ARCH_MXC_IOMUX_V3 65config ARCH_MXC_IOMUX_V3
66 bool 66 bool
67 67
68config ARCH_MX1
69 bool
70
71config ARCH_MX25
72 bool
73
74config MACH_MX27
75 bool
76
77config SOC_IMX1 68config SOC_IMX1
78 bool 69 bool
79 select ARCH_MX1
80 select CPU_ARM920T 70 select CPU_ARM920T
81 select IMX_HAVE_IOMUX_V1 71 select IMX_HAVE_IOMUX_V1
82 select MXC_AVIC 72 select MXC_AVIC
@@ -89,7 +79,6 @@ config SOC_IMX21
89 79
90config SOC_IMX25 80config SOC_IMX25
91 bool 81 bool
92 select ARCH_MX25
93 select ARCH_MXC_IOMUX_V3 82 select ARCH_MXC_IOMUX_V3
94 select CPU_ARM926T 83 select CPU_ARM926T
95 select MXC_AVIC 84 select MXC_AVIC
@@ -100,7 +89,6 @@ config SOC_IMX27
100 select ARCH_HAS_OPP 89 select ARCH_HAS_OPP
101 select CPU_ARM926T 90 select CPU_ARM926T
102 select IMX_HAVE_IOMUX_V1 91 select IMX_HAVE_IOMUX_V1
103 select MACH_MX27
104 select MXC_AVIC 92 select MXC_AVIC
105 select PINCTRL_IMX27 93 select PINCTRL_IMX27
106 94
diff --git a/arch/arm/mach-imx/devices/Kconfig b/arch/arm/mach-imx/devices/Kconfig
index 73a1dce6cac1..1d2cc1805f3e 100644
--- a/arch/arm/mach-imx/devices/Kconfig
+++ b/arch/arm/mach-imx/devices/Kconfig
@@ -1,6 +1,6 @@
1config IMX_HAVE_PLATFORM_FEC 1config IMX_HAVE_PLATFORM_FEC
2 bool 2 bool
3 default y if ARCH_MX25 || SOC_IMX27 || SOC_IMX35 3 default y if SOC_IMX25 || SOC_IMX27 || SOC_IMX35
4 4
5config IMX_HAVE_PLATFORM_FLEXCAN 5config IMX_HAVE_PLATFORM_FLEXCAN
6 bool 6 bool