summaryrefslogtreecommitdiff
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorJohn Bonesio <bones@secretlab.ca>2011-05-27 18:45:50 -0400
committerNicolas Pitre <nico@fluxnic.net>2011-06-13 13:44:29 -0400
commitcb7715318d192eca7d0cbfd8dff5f9e1c7cb1d6a (patch)
treeaab525ce600696687ac564c83827d467403b7329 /arch/arm/Kconfig
parent367f971ea45b87fae5714e5bcfecdba3a4871135 (diff)
ARM: zImage: Allow the appending of a device tree binary
This patch provides the ability to boot using a device tree that is appended to the raw binary zImage (e.g. cat zImage <filename>.dtb > zImage_w_dtb). Signed-off-by: John Bonesio <bones@secretlab.ca> [nico: adjusted to latest zImage changes plus additional cleanups] Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Acked-by: Grant Likely <grant.likely@secretlab.ca> Acked-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig8
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 9adc278a22a..66b7d1e0957 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1727,6 +1727,14 @@ config ZBOOT_ROM_MMCIF
which in turn loads the rest the kernel image to RAM using the
MMCIF hardware block.
+config ARM_APPENDED_DTB
+ bool "Use appended device tree blob to zImage"
+ depends on OF && !ZBOOT_ROM
+ help
+ With this option, the boot code will look for a device tree binary
+ (dtb) appended to zImage
+ (e.g. cat zImage <filename>.dtb > zImage_w_dtb).
+
config CMDLINE
string "Default kernel command string"
default ""