Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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>
+18
-8
+1
-1
scripts/dtc/checks.c
+1
-1
scripts/dtc/checks.c
···
324
324
static void check_node_name_chars_strict(struct check *c, struct dt_info *dti,
325
325
struct node *node)
326
326
{
327
-
int n = strspn(node->name, c->data);
327
+
size_t n = strspn(node->name, c->data);
328
328
329
329
if (n < node->basenamelen)
330
330
FAIL(c, dti, node, "Character '%c' not recommended in node name",
-3
scripts/dtc/dtc-lexer.l
-3
scripts/dtc/dtc-lexer.l
···
39
39
#define DPRINT(fmt, ...) do { } while (0)
40
40
#endif
41
41
42
-
static int dts_version = 1;
43
-
44
42
#define BEGIN_DEFAULT() DPRINT("<V1>\n"); \
45
43
BEGIN(V1); \
46
44
···
99
101
100
102
<*>"/dts-v1/" {
101
103
DPRINT("Keyword: /dts-v1/\n");
102
-
dts_version = 1;
103
104
BEGIN_DEFAULT();
104
105
return DT_V1;
105
106
}
+1
-1
scripts/dtc/dtc.h
+1
-1
scripts/dtc/dtc.h
+8
scripts/dtc/libfdt/fdt.c
+8
scripts/dtc/libfdt/fdt.c
···
110
110
|| (fdt_totalsize(fdt) > INT_MAX))
111
111
return -FDT_ERR_TRUNCATED;
112
112
113
+
/* memrsv block must be 8 byte aligned */
114
+
if (fdt_off_mem_rsvmap(fdt) % sizeof(uint64_t))
115
+
return -FDT_ERR_ALIGNMENT;
116
+
117
+
/* Structure block must be 4 byte aligned */
118
+
if (fdt_off_dt_struct(fdt) % FDT_TAGSIZE)
119
+
return -FDT_ERR_ALIGNMENT;
120
+
113
121
/* Bounds check memrsv block */
114
122
if (!check_off_(hdrsize, fdt_totalsize(fdt),
115
123
fdt_off_mem_rsvmap(fdt)))
+7
-2
scripts/dtc/libfdt/fdt_rw.c
+7
-2
scripts/dtc/libfdt/fdt_rw.c
···
22
22
(fdt_off_dt_strings(fdt) + fdt_size_dt_strings(fdt)));
23
23
}
24
24
25
+
static void fdt_downgrade_version(void *fdt)
26
+
{
27
+
if (!can_assume(LATEST) && fdt_version(fdt) > FDT_LAST_SUPPORTED_VERSION)
28
+
fdt_set_version(fdt, FDT_LAST_SUPPORTED_VERSION);
29
+
}
30
+
25
31
static int fdt_rw_probe_(void *fdt)
26
32
{
27
33
if (can_assume(VALID_DTB))
···
39
33
if (fdt_blocks_misordered_(fdt, sizeof(struct fdt_reserve_entry),
40
34
fdt_size_dt_struct(fdt)))
41
35
return -FDT_ERR_BADLAYOUT;
42
-
if (!can_assume(LATEST) && fdt_version(fdt) > 17)
43
-
fdt_set_version(fdt, 17);
44
36
37
+
fdt_downgrade_version(fdt);
45
38
return 0;
46
39
}
47
40