History

scripts/dtc: Update to upstream version v1.7.0-95-gbcd02b523429

Some pending overlay additions need the graph check fix. This adds the following commits from upstream: bcd02b523429 fdtoverlay: remove wrong singular article in a comment 84b056a89d3c checks: relax graph checks for overlays

Rob Herring (Arm) committed 2 years ago

Commit d2a97be1 parent ca35f283 files · +14 −6Browse files

Unified · Split

3 files
  1. scripts/dtc/checks.c +12 −4
  2. scripts/dtc/fdtoverlay.c +1 −1
  3. scripts/dtc/version_gen.h +1 −1
scripts/dtc/checks.c+12−4
@@ -1826,10 +1826,14 @@ static void check_graph_port(struct check *c, struct dt_info *dti, · 1825 unmodified lines
18261826 if (node->bus != &graph_port_bus)
18271827 return;
18281828
1829+ check_graph_reg(c, dti, node);
1830+
1831+ /* skip checks below for overlays */
1832+ if (dti->dtsflags & DTSF_PLUGIN)
1833+ return;
1834+
18291835 if (!strprefixeq(node->name, node->basenamelen, "port"))
18301836 FAIL(c, dti, node, "graph port node name should be 'port'");
1831−
1832− check_graph_reg(c, dti, node);
18331837 }
18341838 WARNING(graph_port, check_graph_port, NULL, &graph_nodes);
18351839
@@ -1864,11 +1868,15 @@ static void check_graph_endpoint(struct check *c, struct dt_info *dti, · 28 unmodified lines
18641868 if (!node->parent || node->parent->bus != &graph_port_bus)
18651869 return;
18661870
1871+ check_graph_reg(c, dti, node);
1872+
1873+ /* skip checks below for overlays */
1874+ if (dti->dtsflags & DTSF_PLUGIN)
1875+ return;
1876+
18671877 if (!strprefixeq(node->name, node->basenamelen, "endpoint"))
18681878 FAIL(c, dti, node, "graph endpoint node name should be 'endpoint'");
18691879
1870− check_graph_reg(c, dti, node);
1871−
18721880 remote_node = get_remote_endpoint(c, dti, node);
18731881 if (!remote_node)
18741882 return;
scripts/dtc/fdtoverlay.c+1−1
@@ -48,7 +48,7 @@ static void *apply_one(char *base, const char *overlay, size_t *buf_len, · 47 unmodified lines
4848 int ret;
4949
5050 /*
51− * We take a copies first, because a failed apply can trash
51+ * We take copies first, because a failed apply can trash
5252 * both the base blob and the overlay
5353 */
5454 tmpo = xmalloc(fdt_totalsize(overlay));
scripts/dtc/version_gen.h+1−1
@@ -1 +1 @@
1−#define DTC_VERSION "DTC 1.7.0-g1df7b047"
1+#define DTC_VERSION "DTC 1.7.0-gbcd02b52"

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t