summaryrefslogtreecommitdiff
path: root/arch/arm/kernel/head.S
diff options
context:
space:
mode:
authorGenoud Richard <richard.genoud@gmail.com>2012-06-26 15:37:59 (GMT)
committerRussell King <rmk+kernel@arm.linux.org.uk>2012-07-09 16:39:39 (GMT)
commitd0f34a11ddab9b456e4caf9fc48d8d7e832e0e50 (patch)
tree00c0dfd265bb37ced1c3f12626f17ec4b9df131a /arch/arm/kernel/head.S
parent9ad86ddde0345e903eb74837e52cf19fe0c7f825 (diff)
downloadlinux-d0f34a11ddab9b456e4caf9fc48d8d7e832e0e50.tar.xz
ARM: 7437/1: zImage: Allow DTB command line concatenation with ATAG_CMDLINE
This patch allows the ATAG_CMDLINE provided by the bootloader to be concatenated to the bootargs property of the device tree. This is useful to merge static values defined in the device tree with the boot loader's (possibly) more dynamic values, such as startup reasons and more. The bootloader should use the device tree to pass those values to the kernel, but that's not always simple (old bootloader or very small one). The behaviour is the same as the one introduced by Victor Boivie in 4394c1244249198c6b85093d46935b761b36ae05 by extending the CONFIG_CMDLINE. Signed-off-by: Richard Genoud <richard.genoud@gmail.com> Tested-by: Gregory CLEMENT <gregory.clement@free-electrons.com> Acked-by: Nicolas Pitre <nico@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/head.S')
0 files changed, 0 insertions, 0 deletions