MIPS: Fix CONFIG_OF_EARLY_FLATTREE=n builds

Configurations with CONFIG_OF_EARLY_FLATTREE=n fail to build since
commit 7784cac69735 ("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 <paul.burton@mips.com>
Fixes: 7784cac69735 ("MIPS: cmdline: Clean up boot_command_line initialization")
Reported-by: kbuild test robot <lkp@intel.com>
Cc: linux-mips@vger.kernel.org

diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index 119999d3155856a69347ea9746d12dea13f0deba..7ccc8a9e1bfed262877b26fd38207d1d5f4dad21 100644 (file)
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -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