diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-08-23 03:39:35 -0400 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-08-24 03:24:43 -0400 |
| commit | ae4fa7f66e542ef5c7662ceabfaaa33283eb4216 (patch) | |
| tree | 147282db8a7a417ad45f919ee92235b081bd32e7 /arch/arm/Makefile | |
| parent | fcb8ce5cfe30ca9ca5c9a79cdfe26d1993e65e0c (diff) | |
ARM i.MX: allow to compile together ARMv4 and ARMv5 based SoCs
For this we need CONFIG_AUTO_ZRELADDR and CONFIG_ARM_PATCH_PHYS_VIRT.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 70c424eaf7b0..9260c293405c 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
| @@ -154,9 +154,7 @@ machine-$(CONFIG_ARCH_LPC32XX) := lpc32xx | |||
| 154 | machine-$(CONFIG_ARCH_MMP) := mmp | 154 | machine-$(CONFIG_ARCH_MMP) := mmp |
| 155 | machine-$(CONFIG_ARCH_MSM) := msm | 155 | machine-$(CONFIG_ARCH_MSM) := msm |
| 156 | machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0 | 156 | machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0 |
| 157 | machine-$(CONFIG_ARCH_MX1) := imx | 157 | machine-$(CONFIG_ARCH_IMX_V4_V5) := imx |
| 158 | machine-$(CONFIG_ARCH_MX2) := imx | ||
| 159 | machine-$(CONFIG_ARCH_MX25) := imx | ||
| 160 | machine-$(CONFIG_ARCH_MX3) := imx | 158 | machine-$(CONFIG_ARCH_MX3) := imx |
| 161 | machine-$(CONFIG_ARCH_MX5) := mx5 | 159 | machine-$(CONFIG_ARCH_MX5) := mx5 |
| 162 | machine-$(CONFIG_ARCH_MXS) := mxs | 160 | machine-$(CONFIG_ARCH_MXS) := mxs |