summaryrefslogtreecommitdiff
path: root/arch/arm/Makefile
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2011-09-27 13:48:02 +0800
committerArnd Bergmann <arnd@arndb.de>2011-10-31 14:26:28 +0100
commita89cf59b5c344e50b7be3cabb67dc1ed94439b6e (patch)
tree8a0a76073e6e0d618910621d1cebaf1787f9574b /arch/arm/Makefile
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/arm/Makefile')
-rw-r--r--arch/arm/Makefile3
1 files changed, 1 insertions, 2 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
machine-$(CONFIG_ARCH_MSM) := msm
machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0
machine-$(CONFIG_ARCH_IMX_V4_V5) := imx
-machine-$(CONFIG_ARCH_MX3) := imx
+machine-$(CONFIG_ARCH_IMX_V6_V7) := imx
machine-$(CONFIG_ARCH_MX5) := mx5
-machine-$(CONFIG_ARCH_MX6) := imx
machine-$(CONFIG_ARCH_MXS) := mxs
machine-$(CONFIG_ARCH_NETX) := netx
machine-$(CONFIG_ARCH_NOMADIK) := nomadik