Skip to content

Commit

Permalink
c6x: use boot_command_line instead of private c6x_command_line
Browse files Browse the repository at this point in the history
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 <[email protected]>
Tested-by: Mark Salter <[email protected]>
Acked-by: Mark Salter <[email protected]>
Cc: Aurelien Jacquiot <[email protected]>
Cc: [email protected]
Reviewed-by: Grant Likely <[email protected]>
Rob Herring committed Oct 9, 2013

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent 15c03dd commit 312717f
Showing 4 changed files with 2 additions and 19 deletions.
2 changes: 0 additions & 2 deletions arch/c6x/include/asm/setup.h
Original file line number Diff line number Diff line change
@@ -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;
2 changes: 1 addition & 1 deletion arch/c6x/kernel/devicetree.c
Original file line number Diff line number Diff line change
@@ -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);
11 changes: 1 addition & 10 deletions arch/c6x/kernel/setup.c
Original file line number Diff line number Diff line change
@@ -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);
6 changes: 0 additions & 6 deletions arch/c6x/kernel/vmlinux.lds.S
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 312717f

Please sign in to comment.