summaryrefslogtreecommitdiffstats
path: root/arch/mips
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2014-05-19 14:40:03 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2014-05-22 08:09:13 +0200
commitd384b5639fc1a3cff60610e375a2096de413b71f (patch)
tree5516633e836d4c9ed89517296c8e1176a8c90072 /arch/mips
parentc72a0504c97490c7fdf704d9552c1a9816a797b7 (diff)
downloadbarebox-d384b5639fc1a3cff60610e375a2096de413b71f.tar.gz
barebox-d384b5639fc1a3cff60610e375a2096de413b71f.tar.xz
of: Drop devicetree merge support
I assume I am the only person knowing that barebox is able to merge devicetrees. This feature seems broken for a while now since trying to merge devicetress results in: unflatten: too many end nodes Remove this feature to save the complexity. Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/mips')
-rw-r--r--arch/mips/boot/dtb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/boot/dtb.c b/arch/mips/boot/dtb.c
index c1962bfd0..23d8979ad 100644
--- a/arch/mips/boot/dtb.c
+++ b/arch/mips/boot/dtb.c
@@ -48,7 +48,7 @@ static int of_mips_init(void)
if (root)
return 0;
- root = of_unflatten_dtb(NULL, __dtb_start);
+ root = of_unflatten_dtb(__dtb_start);
if (root) {
pr_debug("using internal DTB\n");
of_set_root_node(root);