diff options
| author | Thomas Bogendoerfer <tsbogend@alpha.franken.de> | 2021-01-27 14:24:30 +0100 |
|---|---|---|
| committer | Thomas Bogendoerfer <tsbogend@alpha.franken.de> | 2021-02-04 13:34:51 +0100 |
| commit | b83ba0b9df56f8404ccc6ebcc7050fb8294f0f20 (patch) | |
| tree | 8ddc0b7e76974718408e826aa83e7b7084193bb9 /arch/mips/bmips | |
| parent | a056aacd2df2ec8134ed3baffd7fb6ba02874652 (diff) | |
| download | linux-b83ba0b9df56f8404ccc6ebcc7050fb8294f0f20.tar.gz linux-b83ba0b9df56f8404ccc6ebcc7050fb8294f0f20.tar.bz2 linux-b83ba0b9df56f8404ccc6ebcc7050fb8294f0f20.zip | |
MIPS: of: Introduce helper function to get DTB
Selection of the DTB to be used was burried in more or less readable
code in head.S. Move this code into a inline helper function and
use it.
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Diffstat (limited to 'arch/mips/bmips')
| -rw-r--r-- | arch/mips/bmips/setup.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/mips/bmips/setup.c b/arch/mips/bmips/setup.c index 10e31d91ca8f..95f8f10d8697 100644 --- a/arch/mips/bmips/setup.c +++ b/arch/mips/bmips/setup.c @@ -161,11 +161,10 @@ void __init plat_mem_setup(void) /* intended to somewhat resemble ARM; see Documentation/arm/booting.rst */ if (fw_arg0 == 0 && fw_arg1 == 0xffffffff) dtb = phys_to_virt(fw_arg2); - else if (fw_passed_dtb) /* UHI interface or appended dtb */ - dtb = (void *)fw_passed_dtb; - else if (&__dtb_start != &__dtb_end) - dtb = (void *)__dtb_start; else + dtb = get_fdt(); + + if (!dtb) panic("no dtb found"); __dt_setup_arch(dtb); |