From 8f4d4d1bfb47014f324309781917e4fd3eb6a316 Mon Sep 17 00:00:00 2001 From: Alban Bedel Date: Tue, 26 Jan 2016 08:27:15 +0100 Subject: 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 Cc: Felix Fietkau Cc: Antony Pavlov Cc: Gabor Juhos 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 --- arch/mips/ath79/setup.c | 2 ++ 1 file changed, 2 insertions(+) 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); -- cgit v1.2.3