diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-07-21 22:47:44 -0400 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-07-21 22:47:44 -0400 |
| commit | 1fc74af81b556d0582fd8aed1cef4a039b7b5051 (patch) | |
| tree | 2bc9183a1f49bc7e7102723664a195ed60efe8ea /arch/arm/Kconfig | |
| parent | 22648cbcf5efd94c2632b3fe8c5c90ae54df928d (diff) | |
| parent | fd454c1ab28387cc03618ef84cb172fa9f8fdeb4 (diff) | |
Merge branch 'zImage_DTB_append' of git://git.linaro.org/people/nico/linux into linaro-3.0linux-linaro-3.0-2011.07-0
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index a1c3ea972d5..f38e275bea3 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1752,6 +1752,25 @@ 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 ARM_ATAG_DTB_COMPAT + bool "Supplement the appended DTB with traditional ATAG information" + depends on ARM_APPENDED_DTB + help + Some old bootloaders can't be updated to a DTB capable one, yet + they provide ATAGs with memory configuration, the ramdisk address, + the kernel cmdline string, etc. To allow a device tree enabled + kernel to be used with such bootloaders, this option allows + zImage to extract the information from the ATAG list and store it + at run time into the appended DTB. + config CMDLINE string "Default kernel command string" default "" |