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 /arch/arm/lib/bootm.c | |
| 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 'arch/arm/lib/bootm.c')
| -rw-r--r-- | arch/arm/lib/bootm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c index 8035468279..1d690522de 100644 --- a/arch/arm/lib/bootm.c +++ b/arch/arm/lib/bootm.c @@ -215,7 +215,7 @@ static int do_bootz_linux_fdt(int fd, struct image_data *data) } if (IS_BUILTIN(CONFIG_OFTREE)) { - data->of_root_node = of_unflatten_dtb(NULL, oftree); + data->of_root_node = of_unflatten_dtb(oftree); if (!data->of_root_node) { pr_err("unable to unflatten devicetree\n"); ret = -EINVAL; |