Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 85f60ae4 authored by Grant Likely's avatar Grant Likely
Browse files

dt/flattree: explicitly pass command line pointer to early_init_dt_scan_chosen 



This patch drops the reference to a global 'cmd_line' variable from
early_init_dt_scan_chosen, and instead passes the pointer to the command
line string via the *data argument.  Each architecture does something
slightly different with the initial command line, so it makes sense for
the architecture to be able to specify the variable name.

Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent 693d92a1

arch/microblaze/kernel/prom.c

+1 −1
Original line number Diff line number Diff line
@@ -130,7 +130,7 @@ void __init early_init_devtree(void *params) 
	 * device-tree, including the platform type, initrd location and

	 * size, TCE reserve, and more ...

	 */

	of_scan_flat_dt(early_init_dt_scan_chosen, NULL);

	of_scan_flat_dt(early_init_dt_scan_chosen, cmd_line);



	/* Scan memory nodes and rebuild MEMBLOCKs */

	memblock_init();

arch/mips/include/asm/prom.h

+0 −3
Original line number Diff line number Diff line
@@ -14,9 +14,6 @@ 
#ifdef CONFIG_OF

#include <asm/bootinfo.h>



/* which is compatible with the flattened device tree (FDT) */

#define cmd_line arcs_cmdline



extern int early_init_dt_scan_memory_arch(unsigned long node,

	const char *uname, int depth, void *data);

arch/mips/kernel/prom.c

+2 −1
Original line number Diff line number Diff line
@@ -83,7 +83,8 @@ 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, NULL);

	of_scan_flat_dt(early_init_dt_scan_chosen, arcs_cmdline);





	/* Scan memory nodes */

	of_scan_flat_dt(early_init_dt_scan_root, NULL);

arch/powerpc/kernel/prom.c

+1 −1
Original line number Diff line number Diff line
@@ -691,7 +691,7 @@ void __init early_init_devtree(void *params) 
	 * device-tree, including the platform type, initrd location and

	 * size, TCE reserve, and more ...

	 */

	of_scan_flat_dt(early_init_dt_scan_chosen_ppc, NULL);

	of_scan_flat_dt(early_init_dt_scan_chosen_ppc, cmd_line);



	/* Scan memory nodes and rebuild MEMBLOCKs */

	memblock_init();

drivers/of/fdt.c

+4 −4
Original line number Diff line number Diff line
@@ -670,7 +670,7 @@ int __init early_init_dt_scan_chosen(unsigned long node, const char *uname, 


	pr_debug("search \"chosen\", depth: %d, uname: %s\n", depth, uname);



	if (depth != 1 ||

	if (depth != 1 || !data ||

	    (strcmp(uname, "chosen") != 0 && strcmp(uname, "chosen@0") != 0))

		return 0;
@@ -679,16 +679,16 @@ int __init early_init_dt_scan_chosen(unsigned long node, const char *uname, 
	/* Retrieve command line */

	p = of_get_flat_dt_prop(node, "bootargs", &l);

	if (p != NULL && l > 0)

		strlcpy(cmd_line, p, min((int)l, COMMAND_LINE_SIZE));

		strlcpy(data, p, min((int)l, COMMAND_LINE_SIZE));



#ifdef CONFIG_CMDLINE

#ifndef CONFIG_CMDLINE_FORCE

	if (p == NULL || l == 0 || (l == 1 && (*p) == 0))

#endif

		strlcpy(cmd_line, CONFIG_CMDLINE, COMMAND_LINE_SIZE);

		strlcpy(data, CONFIG_CMDLINE, COMMAND_LINE_SIZE);

#endif /* CONFIG_CMDLINE */



	pr_debug("Command line is: %s\n", cmd_line);

	pr_debug("Command line is: %s\n", (char*)data);



	/* break now */

	return 1;