From: Benjamin Herrenschmidt Date: Mon, 19 Sep 2011 18:50:15 +0000 (+0000) Subject: of: Change logic to overwrite cmd_line with CONFIG_CMDLINE X-Git-Tag: v3.2-rc1~34^2~63 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=78b782cb788cadbda151ecb61753c109602a250c;p=pandora-kernel.git 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 CC: devicetree-discuss@lists-ozlabs.org CC: Grant Likely Acked-by: Grant Likely --- Reading git-diff-tree failed