overlay: Add syntactic sugar version of overlays
For simple overlays that use a single target there exists a simpler syntax version. &foo { }; generates an overlay with a single target at foo. Signed-off-by: Pantelis Antoniou <pantelis.antoniou@konsulko.com> Signed-off-by: David Gibson <david@gibson.dropbear.id.au>main
parent
497432fd21
commit
737b2df39c
20
dtc-parser.y
20
dtc-parser.y
|
@ -182,10 +182,19 @@ devicetree:
|
||||||
{
|
{
|
||||||
struct node *target = get_node_by_ref($1, $2);
|
struct node *target = get_node_by_ref($1, $2);
|
||||||
|
|
||||||
if (target)
|
if (target) {
|
||||||
merge_nodes(target, $3);
|
merge_nodes(target, $3);
|
||||||
else
|
} else {
|
||||||
ERROR(&@2, "Label or path %s not found", $2);
|
/*
|
||||||
|
* We rely on the rule being always:
|
||||||
|
* versioninfo plugindecl memreserves devicetree
|
||||||
|
* so $-1 is what we want (plugindecl)
|
||||||
|
*/
|
||||||
|
if ($<flags>-1 & DTSF_PLUGIN)
|
||||||
|
add_orphan_node($1, $3, $2);
|
||||||
|
else
|
||||||
|
ERROR(&@2, "Label or path %s not found", $2);
|
||||||
|
}
|
||||||
$$ = $1;
|
$$ = $1;
|
||||||
}
|
}
|
||||||
| devicetree DT_DEL_NODE DT_REF ';'
|
| devicetree DT_DEL_NODE DT_REF ';'
|
||||||
|
@ -200,6 +209,11 @@ devicetree:
|
||||||
|
|
||||||
$$ = $1;
|
$$ = $1;
|
||||||
}
|
}
|
||||||
|
| /* empty */
|
||||||
|
{
|
||||||
|
/* build empty node */
|
||||||
|
$$ = name_node(build_node(NULL, NULL), "");
|
||||||
|
}
|
||||||
;
|
;
|
||||||
|
|
||||||
nodedef:
|
nodedef:
|
||||||
|
|
1
dtc.h
1
dtc.h
|
@ -203,6 +203,7 @@ struct node *build_node_delete(void);
|
||||||
struct node *name_node(struct node *node, char *name);
|
struct node *name_node(struct node *node, char *name);
|
||||||
struct node *chain_node(struct node *first, struct node *list);
|
struct node *chain_node(struct node *first, struct node *list);
|
||||||
struct node *merge_nodes(struct node *old_node, struct node *new_node);
|
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 add_property(struct node *node, struct property *prop);
|
||||||
void delete_property_by_name(struct node *node, char *name);
|
void delete_property_by_name(struct node *node, char *name);
|
||||||
|
|
22
livetree.c
22
livetree.c
|
@ -216,6 +216,28 @@ struct node *merge_nodes(struct node *old_node, struct node *new_node)
|
||||||
return old_node;
|
return old_node;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void add_orphan_node(struct node *dt, struct node *new_node, char *ref)
|
||||||
|
{
|
||||||
|
static unsigned int next_orphan_fragment = 0;
|
||||||
|
struct node *node;
|
||||||
|
struct property *p;
|
||||||
|
struct data d = empty_data;
|
||||||
|
char *name;
|
||||||
|
|
||||||
|
d = data_add_marker(d, REF_PHANDLE, ref);
|
||||||
|
d = data_append_integer(d, 0xffffffff, 32);
|
||||||
|
|
||||||
|
p = build_property("target", d);
|
||||||
|
|
||||||
|
xasprintf(&name, "fragment@%u",
|
||||||
|
next_orphan_fragment++);
|
||||||
|
name_node(new_node, "__overlay__");
|
||||||
|
node = build_node(p, new_node);
|
||||||
|
name_node(node, name);
|
||||||
|
|
||||||
|
add_child(dt, node);
|
||||||
|
}
|
||||||
|
|
||||||
struct node *chain_node(struct node *first, struct node *list)
|
struct node *chain_node(struct node *first, struct node *list)
|
||||||
{
|
{
|
||||||
assert(first->next_sibling == NULL);
|
assert(first->next_sibling == NULL);
|
||||||
|
|
Loading…
Reference in New Issue