MIPS: ath79: Add support for DTB passed using the UHI boot protocol
authorAlban Bedel <albeu@free.fr>
Tue, 26 Jan 2016 07:27:15 +0000 (08:27 +0100)
committerRalf Baechle <ralf@linux-mips.org>
Fri, 13 May 2016 12:01:37 +0000 (14:01 +0200)
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>
arch/mips/ath79/setup.c

index be451ee4a5eaf5b8ba6de0d11fc8c76f6d6db7fa..0e60b0f4c69f377662bd7ca0399c0c118c09600f 100644 (file)
@@ -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);