Merge branch 'next/soc' of git://git.linaro.org/people/arnd/arm-soc

[linux-beck.git] / arch / arm / mach-imx / Makefile.boot

diff --git a/arch/arm/mach-imx/Makefile.boot b/arch/arm/mach-imx/Makefile.boot
index dbe61201bcd80202007d604ca5bb8c98cba0aadc..22d85889f622917ece0fe5310751bf4ab488fed3 100644 (file)
--- a/arch/arm/mach-imx/Makefile.boot
+++ b/arch/arm/mach-imx/Makefile.boot
@@ -17,3 +17,7 @@ initrd_phys-$(CONFIG_MACH_MX27)       := 0xA0800000
 zreladdr-$(CONFIG_ARCH_MX3)    += 0x80008000
 params_phys-$(CONFIG_ARCH_MX3) := 0x80000100
 initrd_phys-$(CONFIG_ARCH_MX3) := 0x80800000
+
+zreladdr-$(CONFIG_SOC_IMX6Q)   += 0x10008000
+params_phys-$(CONFIG_SOC_IMX6Q)        := 0x10000100
+initrd_phys-$(CONFIG_SOC_IMX6Q)        := 0x10800000