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

[Sascha Hauer]

On Wed, May 21, 2014 at 08:35:11AM +0200, Esben Haabendal wrote:
> Sebastian Hesselbarth <sebastian.hesselbarth at gmail.com> writes:
> 
> > 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 ;)
> 
> I actually wanted to merge dtb trees for a project at hand, but ended up
> doing the merge before hand.
> 
> So no, you were not the only one knowing about it ;)

You see me surprised.

Anyway, as you decided to not use it we still do not have a user.
I think using the "official" overlay support for this is the cleaner
way to implement this feature. Another important thing is that a tree
should be explicitly merged with a separate command or option. Just
turning -l (load) option to a merge option when a devicetree is already
present was confusing.

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 |