aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorNicolas Pitre <nicolas.pitre@linaro.org>2011-09-13 22:37:07 -0400
committerNicolas Pitre <nico@fluxnic.net>2011-09-14 13:51:59 -0400
commitb90b9a38251e9c89c34179eccde57411ceb5f1aa (patch)
tree88d324970a195a540e86628cd2edc02243a3d38a /arch/arm/Kconfig
parentdf4879fa2603fbf0804a80f9f146ef9023dd621f (diff)
ARM: zImage: allow supplementing appended DTB with traditional ATAG data
Some old bootloaders can't be updated to a device tree 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, it is necessary to convert those ATAGs into FDT properties and fold them into the DTB appended to zImage. Currently the following ATAGs are converted: ATAG_CMDLINE ATAG_MEM ATAG_INITRD2 If the corresponding information already exists in the appended DTB, it is replaced, otherwise the required node is created to hold it. The code looks for ATAGs at the location pointed by the value of r2 upon entry into the zImage code. If no ATAGs are found there, an attempt at finding ATAGs at the typical 0x100 offset from start of RAM is made. Otherwise the DTB is left unchanged. Thisstarted from an older patch from John Bonesio <bones@secretlab.ca>, with contributions from David Brown <davidb@codeaurora.org>. Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org> Tested-by: Shawn Guo <shawn.guo@linaro.org> Tested-by: Dave Martin <dave.martin@linaro.org> Tested-by: Thomas Abraham <thomas.abraham@linaro.org>
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig12
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index c66e0808c2b1..73c320ea172c 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1801,6 +1801,18 @@ config ARM_APPENDED_DTB
1801 location into r2 of a bootloader provided DTB is always preferable 1801 location into r2 of a bootloader provided DTB is always preferable
1802 to this option. 1802 to this option.
1803 1803
1804config ARM_ATAG_DTB_COMPAT
1805 bool "Supplement the appended DTB with traditional ATAG information"
1806 depends on ARM_APPENDED_DTB
1807 help
1808 Some old bootloaders can't be updated to a DTB capable one, yet
1809 they provide ATAGs with memory configuration, the ramdisk address,
1810 the kernel cmdline string, etc. Such information is dynamically
1811 provided by the bootloader and can't always be stored in a static
1812 DTB. To allow a device tree enabled kernel to be used with such
1813 bootloaders, this option allows zImage to extract the information
1814 from the ATAG list and store it at run time into the appended DTB.
1815
1804config CMDLINE 1816config CMDLINE
1805 string "Default kernel command string" 1817 string "Default kernel command string"
1806 default "" 1818 default ""