diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-05-19 14:40:03 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-05-22 08:09:13 +0200 |
| commit | d384b5639fc1a3cff60610e375a2096de413b71f (patch) | |
| tree | 5516633e836d4c9ed89517296c8e1176a8c90072 /common | |
| parent | c72a0504c97490c7fdf704d9552c1a9816a797b7 (diff) | |
| download | barebox-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 'common')
| -rw-r--r-- | common/blspec.c | 2 | ||||
| -rw-r--r-- | common/bootm.c | 2 |
2 files changed, 2 insertions, 2 deletions
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; 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); |