diff options
Diffstat (limited to 'arch/mips/kernel/prom.c')
| -rw-r--r-- | arch/mips/kernel/prom.c | 60 |
1 files changed, 18 insertions, 42 deletions
diff --git a/arch/mips/kernel/prom.c b/arch/mips/kernel/prom.c index 028f6f837ef..5d39bb85bf3 100644 --- a/arch/mips/kernel/prom.c +++ b/arch/mips/kernel/prom.c @@ -13,69 +13,45 @@ #include <linux/errno.h> #include <linux/types.h> #include <linux/bootmem.h> -#include <linux/initrd.h> #include <linux/debugfs.h> #include <linux/of.h> #include <linux/of_fdt.h> -#include <linux/of_irq.h> -#include <linux/of_platform.h> #include <asm/page.h> #include <asm/prom.h> -int __init early_init_dt_scan_memory_arch(unsigned long node, - const char *uname, int depth, - void *data) -{ - return early_init_dt_scan_memory(node, uname, depth, data); -} +static char mips_machine_name[64] = "Unknown"; -void __init early_init_dt_add_memory_arch(u64 base, u64 size) +__init void mips_set_machine_name(const char *name) { - return add_memory_region(base, size, BOOT_MEM_RAM); + if (name == NULL) + return; + + strlcpy(mips_machine_name, name, sizeof(mips_machine_name)); + pr_info("MIPS: machine is %s\n", mips_get_machine_name()); } -void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align) +char *mips_get_machine_name(void) { - return __alloc_bootmem(size, align, __pa(MAX_DMA_ADDRESS)); + return mips_machine_name; } -#ifdef CONFIG_BLK_DEV_INITRD -void __init early_init_dt_setup_initrd_arch(unsigned long start, - unsigned long end) +#ifdef CONFIG_OF +void __init early_init_dt_add_memory_arch(u64 base, u64 size) { - initrd_start = (unsigned long)__va(start); - initrd_end = (unsigned long)__va(end); - initrd_below_start_ok = 1; + return add_memory_region(base, size, BOOT_MEM_RAM); } -#endif -void __init early_init_devtree(void *params) +void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align) { - /* 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, and more ... - */ - of_scan_flat_dt(early_init_dt_scan_chosen, arcs_cmdline); - - - /* Scan memory nodes */ - of_scan_flat_dt(early_init_dt_scan_root, NULL); - of_scan_flat_dt(early_init_dt_scan_memory_arch, NULL); + return __alloc_bootmem(size, align, __pa(MAX_DMA_ADDRESS)); } -void __init __dt_setup_arch(struct boot_param_header *bph) +void __init __dt_setup_arch(void *bph) { - if (be32_to_cpu(bph->magic) != OF_DT_HEADER) { - pr_err("DTB has bad magic, ignoring builtin OF DTB\n"); - + if (!early_init_dt_scan(bph)) return; - } - initial_boot_params = bph; - - early_init_devtree(initial_boot_params); + mips_set_machine_name(of_flat_dt_get_machine_name()); } +#endif |