diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2013-08-26 17:19:07 +0200 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2013-10-09 18:38:13 +0200 |
| commit | dc0b433526773c70a030478212f57c3f402681ae (patch) | |
| tree | 2a1bdffa70549945e914043c60dc342dd2204a8b | |
| parent | metag: use early_init_dt_scan (diff) | |
| download | linux-dc0b433526773c70a030478212f57c3f402681ae.tar.xz linux-dc0b433526773c70a030478212f57c3f402681ae.zip | |
microblaze: use early_init_dt_scan
Convert microblaze to use new early_init_dt_scan function.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Tested-by: Michal Simek <monstr@monstr.eu>
Cc: microblaze-uclinux@itee.uq.edu.au
| -rw-r--r-- | arch/microblaze/kernel/prom.c | 17 | ||||
| -rw-r--r-- | arch/microblaze/kernel/setup.c | 2 |
2 files changed, 4 insertions, 15 deletions
diff --git a/arch/microblaze/kernel/prom.c b/arch/microblaze/kernel/prom.c index 0c4453f134cb..e13686ede330 100644 --- a/arch/microblaze/kernel/prom.c +++ b/arch/microblaze/kernel/prom.c @@ -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; + early_init_dt_scan(params); + if (!strlen(boot_command_line)) + strlcpy(boot_command_line, cmd_line, COMMAND_LINE_SIZE); - /* 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 */ - strlcpy(boot_command_line, cmd_line, COMMAND_LINE_SIZE); parse_early_param(); memblock_allow_resize(); diff --git a/arch/microblaze/kernel/setup.c b/arch/microblaze/kernel/setup.c index 0775e036c526..6c4efba8a9c7 100644 --- a/arch/microblaze/kernel/setup.c +++ b/arch/microblaze/kernel/setup.c @@ -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(); |