diff options
author | Grant Likely <grant.likely@linaro.org> | 2015-06-30 14:28:52 +0100 |
---|---|---|
committer | Grant Likely <grant.likely@linaro.org> | 2015-06-30 14:28:52 +0100 |
commit | becfc3c86df963491ff1d5ffc6131a06af6bb851 (patch) | |
tree | 4b60fb962445166025724b84ce13e7f1762df8a1 /drivers/of/fdt.c | |
parent | ce32f859646bab2ed724393398b90aa50149bb44 (diff) | |
parent | 0b34c1a489f6f018c4fbfbd12657acaa0b4f4ca9 (diff) |
Merge remote-tracking branch 'robh/for-next' into devicetree/next
Diffstat (limited to 'drivers/of/fdt.c')
-rw-r--r-- | drivers/of/fdt.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 293f80bd83dd..1c193610c950 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -171,7 +171,7 @@ static void *unflatten_dt_alloc(void **mem, unsigned long size, * @dryrun: If true, do not allocate device nodes but still calculate needed * memory size */ -static void * unflatten_dt_node(void *blob, +static void * unflatten_dt_node(const void *blob, void *mem, int *poffset, struct device_node *dad, @@ -381,7 +381,7 @@ static void * unflatten_dt_node(void *blob, * @dt_alloc: An allocator that provides a virtual address to memory * for the resulting tree */ -static void __unflatten_device_tree(void *blob, +static void __unflatten_device_tree(const void *blob, struct device_node **mynodes, void * (*dt_alloc)(u64 size, u64 align)) { @@ -444,7 +444,7 @@ static void *kernel_tree_alloc(u64 size, u64 align) * pointers of the nodes so the normal device-tree walking functions * can be used. */ -void of_fdt_unflatten_tree(unsigned long *blob, +void of_fdt_unflatten_tree(const unsigned long *blob, struct device_node **mynodes) { __unflatten_device_tree(blob, mynodes, &kernel_tree_alloc); @@ -1018,6 +1018,11 @@ void * __init __weak early_init_dt_alloc_memory_arch(u64 size, u64 align) return __va(memblock_alloc(size, align)); } #else +void __init __weak early_init_dt_add_memory_arch(u64 base, u64 size) +{ + WARN_ON(1); +} + int __init __weak early_init_dt_reserve_memory_arch(phys_addr_t base, phys_addr_t size, bool nomap) { @@ -1025,6 +1030,12 @@ int __init __weak early_init_dt_reserve_memory_arch(phys_addr_t base, &base, &size, nomap ? " (nomap)" : ""); return -ENOSYS; } + +void * __init __weak early_init_dt_alloc_memory_arch(u64 size, u64 align) +{ + WARN_ON(1); + return NULL; +} #endif bool __init early_init_dt_verify(void *params) |