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
Showing the changes to scripts (3 of 3 files). Show all
Unified · Split
| @@ -1826,10 +1826,14 @@ static void check_graph_port(struct check *c, struct dt_info *dti, · 1825 unmodified lines | ||
| 1826 | 1826 | if (node->bus != &graph_port_bus) |
| 1827 | 1827 | return; |
| 1828 | 1828 | |
| 1829 | + check_graph_reg(c, dti, node); | |
| 1830 | + | |
| 1831 | + /* skip checks below for overlays */ | |
| 1832 | + if (dti->dtsflags & DTSF_PLUGIN) | |
| 1833 | + return; | |
| 1834 | + | |
| 1829 | 1835 | if (!strprefixeq(node->name, node->basenamelen, "port")) |
| 1830 | 1836 | FAIL(c, dti, node, "graph port node name should be 'port'"); |
| 1831 | − | |
| 1832 | − check_graph_reg(c, dti, node); | |
| 1833 | 1837 | } |
| 1834 | 1838 | WARNING(graph_port, check_graph_port, NULL, &graph_nodes); |
| 1835 | 1839 | |
| @@ -1864,11 +1868,15 @@ static void check_graph_endpoint(struct check *c, struct dt_info *dti, · 28 unmodified lines | ||
| 1864 | 1868 | if (!node->parent || node->parent->bus != &graph_port_bus) |
| 1865 | 1869 | return; |
| 1866 | 1870 | |
| 1871 | + check_graph_reg(c, dti, node); | |
| 1872 | + | |
| 1873 | + /* skip checks below for overlays */ | |
| 1874 | + if (dti->dtsflags & DTSF_PLUGIN) | |
| 1875 | + return; | |
| 1876 | + | |
| 1867 | 1877 | if (!strprefixeq(node->name, node->basenamelen, "endpoint")) |
| 1868 | 1878 | FAIL(c, dti, node, "graph endpoint node name should be 'endpoint'"); |
| 1869 | 1879 | |
| 1870 | − check_graph_reg(c, dti, node); | |
| 1871 | − | |
| 1872 | 1880 | remote_node = get_remote_endpoint(c, dti, node); |
| 1873 | 1881 | if (!remote_node) |
| 1874 | 1882 | return; |
| @@ -48,7 +48,7 @@ static void *apply_one(char *base, const char *overlay, size_t *buf_len, · 47 unmodified lines | ||
| 48 | 48 | int ret; |
| 49 | 49 | |
| 50 | 50 | /* |
| 51 | − * We take a copies first, because a failed apply can trash | |
| 51 | + * We take copies first, because a failed apply can trash | |
| 52 | 52 | * both the base blob and the overlay |
| 53 | 53 | */ |
| 54 | 54 | tmpo = xmalloc(fdt_totalsize(overlay)); |
| @@ -1 +1 @@ | ||
| 1 | −#define DTC_VERSION "DTC 1.7.0-g1df7b047" | |
| 1 | +#define DTC_VERSION "DTC 1.7.0-gbcd02b52" | |