ARM: 6893/1: Allow for kernel command line concatenation
authorVictor Boivie <victor.boivie@sonyericsson.com>
Wed, 4 May 2011 16:07:55 +0000 (17:07 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 12 May 2011 09:13:22 +0000 (10:13 +0100)
commit4394c1244249198c6b85093d46935b761b36ae05
tree3a0c30dc915b85ee5b2190eaa3ed2c6ad530aab0
parentc1b0db56604b4ccc55a325104b14093aeedeb829
ARM: 6893/1: Allow for kernel command line concatenation

This patch allows the provided CONFIG_CMDLINE to be concatenated
with the one provided by the boot loader. This is useful to
merge the static values defined in CONFIG_CMDLINE with the
boot loader's (possibly) more dynamic values, such as startup
reasons and more.

Signed-off-by: Victor Boivie <victor.boivie@sonyericsson.com>
Reviewed-by: Bjorn Andersson <bjorn.andersson@sonyericsson.com>
Signed-off-by: Oskar Andero <oskar.andero@sonyericsson.com>
Acked-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/Kconfig
arch/arm/kernel/setup.c