Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

scripts/dtc: Update to upstream version v1.7.2-69-g53373d135579 

This adds the following commits from upstream:

53373d135579 dtc: Remove unused dts_version in dtc-lexer.l
caf7465c5d60 libfdt: fdt_check_full: Handle FDT_NOP when FDT_END is expected
5976c4a66098 libfdt: fdt_rw: Introduce fdt_downgrade_version()
5bb5bedd347d fdtdump: Return an error code on wrong tag value
68b960e299f7 fdtdump: Remove dtb version check
adba02caf554 dtc: Use a consistent type for basenamelen
8d15a63e84ff libfdt: Verify alignment of sub-blocks in dtb

Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
This commit is contained in:
Rob Herring (Arm) 2026-04-07 15:04:13 -05:00
parent c349e45fbe
commit 5a09df2087
6 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/dtc/checks.c
View File

@ -324,7 +324,7 @@ ERROR(node_name_chars, check_node_name_chars, NODECHARS);
static void check_node_name_chars_strict(struct check *c, struct dt_info *dti,
struct node *node)
{
int n = strspn(node->name, c->data);
size_t n = strspn(node->name, c->data);
if (n < node->basenamelen)
FAIL(c, dti, node, "Character '%c' not recommended in node name",

3
scripts/dtc/dtc-lexer.l
View File

@ -39,8 +39,6 @@ extern bool treesource_error;
#define DPRINT(fmt, ...) do { } while (0)
#endif
static int dts_version = 1;
#define BEGIN_DEFAULT() DPRINT("<V1>\n"); \
BEGIN(V1); \
@ -101,7 +99,6 @@ static void PRINTF(1, 2) lexical_error(const char *fmt, ...);
<*>"/dts-v1/" {
DPRINT("Keyword: /dts-v1/\n");
dts_version = 1;
BEGIN_DEFAULT();
return DT_V1;
}

2
scripts/dtc/dtc.h
View File

@ -227,7 +227,7 @@ struct node {
struct node *next_sibling;
char *fullpath;
int basenamelen;
size_t basenamelen;
cell_t phandle;
int addr_cells, size_cells;

8
scripts/dtc/libfdt/fdt.c
View File

@ -110,6 +110,14 @@ int fdt_check_header(const void *fdt)
|| (fdt_totalsize(fdt) > INT_MAX))
return -FDT_ERR_TRUNCATED;
/* memrsv block must be 8 byte aligned */
if (fdt_off_mem_rsvmap(fdt) % sizeof(uint64_t))
return -FDT_ERR_ALIGNMENT;
/* Structure block must be 4 byte aligned */
if (fdt_off_dt_struct(fdt) % FDT_TAGSIZE)
return -FDT_ERR_ALIGNMENT;
/* Bounds check memrsv block */
if (!check_off_(hdrsize, fdt_totalsize(fdt),
fdt_off_mem_rsvmap(fdt)))

9
scripts/dtc/libfdt/fdt_rw.c
View File

@ -22,6 +22,12 @@ static int fdt_blocks_misordered_(const void *fdt,
(fdt_off_dt_strings(fdt) + fdt_size_dt_strings(fdt)));
}
static void fdt_downgrade_version(void *fdt)
{
if (!can_assume(LATEST) && fdt_version(fdt) > FDT_LAST_SUPPORTED_VERSION)
fdt_set_version(fdt, FDT_LAST_SUPPORTED_VERSION);
}
static int fdt_rw_probe_(void *fdt)
{
if (can_assume(VALID_DTB))
@ -33,9 +39,8 @@ static int fdt_rw_probe_(void *fdt)
if (fdt_blocks_misordered_(fdt, sizeof(struct fdt_reserve_entry),
fdt_size_dt_struct(fdt)))
return -FDT_ERR_BADLAYOUT;
if (!can_assume(LATEST) && fdt_version(fdt) > 17)
fdt_set_version(fdt, 17);
fdt_downgrade_version(fdt);
return 0;
}

2
scripts/dtc/version_gen.h
View File

@ -1 +1 @@
#define DTC_VERSION "DTC 1.7.2-ga26ef640"
#define DTC_VERSION "DTC 1.7.2-g53373d13"