diff options
| author | Rob Herring <robh@kernel.org> | 2015-06-19 04:35:46 +0300 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2015-06-19 04:35:46 +0300 |
| commit | aefc7ec27c318faa58e7e92dbe85217b2bab7a0e (patch) | |
| tree | c098c6e2126999b68be8ae0ddda6943a73ae95ea /drivers/of | |
| parent | 63a4aea556704acba1529df8f896ed65b93e66c1 (diff) | |
| download | linux-aefc7ec27c318faa58e7e92dbe85217b2bab7a0e.tar.xz | |
dt/fdt: add empty versions of early_init_dt_*_memory_arch
With the addition of commit 0166dc1 (of: make CONFIG_OF user
selectable), architectures which don't enable memblock and don't
have their own early_init_dt_*_memory_arch implementations will break
when CONFIG_OF is enabled.
Really, we should have better separation of CONFIG_OF and
CONFIG_OF_EARLY_FLATTREE, but doing that will require quite a bit of
shuffling of architecture code. That will have to wait for another day.
Signed-off-by: Rob Herring <robh@kernel.org>
Cc: Grant Likely <grant.likely@linaro.org>
Diffstat (limited to 'drivers/of')
| -rw-r--r-- | drivers/of/fdt.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c index 9628c4a77f76..0e314ba1f985 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -1015,6 +1015,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) { @@ -1022,6 +1027,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) |