diff options
| author | Alban Bedel <albeu@free.fr> | 2016-01-26 08:27:15 +0100 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2016-05-13 14:01:37 +0200 |
| commit | 8f4d4d1bfb47014f324309781917e4fd3eb6a316 (patch) | |
| tree | 3f940060ccb8c9a071dcf7e0dfd149e9bea7a0f9 /arch/mips/ath79/setup.c | |
| parent | MIPS: Netlogic: Fix CP0_EBASE redefinition warnings (diff) | |
| download | linux-8f4d4d1bfb47014f324309781917e4fd3eb6a316.tar.xz linux-8f4d4d1bfb47014f324309781917e4fd3eb6a316.zip | |
MIPS: ath79: Add support for DTB passed using the UHI boot protocol
This is needed for bootloader supporting UHI and to support appended
DTB.
Signed-off-by: Alban Bedel <albeu@free.fr>
Cc: Felix Fietkau <nbd@openwrt.org>
Cc: Antony Pavlov <antonynpavlov@gmail.com>
Cc: Gabor Juhos <juhosg@openwrt.org>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/12230/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/ath79/setup.c')
| -rw-r--r-- | arch/mips/ath79/setup.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mips/ath79/setup.c b/arch/mips/ath79/setup.c index be451ee4a5ea..0e60b0f4c69f 100644 --- a/arch/mips/ath79/setup.c +++ b/arch/mips/ath79/setup.c @@ -203,6 +203,8 @@ void __init plat_mem_setup(void) fdt_start = fw_getenvl("fdt_start"); if (fdt_start) __dt_setup_arch((void *)KSEG0ADDR(fdt_start)); + else if (fw_arg0 == -2) + __dt_setup_arch((void *)KSEG0ADDR(fw_arg1)); #ifdef CONFIG_BUILTIN_DTB else __dt_setup_arch(__dtb_start); |