Commit 199c5f08 authored by Paul Cercueil's avatar Paul Cercueil Committed by Thomas Bogendoerfer

MIPS: ingenic: Use fw_passed_dtb even if CONFIG_BUILTIN_DTB

The fw_passed_dtb is now properly initialized even when
CONFIG_BUILTIN_DTB is used, so there's no need to handle it in any
particular way here.

Note that the behaviour is slightly different, as the previous code used
the built-in Device Tree unconditionally, while now the built-in Device
Tree is only used when the bootloader did not provide one.
Signed-off-by: default avatarPaul Cercueil <paul@crapouillou.net>
Signed-off-by: default avatarThomas Bogendoerfer <tsbogend@alpha.franken.de>
parent 37e5c69f
...@@ -67,13 +67,8 @@ static unsigned long __init get_board_mach_type(const void *fdt) ...@@ -67,13 +67,8 @@ static unsigned long __init get_board_mach_type(const void *fdt)
void __init plat_mem_setup(void) void __init plat_mem_setup(void)
{ {
void *dtb = (void *)fw_passed_dtb;
int offset; int offset;
void *dtb;
if (__dtb_start != __dtb_end)
dtb = __dtb_start;
else
dtb = (void *)fw_passed_dtb;
__dt_setup_arch(dtb); __dt_setup_arch(dtb);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment