diff options
| author | Olof Johansson <olof@lixom.net> | 2011-12-16 17:51:24 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-12-16 17:51:24 -0500 |
| commit | 578bd83d7e2bbf533c6968291abb36850c6eaff8 (patch) | |
| tree | ed9643d02f34d28036f4fc07d2211ad0b91219cb /arch/arm/mach-imx/Makefile.boot | |
| parent | 58c017750dc00793cf9ee292a5ce4df1748e852f (diff) | |
| parent | 1bccc8077f4ddbd64d7d085501baa2543182f29e (diff) | |
Merge branch 'imx6/boards' into next/boards
* imx6/boards:
ARM: imx6q: generate imx6q dtb files
arm/imx6q: Rename Sabreauto to Armadillo2
arm/imx6q-sabrelite: add enet phy ksz9021rn fixup
arm/imx6: add imx6q sabrelite board support
dts/imx: rename uart labels to consistent with hw spec
dts/imx: rename gpio labels to consistent with hw spec
Diffstat (limited to 'arch/arm/mach-imx/Makefile.boot')
| -rw-r--r-- | arch/arm/mach-imx/Makefile.boot | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/Makefile.boot b/arch/arm/mach-imx/Makefile.boot index cfede5768aa0..5f4d06af4912 100644 --- a/arch/arm/mach-imx/Makefile.boot +++ b/arch/arm/mach-imx/Makefile.boot | |||
| @@ -25,3 +25,6 @@ initrd_phys-$(CONFIG_SOC_IMX35) := 0x80800000 | |||
| 25 | zreladdr-$(CONFIG_SOC_IMX6Q) += 0x10008000 | 25 | zreladdr-$(CONFIG_SOC_IMX6Q) += 0x10008000 |
| 26 | params_phys-$(CONFIG_SOC_IMX6Q) := 0x10000100 | 26 | params_phys-$(CONFIG_SOC_IMX6Q) := 0x10000100 |
| 27 | initrd_phys-$(CONFIG_SOC_IMX6Q) := 0x10800000 | 27 | initrd_phys-$(CONFIG_SOC_IMX6Q) := 0x10800000 |
| 28 | |||
| 29 | dtb-$(CONFIG_SOC_IMX6Q) += imx6q-arm2.dtb \ | ||
| 30 | imx6q-sabrelite.dtb | ||