Skip to content

Commit 199c5f0

Browse files
pcercueitsbogend
authored andcommitted
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: Paul Cercueil <[email protected]> Signed-off-by: Thomas Bogendoerfer <[email protected]>
1 parent 37e5c69 commit 199c5f0

File tree

1 file changed

+1
-6
lines changed

1 file changed

+1
-6
lines changed

arch/mips/jz4740/setup.c

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,8 @@ static unsigned long __init get_board_mach_type(const void *fdt)
6767

6868
void __init plat_mem_setup(void)
6969
{
70+
void *dtb = (void *)fw_passed_dtb;
7071
int offset;
71-
void *dtb;
72-
73-
if (__dtb_start != __dtb_end)
74-
dtb = __dtb_start;
75-
else
76-
dtb = (void *)fw_passed_dtb;
7772

7873
__dt_setup_arch(dtb);
7974

0 commit comments

Comments
 (0)