diff options
author | Rob Herring <rob.herring@calxeda.com> | 2013-08-26 11:19:07 -0400 |
---|---|---|
committer | Rob Herring <rob.herring@calxeda.com> | 2013-10-09 12:38:13 -0400 |
commit | dc0b433526773c70a030478212f57c3f402681ae (patch) | |
tree | 2a1bdffa70549945e914043c60dc342dd2204a8b /arch/microblaze/kernel/prom.c | |
parent | e5d659935e8aa4ee8d72b1cce9ad6d6f0213909e (diff) |
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
Diffstat (limited to 'arch/microblaze/kernel/prom.c')
-rw-r--r-- | arch/microblaze/kernel/prom.c | 17 |
1 files changed, 3 insertions, 14 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) | |||
106 | { | 106 | { |
107 | pr_debug(" -> early_init_devtree(%p)\n", params); | 107 | pr_debug(" -> early_init_devtree(%p)\n", params); |
108 | 108 | ||
109 | /* Setup flat device-tree pointer */ | 109 | early_init_dt_scan(params); |
110 | initial_boot_params = params; | 110 | if (!strlen(boot_command_line)) |
111 | strlcpy(boot_command_line, cmd_line, COMMAND_LINE_SIZE); | ||
111 | 112 | ||
112 | /* Retrieve various informations from the /chosen node of the | ||
113 | * device-tree, including the platform type, initrd location and | ||
114 | * size, TCE reserve, and more ... | ||
115 | */ | ||
116 | of_scan_flat_dt(early_init_dt_scan_chosen, cmd_line); | ||
117 | |||
118 | /* Scan memory nodes and rebuild MEMBLOCKs */ | ||
119 | of_scan_flat_dt(early_init_dt_scan_root, NULL); | ||
120 | of_scan_flat_dt(early_init_dt_scan_memory, NULL); | ||
121 | |||
122 | /* Save command line for /proc/cmdline and then parse parameters */ | ||
123 | strlcpy(boot_command_line, cmd_line, COMMAND_LINE_SIZE); | ||
124 | parse_early_param(); | 113 | parse_early_param(); |
125 | 114 | ||
126 | memblock_allow_resize(); | 115 | memblock_allow_resize(); |