c6x: use boot_command_line instead of private c6x_command_line

Save some pointless copying of the kernel command line and just use
boot_command_line instead.

Also remove default_command_line as it is not referenced anywhere, and
the DT code already handles the default command line.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Tested-by: Mark Salter <msalter@redhat.com>
Acked-by: Mark Salter <msalter@redhat.com>
Cc: Aurelien Jacquiot <a-jacquiot@ti.com>
Cc: linux-c6x-dev@linux-c6x.org
Reviewed-by: Grant Likely <grant.likely@linaro.org>

diff --git a/arch/c6x/include/asm/setup.h b/arch/c6x/include/asm/setup.h
index ecead15872a6b8af3ce97bec1d78e933f31bff0b..696804475f551034c48a81ca1e81b8c9d355d55a 100644 (file)
--- a/arch/c6x/include/asm/setup.h
+++ b/arch/c6x/include/asm/setup.h
@@ -14,8 +14,6 @@
 #include <uapi/asm/setup.h>
 
 #ifndef __ASSEMBLY__
-extern char c6x_command_line[COMMAND_LINE_SIZE];
-
 extern int c6x_add_memory(phys_addr_t start, unsigned long size);
 
 extern unsigned long ram_start;

diff --git a/arch/c6x/kernel/devicetree.c b/arch/c6x/kernel/devicetree.c
index 9e15ab9199b24fe234780941299757246b92b6cb..5e8c838c1dde40cef985f390350164d4552d5458 100644 (file)
--- a/arch/c6x/kernel/devicetree.c
+++ b/arch/c6x/kernel/devicetree.c
@@ -24,7 +24,7 @@ void __init early_init_devtree(void *params)
         * device-tree, including the platform type, initrd location and
         * size and more ...
         */
-       of_scan_flat_dt(early_init_dt_scan_chosen, c6x_command_line);
+       of_scan_flat_dt(early_init_dt_scan_chosen, boot_command_line);
 
        /* Scan memory nodes and rebuild MEMBLOCKs */
        of_scan_flat_dt(early_init_dt_scan_root, NULL);

diff --git a/arch/c6x/kernel/setup.c b/arch/c6x/kernel/setup.c
index f4e72bd8c10308ba1f6c26460992df11749017a7..0e5a812907d96d90d33f01aa9fe68e16a9e7edea 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;
@@ -296,8 +289,6 @@ notrace void __init machine_init(unsigned long dt_ptr)
        /* Do some early initialization based on the flat device tree */
        early_init_devtree(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);

diff --git a/arch/c6x/kernel/vmlinux.lds.S b/arch/c6x/kernel/vmlinux.lds.S
index 279d80725128fa638f300fb3471de57a57c58630..5a6e141d1641bced3bcabc94e66849bd337cbe3d 100644 (file)
--- a/arch/c6x/kernel/vmlinux.lds.S
+++ b/arch/c6x/kernel/vmlinux.lds.S
@@ -37,12 +37,6 @@ SECTIONS
                _vectors_end = .;
        }
 
-       . = ALIGN(0x1000);
-       .cmdline :
-       {
-               *(.cmdline)
-       }
-
        /*
         * This section contains data which may be shared with other
         * cores. It needs to be a fixed offset from PAGE_OFFSET