Merge remote-tracking branch 'dt-rh/for-next'

[karo-tx-linux.git] / arch / c6x / kernel / setup.c

diff --git a/arch/c6x/kernel/setup.c b/arch/c6x/kernel/setup.c
index f4e72bd8c10308ba1f6c26460992df11749017a7..731db4b9014dfab53eb50083a9a82dbabc8541ef 100644 (file)
--- a/arch/c6x/kernel/setup.c
+++ b/arch/c6x/kernel/setup.c
@@ -68,13 +68,6 @@ unsigned long ram_end;
 static unsigned long dma_start __initdata;
 static unsigned long dma_size __initdata;
 
-char c6x_command_line[COMMAND_LINE_SIZE];
-
-#if defined(CONFIG_CMDLINE_BOOL)
-static const char default_command_line[COMMAND_LINE_SIZE] __section(.cmdline) =
-       CONFIG_CMDLINE;
-#endif
-
 struct cpuinfo_c6x {
        const char *cpu_name;
        const char *cpu_voltage;
@@ -294,10 +287,8 @@ notrace void __init machine_init(unsigned long dt_ptr)
                fdt = dtb;
 
        /* Do some early initialization based on the flat device tree */
-       early_init_devtree(fdt);
+       early_init_dt_scan(fdt);
 
-       /* parse_early_param needs a boot_command_line */
-       strlcpy(boot_command_line, c6x_command_line, COMMAND_LINE_SIZE);
        parse_early_param();
 }
 
@@ -309,7 +300,7 @@ void __init setup_arch(char **cmdline_p)
        printk(KERN_INFO "Initializing kernel\n");
 
        /* Initialize command line */
-       *cmdline_p = c6x_command_line;
+       *cmdline_p = boot_command_line;
 
        memory_end = ram_end;
        memory_end &= ~(PAGE_SIZE - 1);