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/bootm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'common/bootm.c') diff --git a/common/bootm.c b/common/bootm.c index 12d3ee0c46..b250bd14d6 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -297,7 +297,7 @@ static int bootm_open_oftree(struct image_data *data, const char *oftree, int nu return -EINVAL; } - data->of_root_node = of_unflatten_dtb(NULL, fdt); + data->of_root_node = of_unflatten_dtb(fdt); if (!data->of_root_node) { pr_err("unable to unflatten devicetree\n"); free(fdt); -- cgit v1.2.3