summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorJaedon Shin <jaedon.shin@gmail.com>2016-09-30 23:17:34 +0900
committerRalf Baechle <ralf@linux-mips.org>2016-10-06 17:31:02 +0200
commitd66698e0834657161314050b6c99c3eba36b180a (patch)
treedf7d03862e9d742082f27a0b36697facede3163d /arch
parenta2c510a2d0418ce15cd739d0a177ce53b06e5695 (diff)
downloadlinux-stable-d66698e0834657161314050b6c99c3eba36b180a.tar.gz
linux-stable-d66698e0834657161314050b6c99c3eba36b180a.tar.bz2
linux-stable-d66698e0834657161314050b6c99c3eba36b180a.zip
MIPS: BMIPS: Support APPENDED_DTB
Use appended DTB when available. Signed-off-by: Jaedon Shin <jaedon.shin@gmail.com> Cc: Kevin Cernekee <cernekee@gmail.com> Cc: Florian Fainelli <f.fainelli@gmail.com> Cc: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/14337/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/bmips/setup.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/mips/bmips/setup.c b/arch/mips/bmips/setup.c
index edf1b31df10b..3b6f687f177c 100644
--- a/arch/mips/bmips/setup.c
+++ b/arch/mips/bmips/setup.c
@@ -17,6 +17,7 @@
#include <linux/of.h>
#include <linux/of_fdt.h>
#include <linux/of_platform.h>
+#include <linux/libfdt.h>
#include <linux/smp.h>
#include <asm/addrspace.h>
#include <asm/bmips.h>
@@ -152,6 +153,8 @@ void __init plat_time_init(void)
mips_hpt_frequency = freq;
}
+extern const char __appended_dtb;
+
void __init plat_mem_setup(void)
{
void *dtb;
@@ -161,6 +164,11 @@ void __init plat_mem_setup(void)
ioport_resource.start = 0;
ioport_resource.end = ~0;
+#ifdef CONFIG_MIPS_ELF_APPENDED_DTB
+ if (!fdt_check_header(&__appended_dtb))
+ dtb = (void *)&__appended_dtb;
+ else
+#endif
/* intended to somewhat resemble ARM; see Documentation/arm/Booting */
if (fw_arg0 == 0 && fw_arg1 == 0xffffffff)
dtb = phys_to_virt(fw_arg2);