]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit205ba0684651aff15a815bc30ed0ea0163b4bf46
tree4d4e4f435674ab5aaea1a0fa175b9e39b5601272
parentd2d872be8f7845f997ceaf0e26b8aa9eb6c092fa
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