aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2011-09-27 01:48:02 -0400
committerArnd Bergmann <arnd@arndb.de>2011-10-31 09:26:28 -0400
commita89cf59b5c344e50b7be3cabb67dc1ed94439b6e (patch)
tree8a0a76073e6e0d618910621d1cebaf1787f9574b /arch
parenta1f1c7efb0c1c78b5e84455bb5a6c8b2bee3059c (diff)
arm/imx: merge i.MX3 and i.MX6
The patch merges the build of imx3 and imx6. The Kconfig symbol ARCH_IMX_V6_V7 is introduced to replace ARCH_MX3 and ARCH_MX6. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/Makefile3
-rw-r--r--arch/arm/mach-imx/Kconfig7
-rw-r--r--arch/arm/mm/Kconfig4
-rw-r--r--arch/arm/plat-mxc/Kconfig18
4 files changed, 13 insertions, 19 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 193439eb326f..4e98937f1b2d 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -158,9 +158,8 @@ machine-$(CONFIG_ARCH_MMP) := mmp
158machine-$(CONFIG_ARCH_MSM) := msm 158machine-$(CONFIG_ARCH_MSM) := msm
159machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0 159machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0
160machine-$(CONFIG_ARCH_IMX_V4_V5) := imx 160machine-$(CONFIG_ARCH_IMX_V4_V5) := imx
161machine-$(CONFIG_ARCH_MX3) := imx 161machine-$(CONFIG_ARCH_IMX_V6_V7) := imx
162machine-$(CONFIG_ARCH_MX5) := mx5 162machine-$(CONFIG_ARCH_MX5) := mx5
163machine-$(CONFIG_ARCH_MX6) := imx
164machine-$(CONFIG_ARCH_MXS) := mxs 163machine-$(CONFIG_ARCH_MXS) := mxs
165machine-$(CONFIG_ARCH_NETX) := netx 164machine-$(CONFIG_ARCH_NETX) := netx
166machine-$(CONFIG_ARCH_NOMADIK) := nomadik 165machine-$(CONFIG_ARCH_NOMADIK) := nomadik
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 66b86489384f..b1f782f07f12 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -74,6 +74,7 @@ config SOC_IMX31
74 select ARCH_MXC_AUDMUX_V2 74 select ARCH_MXC_AUDMUX_V2
75 select ARCH_MX31 75 select ARCH_MX31
76 select MXC_AVIC 76 select MXC_AVIC
77 select SMP_ON_UP if SMP
77 78
78config SOC_IMX35 79config SOC_IMX35
79 bool 80 bool
@@ -83,6 +84,7 @@ config SOC_IMX35
83 select HAVE_EPIT 84 select HAVE_EPIT
84 select ARCH_MX35 85 select ARCH_MX35
85 select MXC_AVIC 86 select MXC_AVIC
87 select SMP_ON_UP if SMP
86 88
87 89
88if ARCH_IMX_V4_V5 90if ARCH_IMX_V4_V5
@@ -351,7 +353,7 @@ config MACH_IMX27IPCAM
351 353
352endif 354endif
353 355
354if ARCH_MX3 356if ARCH_IMX_V6_V7
355 357
356comment "MX31 platforms:" 358comment "MX31 platforms:"
357 359
@@ -601,9 +603,6 @@ config MACH_VPR200
601 Include support for VPR200 platform. This includes specific 603 Include support for VPR200 platform. This includes specific
602 configurations for the board and its peripherals. 604 configurations for the board and its peripherals.
603 605
604endif
605
606if ARCH_MX6
607comment "i.MX6 family:" 606comment "i.MX6 family:"
608 607
609config SOC_IMX6Q 608config SOC_IMX6Q
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig
index c3ce146e29fe..9ab5be07061a 100644
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@ -819,10 +819,10 @@ config CACHE_FEROCEON_L2_WRITETHROUGH
819config CACHE_L2X0 819config CACHE_L2X0
820 bool "Enable the L2x0 outer cache controller" 820 bool "Enable the L2x0 outer cache controller"
821 depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 || \ 821 depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 || \
822 REALVIEW_EB_A9MP || SOC_IMX35 || SOC_IMX31 || MACH_REALVIEW_PBX || \ 822 REALVIEW_EB_A9MP || ARCH_IMX_V6_V7 || MACH_REALVIEW_PBX || \
823 ARCH_NOMADIK || ARCH_OMAP4 || ARCH_EXYNOS4 || ARCH_TEGRA || \ 823 ARCH_NOMADIK || ARCH_OMAP4 || ARCH_EXYNOS4 || ARCH_TEGRA || \
824 ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_SHMOBILE || \ 824 ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_SHMOBILE || \
825 ARCH_PRIMA2 || ARCH_ZYNQ || ARCH_CNS3XXX || ARCH_MX6 825 ARCH_PRIMA2 || ARCH_ZYNQ || ARCH_CNS3XXX
826 default y 826 default y
827 select OUTER_CACHE 827 select OUTER_CACHE
828 select OUTER_CACHE_SYNC 828 select OUTER_CACHE_SYNC
diff --git a/arch/arm/plat-mxc/Kconfig b/arch/arm/plat-mxc/Kconfig
index 058d1c5f0043..2704951d8cd9 100644
--- a/arch/arm/plat-mxc/Kconfig
+++ b/arch/arm/plat-mxc/Kconfig
@@ -6,7 +6,7 @@ menu "Freescale MXC Implementations"
6 6
7choice 7choice
8 prompt "Freescale CPU family:" 8 prompt "Freescale CPU family:"
9 default ARCH_MX3 9 default ARCH_IMX_V6_V7
10 10
11config ARCH_IMX_V4_V5 11config ARCH_IMX_V4_V5
12 bool "i.MX1, i.MX21, i.MX25, i.MX27" 12 bool "i.MX1, i.MX21, i.MX25, i.MX27"
@@ -16,10 +16,13 @@ config ARCH_IMX_V4_V5
16 This enables support for systems based on the Freescale i.MX ARMv4 16 This enables support for systems based on the Freescale i.MX ARMv4
17 and ARMv5 SoCs 17 and ARMv5 SoCs
18 18
19config ARCH_MX3 19config ARCH_IMX_V6_V7
20 bool "MX3-based" 20 bool "i.MX3, i.MX6"
21 select AUTO_ZRELADDR if !ZBOOT_ROM
22 select ARM_PATCH_PHYS_VIRT
21 help 23 help
22 This enables support for systems based on the Freescale i.MX3 family 24 This enables support for systems based on the Freescale i.MX3 and i.MX6
25 family.
23 26
24config ARCH_MX5 27config ARCH_MX5
25 bool "i.MX50, i.MX51, i.MX53" 28 bool "i.MX50, i.MX51, i.MX53"
@@ -29,13 +32,6 @@ config ARCH_MX5
29 This enables support for machines using Freescale's i.MX50 and i.MX51 32 This enables support for machines using Freescale's i.MX50 and i.MX51
30 processors. 33 processors.
31 34
32config ARCH_MX6
33 bool "i.MX6"
34 select AUTO_ZRELADDR if !ZBOOT_ROM
35 select ARM_PATCH_PHYS_VIRT
36 help
37 This enables support for systems based on the Freescale i.MX6 family
38
39endchoice 35endchoice
40 36
41source "arch/arm/mach-imx/Kconfig" 37source "arch/arm/mach-imx/Kconfig"