From d384b5639fc1a3cff60610e375a2096de413b71f Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Mon, 19 May 2014 14:40:03 +0200 Subject: 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 --- arch/mips/boot/dtb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/mips') diff --git a/arch/mips/boot/dtb.c b/arch/mips/boot/dtb.c index c1962bfd0c..23d8979ad5 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); -- cgit v1.2.3