Merge branch 'xtensa-sim-params' into xtensa-fixes
[sfrench/cifs-2.6.git] / arch / xtensa / kernel / setup.c
index fd33920e1a1972a670be26a8bd7cc2732b73eed8..394ef08300b6a3188b196155e0863bf2360fef93 100644 (file)
@@ -317,8 +317,9 @@ static inline int mem_reserve(unsigned long start, unsigned long end)
 
 void __init setup_arch(char **cmdline_p)
 {
-       strlcpy(boot_command_line, command_line, COMMAND_LINE_SIZE);
        *cmdline_p = command_line;
+       platform_setup(cmdline_p);
+       strlcpy(boot_command_line, *cmdline_p, COMMAND_LINE_SIZE);
 
        /* Reserve some memory regions */
 
@@ -382,8 +383,6 @@ void __init setup_arch(char **cmdline_p)
 
        unflatten_and_copy_device_tree();
 
-       platform_setup(cmdline_p);
-
 #ifdef CONFIG_SMP
        smp_init_cpus();
 #endif