aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91/Makefile.boot
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-10-23 05:50:33 +0200
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-10-23 05:50:33 +0200
commit817ba283acf2d7b5aa073b96fd989f336fcff72a (patch)
tree5dd15d9914b74e5575025bccb51c99b745b83525 /arch/arm/mach-at91/Makefile.boot
parent3b3a015ad4ab1ad0cf707ccbaef1dbe965993a4a (diff)
downloadkernel_samsung_smdk4412-817ba283acf2d7b5aa073b96fd989f336fcff72a.zip
kernel_samsung_smdk4412-817ba283acf2d7b5aa073b96fd989f336fcff72a.tar.gz
kernel_samsung_smdk4412-817ba283acf2d7b5aa073b96fd989f336fcff72a.tar.bz2
merge more stuff from 3.2.72
Diffstat (limited to 'arch/arm/mach-at91/Makefile.boot')
-rw-r--r--arch/arm/mach-at91/Makefile.boot8
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm/mach-at91/Makefile.boot b/arch/arm/mach-at91/Makefile.boot
index 3462b81..8ddafad 100644
--- a/arch/arm/mach-at91/Makefile.boot
+++ b/arch/arm/mach-at91/Makefile.boot
@@ -4,15 +4,17 @@
# INITRD_PHYS must be in RAM
ifeq ($(CONFIG_ARCH_AT91CAP9),y)
- zreladdr-y := 0x70008000
+ zreladdr-y += 0x70008000
params_phys-y := 0x70000100
initrd_phys-y := 0x70410000
else ifeq ($(CONFIG_ARCH_AT91SAM9G45),y)
- zreladdr-y := 0x70008000
+ zreladdr-y += 0x70008000
params_phys-y := 0x70000100
initrd_phys-y := 0x70410000
else
- zreladdr-y := 0x20008000
+ zreladdr-y += 0x20008000
params_phys-y := 0x20000100
initrd_phys-y := 0x20410000
endif
+
+dtb-$(CONFIG_MACH_AT91SAM_DT) += at91sam9m10g45ek.dtb usb_a9g20.dtb