diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-11-02 02:46:55 +0100 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-02 02:46:55 +0100 |
commit | abc3f126ac736280c68db6472eb0040ddf6e1b1f (patch) | |
tree | 4e3333cde6da6c49dcd81920410bf5a33055f03a /arch/arm/mach-imx/Makefile.boot | |
parent | Merge branch 'picoxcell/soc' into next/soc (diff) | |
parent | MAINTAINERS: add ARM/FREESCALE IMX6 entry (diff) | |
download | linux-dev-abc3f126ac736280c68db6472eb0040ddf6e1b1f.tar.xz linux-dev-abc3f126ac736280c68db6472eb0040ddf6e1b1f.zip |
Merge branch 'imx/imx6q' into next/soc
Conflicts:
Documentation/devicetree/bindings/arm/fsl.txt
arch/arm/Kconfig
arch/arm/Kconfig.debug
arch/arm/plat-mxc/include/mach/common.h
Diffstat (limited to 'arch/arm/mach-imx/Makefile.boot')
-rw-r--r-- | arch/arm/mach-imx/Makefile.boot | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/Makefile.boot b/arch/arm/mach-imx/Makefile.boot index ebee18b3884c..136cfc6f2f85 100644 --- 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 |