dt/fdt: add empty versions of early_init_dt_*_memory_arch (aefc7ec2) · Commits · 戴 / test

With the addition of commit (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>

drivers/of/fdt.c

+11 −0

Original line number	Diff line number	Diff line
		@@ -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)

Admin message