Commit 97272776 authored by Paul Burton's avatar Paul Burton

MIPS: Fix CONFIG_OF_EARLY_FLATTREE=n builds

Configurations with CONFIG_OF_EARLY_FLATTREE=n fail to build since
commit 7784cac6 ("MIPS: cmdline: Clean up boot_command_line
initialization") because of_scan_flat_dt() & of_scan_flat_dt() are not
defined in these configurations. Fix this by #ifdef'ing the affected
code...
Signed-off-by: default avatarPaul Burton <paul.burton@mips.com>
Fixes: 7784cac6 ("MIPS: cmdline: Clean up boot_command_line initialization")
Reported-by: default avatarkbuild test robot <lkp@intel.com>
Cc: linux-mips@vger.kernel.org
parent b7340422
......@@ -551,6 +551,8 @@ static void __init bootcmdline_append(const char *s, size_t max)
strlcat(boot_command_line, s, max);
}
#ifdef CONFIG_OF_EARLY_FLATTREE
static int __init bootcmdline_scan_chosen(unsigned long node, const char *uname,
int depth, void *data)
{
......@@ -571,6 +573,8 @@ static int __init bootcmdline_scan_chosen(unsigned long node, const char *uname,
return 1;
}
#endif /* CONFIG_OF_EARLY_FLATTREE */
static void __init bootcmdline_init(char **cmdline_p)
{
bool dt_bootargs = false;
......@@ -597,12 +601,14 @@ static void __init bootcmdline_init(char **cmdline_p)
else
boot_command_line[0] = 0;
#ifdef CONFIG_OF_EARLY_FLATTREE
/*
* If we're configured to take boot arguments from DT, look for those
* now.
*/
if (IS_ENABLED(CONFIG_MIPS_CMDLINE_FROM_DTB))
of_scan_flat_dt(bootcmdline_scan_chosen, &dt_bootargs);
#endif
/*
* If we didn't get any arguments from DT (regardless of whether that's
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment