diff options
| author | Jonas Gorski <[email protected]> | 2015-04-12 12:25:01 +0200 |
|---|---|---|
| committer | Ralf Baechle <[email protected]> | 2015-06-21 21:54:17 +0200 |
| commit | ca668a2da4687f23e65ce630742b6784a5fca595 (patch) | |
| tree | 9ed50423034d2205d609de7492967f65ff535394 | |
| parent | 0e12f4a3ab52f8be48c5ebbc556f53acb1afb280 (diff) | |
MIPS: BMIPS: Accept UHI interface for passing a dtb
Detect and use passed dtb address using the UHI interface. This allows for
booting with a vmlinux.bin appended dtb instead of using a built-in one.
Signed-off-by: Jonas Gorski <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: John Crispin <[email protected]>
Cc: Kevin Cernekee <[email protected]>
Cc: Florian Fainelli <[email protected]>
Cc: Aaro Koskinen <[email protected]>
Cc: Markos Chandras <[email protected]>
Cc: Andrew Bresticker <[email protected]>
Cc: Daniel Schwierzeck <[email protected]>
Cc: Paul Burton <[email protected]>
Cc: James Hartley <[email protected]>
Patchwork: https://patchwork.linux-mips.org/patch/9742/
Signed-off-by: Ralf Baechle <[email protected]>
| -rw-r--r-- | arch/mips/bmips/setup.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mips/bmips/setup.c b/arch/mips/bmips/setup.c index fae800e8b1e1..526ec2789bb9 100644 --- a/arch/mips/bmips/setup.c +++ b/arch/mips/bmips/setup.c @@ -149,6 +149,8 @@ void __init plat_mem_setup(void) /* intended to somewhat resemble ARM; see Documentation/arm/Booting */ if (fw_arg0 == 0 && fw_arg1 == 0xffffffff) dtb = phys_to_virt(fw_arg2); + else if (fw_arg0 == -2) /* UHI interface */ + dtb = (void *)fw_arg1; else if (__dtb_start != __dtb_end) dtb = (void *)__dtb_start; else |