of: Change logic to overwrite cmd_line with CONFIG_CMDLINE
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Mon, 19 Sep 2011 18:50:15 +0000 (18:50 +0000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 20 Sep 2011 06:09:34 +0000 (16:09 +1000)
commit78b782cb788cadbda151ecb61753c109602a250c
tree4d4e4f435674ab5aaea1a0fa175b9e39b5601272
parent55190f88789ab62a42c3ee050090406b0bcefff8
of: Change logic to overwrite cmd_line with CONFIG_CMDLINE

We used to overwrite with CONFIG_CMDLINE if we found a chosen
node but failed to get bootargs out of it or they were empty,
unless CONFIG_CMDLINE_FORCE is set.

Instead change that to overwrite if "data" is non empty after
the bootargs check. It allows arch code to have other mechanisms
to retrieve the command line prior to parsing the device-tree.

Note: CONFIG_CMDLINE_FORCE case should ideally be handled elsewhere
as it won't work as it-is if the device-tree has no /chosen node

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
CC: devicetree-discuss@lists-ozlabs.org
CC: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
drivers/of/fdt.c