diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-11-07 06:36:48 -0500 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-11-16 02:37:37 -0500 |
| commit | 784a90c0a7d8f5aa94b6c7d295ad44ae8e045aa3 (patch) | |
| tree | e28d645f519b5bd86df3ae6f5d06704b1755f09b /arch/arm/Makefile | |
| parent | 035c17dac4ce1f03d6831ff403f5aea7dcb927b4 (diff) | |
ARM i.MX: Merge i.MX5 support into mach-imx
This patch moves the contents of arch/arm/mach-mx5 to arch/arm/mach-imx
and adjusts the Makefile/Kconfig entries in a way that it's possible
to compile i.MX5 together with i.MX3/6.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Tested-by: Shawn Guo <shawn.guo@linaro.org>
Tested-by: Dirk Behme <dirk.behme@de.bosch.com>
Diffstat (limited to 'arch/arm/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index dfcf3b033e10..cf7d467267ad 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
| @@ -160,7 +160,6 @@ machine-$(CONFIG_ARCH_MSM) := msm | |||
| 160 | machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0 | 160 | machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0 |
| 161 | machine-$(CONFIG_ARCH_IMX_V4_V5) := imx | 161 | machine-$(CONFIG_ARCH_IMX_V4_V5) := imx |
| 162 | machine-$(CONFIG_ARCH_IMX_V6_V7) := imx | 162 | machine-$(CONFIG_ARCH_IMX_V6_V7) := imx |
| 163 | machine-$(CONFIG_ARCH_MX5) := mx5 | ||
| 164 | machine-$(CONFIG_ARCH_MXS) := mxs | 163 | machine-$(CONFIG_ARCH_MXS) := mxs |
| 165 | machine-$(CONFIG_ARCH_NETX) := netx | 164 | machine-$(CONFIG_ARCH_NETX) := netx |
| 166 | machine-$(CONFIG_ARCH_NOMADIK) := nomadik | 165 | machine-$(CONFIG_ARCH_NOMADIK) := nomadik |