From ae795b2db7a43f8f076a8b688761244ed0f93128 Mon Sep 17 00:00:00 2001 From: Chen-Yu Tsai Date: Wed, 27 Mar 2019 11:53:52 +0800 Subject: checks: Do not omit nodes with labels if symbol generation is requested Commit 4038fd90056e ("dtc: add ability to make nodes conditional on them being referenced") added the new /omit-if-no-ref/ directive to mark nodes as eligible to be discarded if not referenced. The mechanism to process this happens before the symbol generation phase. This means even if symbol generation is requested and the node has a label, it will be discarded if there are no references to it within the same file. This is probably not what people expect. When using symbol generation to compile base device trees for applying overlays, nodes with labels could be referenced by the overlays, and therefore should be preserved. Check if the node has a label and symbol generation was requested before dropping the node. Signed-off-by: Chen-Yu Tsai Message-Id: <20190327035352.24036-1-wens@csie.org> Signed-off-by: David Gibson --- checks.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/checks.c b/checks.c index 5865234..0524d41 100644 --- a/checks.c +++ b/checks.c @@ -660,6 +660,8 @@ ERROR(path_references, fixup_path_references, NULL, &duplicate_node_names); static void fixup_omit_unused_nodes(struct check *c, struct dt_info *dti, struct node *node) { + if (generate_symbols && node->labels) + return; if (node->omit_if_unused && !node->is_referenced) delete_node(node); } -- cgit v1.2.1