On Fri, Mar 06, 2015 at 06:55:14PM +0100, Jan Lübbe wrote:
> On Do, 2015-03-05 at 10:34 +1100, David Gibson wrote:
> > On Fri, Feb 27, 2015 at 08:55:45PM +0200, Pantelis Antoniou wrote:
> > > Enables the generation of a __fixups__ node for trees compiled
> > > using the -@ option that are using the /plugin/ tag.
> > >
> > > The __fixups__ node make possible the dynamic resolution of phandle
> > > references which are present in the plugin tree but lie in the
> > > tree that are applying the overlay against.
> >
> > It seems to me you've really missed an opportunity in designing the
> > plugin syntax. You have dtc generating the fixups nodes, but you
> > still have to manually lay out your fragments in the right format,
> > and
> > manually construct the target properties. Instead you could re-use
> > the existing dts overlay syntax. For a plugin tree, you wouldn't need
> > the base tree piece. So, allow something like:
> >
> > /dts-v1/ /plugin/;
> >
> > &res {
> > baz_res: baz_res { ... };
> > };
> >
> > &ocp {
> > baz { ... };
> > };
>
> During our initial experiments with overlays in Barebox, Sascha Hauer
> did a simple patch to DTC to implement this. I've recently rebased it on
> Pantelis' series. It makes writing overlays much more natural:Ok, well I'd like to see this merged with the basic patch series > >From e7082dd7160082c64d242b4ed2ebb9eb0b8aad42 Mon Sep 17 00:00:00 2001 > From: Sascha Hauer <[email protected]> > Date: Thu, 8 Aug 2013 23:08:31 +0200 > Subject: [PATCH] dtc: convert unresolved labels into overlay nodes > > Signed-off-by: Sascha Hauer <[email protected]> > Signed-off-by: Jan Luebbe <[email protected]> > --- > dtc-parser.y | 10 +++++++--- > dtc.h | 3 ++- > livetree.c | 23 +++++++++++++++++++++++ > 3 files changed, 32 insertions(+), 4 deletions(-) > > diff --git a/dtc-parser.y b/dtc-parser.y > index d23927d99215..f431bdd6e57c 100644 > --- a/dtc-parser.y > +++ b/dtc-parser.y > @@ -172,10 +172,14 @@ devicetree: > { > struct node *target = get_node_by_ref($1, $2); > > - if (target) > + if (target) { > merge_nodes(target, $3); > - else > - ERROR(&@2, "Label or path %s not found", $2); > + } else { > + if (symbol_fixup_support) > + add_orphan_node($1, $3, $2); > + else > + ERROR(&@2, "Label or path %s not > found", $2); > + } > $$ = $1; > } > | devicetree DT_DEL_NODE DT_REF ';' > diff --git a/dtc.h b/dtc.h > index f163b22b14b8..fc7330e9013e 100644 > --- a/dtc.h > +++ b/dtc.h > @@ -20,7 +20,7 @@ > * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 > * USA > */ > - > +#define _GNU_SOURCE > #include <stdio.h> > #include <string.h> > #include <stdlib.h> > @@ -234,6 +234,7 @@ struct node *build_node_delete(void); > struct node *name_node(struct node *node, char *name); > struct node *chain_node(struct node *first, struct node *list); > struct node *merge_nodes(struct node *old_node, struct node *new_node); > +void add_orphan_node(struct node *old_node, struct node *new_node, char > *ref); > > void add_property(struct node *node, struct property *prop); > void delete_property_by_name(struct node *node, char *name); > diff --git a/livetree.c b/livetree.c > index e229b84432f9..ed16b8c216f4 100644 > --- a/livetree.c > +++ b/livetree.c > @@ -216,6 +216,29 @@ struct node *merge_nodes(struct node *old_node, struct > node *new_node) > return old_node; > } > > +void add_orphan_node(struct node *dt, struct node *new_node, char *ref) > +{ > + struct node *ovl = xmalloc(sizeof(*ovl)); > + struct property *p; > + struct data d = empty_data; > + char *name; > + > + memset(ovl, 0, sizeof(*ovl)); > + > + d = data_add_marker(d, REF_PHANDLE, ref); > + d = data_append_integer(d, 0xdeadbeef, 32); > + > + p = build_property("target", d); > + add_property(ovl, p); > + > + asprintf(&name, "fragment@%s", ref); > + name_node(ovl, name); > + name_node(new_node, "__overlay__"); > + > + add_child(dt, ovl); > + add_child(ovl, new_node); > +} > + > struct node *chain_node(struct node *first, struct node *list) > { > assert(first->next_sibling == NULL); -- David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
pgpLlytOb7B3N.pgp
Description: PGP signature
