[PATCH 5/6] of: Drop devicetree merge support

[Sascha Hauer]

On Tue, May 20, 2014 at 05:08:15PM +0200, Sebastian Hesselbarth wrote:
> On 05/19/2014 10:59 PM, Sascha Hauer wrote:
> > 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
> 
> Uhm, I know about it because I see it every time I load an updated
> dtb on my hacky Chromecast barebox. Loading the dtb a second time
> again works then..
> 
> Anyway, I don't want to merge any trees but overwrite the existing,
> so I am fine with the removal ;)

Merging devicetrees may actually come back with the devicetree overlay
feature Pantelis Antoniou is working on. I'm waiting for this to be
merged in upstream dtc before further looking at it.

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |