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 --- common/blspec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'common/blspec.c') diff --git a/common/blspec.c b/common/blspec.c index f165b77aaa..9314eeab04 100644 --- a/common/blspec.c +++ b/common/blspec.c @@ -281,7 +281,7 @@ static bool entry_is_of_compatible(struct blspec_entry *entry) goto out; } - root = of_unflatten_dtb(NULL, fdt); + root = of_unflatten_dtb(fdt); if (IS_ERR(root)) { ret = PTR_ERR(root); goto out; -- cgit v1.2.3