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

Commit dc0b4335 authored by Rob Herring's avatar Rob Herring
Browse files

microblaze: use early_init_dt_scan 



Convert microblaze to use new early_init_dt_scan function.

Signed-off-by: default avatarRob Herring <rob.herring@calxeda.com>
Tested-by: default avatarMichal Simek <monstr@monstr.eu>
Cc: microblaze-uclinux@itee.uq.edu.au
parent e5d65993

arch/microblaze/kernel/prom.c

+3 −14
Original line number Diff line number Diff line
@@ -106,21 +106,10 @@ void __init early_init_devtree(void *params) 
{

	pr_debug(" -> early_init_devtree(%p)\n", params);



	/* Setup flat device-tree pointer */

	initial_boot_params = params;



	/* Retrieve various informations from the /chosen node of the

	 * device-tree, including the platform type, initrd location and

	 * size, TCE reserve, and more ...

	 */

	of_scan_flat_dt(early_init_dt_scan_chosen, cmd_line);



	/* Scan memory nodes and rebuild MEMBLOCKs */

	of_scan_flat_dt(early_init_dt_scan_root, NULL);

	of_scan_flat_dt(early_init_dt_scan_memory, NULL);



	/* Save command line for /proc/cmdline and then parse parameters */

	early_init_dt_scan(params);

	if (!strlen(boot_command_line))

		strlcpy(boot_command_line, cmd_line, COMMAND_LINE_SIZE);



	parse_early_param();



	memblock_allow_resize();

arch/microblaze/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ char cmd_line[COMMAND_LINE_SIZE] __attribute__ ((section(".data"))); 


void __init setup_arch(char **cmdline_p)

{

	*cmdline_p = cmd_line;

	*cmdline_p = boot_command_line;



	console_verbose();