diff options
-rw-r--r-- | arch/nios2/kernel/prom.c | 7 | ||||
-rw-r--r-- | arch/nios2/kernel/setup.c | 3 |
2 files changed, 10 insertions, 0 deletions
diff --git a/arch/nios2/kernel/prom.c b/arch/nios2/kernel/prom.c index 367c5426157b..3901b80d4420 100644 --- a/arch/nios2/kernel/prom.c +++ b/arch/nios2/kernel/prom.c | |||
@@ -48,6 +48,13 @@ void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align) | |||
48 | return alloc_bootmem_align(size, align); | 48 | return alloc_bootmem_align(size, align); |
49 | } | 49 | } |
50 | 50 | ||
51 | int __init early_init_dt_reserve_memory_arch(phys_addr_t base, phys_addr_t size, | ||
52 | bool nomap) | ||
53 | { | ||
54 | reserve_bootmem(base, size, BOOTMEM_DEFAULT); | ||
55 | return 0; | ||
56 | } | ||
57 | |||
51 | void __init early_init_devtree(void *params) | 58 | void __init early_init_devtree(void *params) |
52 | { | 59 | { |
53 | __be32 *dtb = (u32 *)__dtb_start; | 60 | __be32 *dtb = (u32 *)__dtb_start; |
diff --git a/arch/nios2/kernel/setup.c b/arch/nios2/kernel/setup.c index 6e57ffa5db27..6044d9be28b4 100644 --- a/arch/nios2/kernel/setup.c +++ b/arch/nios2/kernel/setup.c | |||
@@ -201,6 +201,9 @@ void __init setup_arch(char **cmdline_p) | |||
201 | } | 201 | } |
202 | #endif /* CONFIG_BLK_DEV_INITRD */ | 202 | #endif /* CONFIG_BLK_DEV_INITRD */ |
203 | 203 | ||
204 | early_init_fdt_reserve_self(); | ||
205 | early_init_fdt_scan_reserved_mem(); | ||
206 | |||
204 | unflatten_and_copy_device_tree(); | 207 | unflatten_and_copy_device_tree(); |
205 | 208 | ||
206 | setup_cpuinfo(); | 209 | setup_cpuinfo(); |