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/boards/highbank/init.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/boards/highbank/init.c')
-rw-r--r-- | arch/arm/boards/highbank/init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boards/highbank/init.c b/arch/arm/boards/highbank/init.c index d5d341a8ba..7b4f9637df 100644 --- a/arch/arm/boards/highbank/init.c +++ b/arch/arm/boards/highbank/init.c @@ -76,7 +76,7 @@ static int highbank_mem_init(void) /* load by the firmware at 0x1000 */ fdt = IOMEM(FIRMWARE_DTB_BASE); - root = of_unflatten_dtb(NULL, fdt); + root = of_unflatten_dtb(fdt); if (!root) { pr_warn("no dtb found at 0x1000 use default configuration\n"); fdt = NULL; |