hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Rob Herring 2013-08-25 18:29:51 -05:00
parent 15c03dd485
commit 312717f15a
4 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/c6x/include/asm/setup.h
View File

@ -14,8 +14,6 @@
#include <uapi/asm/setup.h> #include <uapi/asm/setup.h>
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__
extern char c6x_command_line[COMMAND_LINE_SIZE];
extern int c6x_add_memory(phys_addr_t start, unsigned long size); extern int c6x_add_memory(phys_addr_t start, unsigned long size);
extern unsigned long ram_start; extern unsigned long ram_start;

2
arch/c6x/kernel/devicetree.c
View File

@ -24,7 +24,7 @@ void __init early_init_devtree(void *params)
* device-tree, including the platform type, initrd location and * device-tree, including the platform type, initrd location and
* size and more ... * 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 */ /* Scan memory nodes and rebuild MEMBLOCKs */
of_scan_flat_dt(early_init_dt_scan_root, NULL); of_scan_flat_dt(early_init_dt_scan_root, NULL);

11
arch/c6x/kernel/setup.c
View File

@ -68,13 +68,6 @@ unsigned long ram_end;
static unsigned long dma_start __initdata; static unsigned long dma_start __initdata;
static unsigned long dma_size __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 { struct cpuinfo_c6x {
const char *cpu_name; const char *cpu_name;
const char *cpu_voltage; 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 */ /* Do some early initialization based on the flat device tree */
early_init_devtree(fdt); 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(); parse_early_param();
} }
@ -309,7 +300,7 @@ void __init setup_arch(char **cmdline_p)
printk(KERN_INFO "Initializing kernel\n"); printk(KERN_INFO "Initializing kernel\n");
/* Initialize command line */ /* Initialize command line */
*cmdline_p = c6x_command_line; *cmdline_p = boot_command_line;
memory_end = ram_end; memory_end = ram_end;
memory_end &= ~(PAGE_SIZE - 1); memory_end &= ~(PAGE_SIZE - 1);

6
arch/c6x/kernel/vmlinux.lds.S
View File

@ -37,12 +37,6 @@ SECTIONS
_vectors_end = .; _vectors_end = .;
} }
. = ALIGN(0x1000);
.cmdline :
{
*(.cmdline)
}
/* /*
* This section contains data which may be shared with other * This section contains data which may be shared with other
* cores. It needs to be a fixed offset from PAGE_OFFSET * cores. It needs to be a fixed offset from PAGE_OFFSET