Skip to content

Commit

Permalink
MIPS: Fix CONFIG_OF_EARLY_FLATTREE=n builds
Browse files Browse the repository at this point in the history
Configurations with CONFIG_OF_EARLY_FLATTREE=n fail to build since
commit 7784cac ("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: Paul Burton <[email protected]>
Fixes: 7784cac ("MIPS: cmdline: Clean up boot_command_line initialization")
Reported-by: kbuild test robot <[email protected]>
Cc: [email protected]
  • Loading branch information
paulburton committed Oct 12, 2019
1 parent b734042 commit 9727277
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions arch/mips/kernel/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand All @@ -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;
Expand All @@ -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
Expand Down

0 comments on commit 9727277

Please sign in to comment.