projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'sched-urgent-for-linus', 'perf-urgent-for-linus' and 'x86-urgent...
[cascardo/linux.git]
/
arch
/
arm
/
mach-imx
/
Makefile.boot
diff --git
a/arch/arm/mach-imx/Makefile.boot
b/arch/arm/mach-imx/Makefile.boot
index
cfede57
..
5f4d06a
100644
(file)
--- a/
arch/arm/mach-imx/Makefile.boot
+++ b/
arch/arm/mach-imx/Makefile.boot
@@
-25,3
+25,6
@@
initrd_phys-$(CONFIG_SOC_IMX35) := 0x80800000
zreladdr-$(CONFIG_SOC_IMX6Q) += 0x10008000
params_phys-$(CONFIG_SOC_IMX6Q) := 0x10000100
initrd_phys-$(CONFIG_SOC_IMX6Q) := 0x10800000
+
+dtb-$(CONFIG_SOC_IMX6Q) += imx6q-arm2.dtb \
+ imx6q-sabrelite.dtb