mirror of
https://source.denx.de/u-boot/u-boot.git
synced 2026-01-14 21:21:48 +01:00
Synchronize local copy of DTC with Linux 6.17 . This includes the
following picked and squashed commits from Linux kernel. The squash
was necessary, since the DTC here contains changes which were also
part of DTC in Linux alraedy, and the squash helped resolve those
without going back and forth with the changes.
The following commits from Linux are picked:
8f324cd712df7 # scripts/dtc: consolidate include path options in Makefile
b5b3d9b63b0ee # scripts/dtc: Add yamltree.c to dtc sources
7d97a76f226d6 # scripts/dtc: Update to upstream version v1.4.7-14-gc86da84d30e4
ea6f243be74e5 # scripts/dtc: Update to upstream version v1.4.7-57-gf267e674d145
02d435d4eccd8 # scripts/dtc: Update to upstream version v1.5.0-23-g87963ee20693
6e321b7637396 # scripts/dtc: Update to upstream version v1.5.0-30-g702c1b6c0e73
9f19ec91a7a35 # scripts/dtc: dtx_diff - add color output support
8287d642f38d1 # scripts/dtc: Update to upstream version v1.5.1-22-gc40aeb60b47a
4c52deef9225d # scripts/dtc: Revert "yamltree: Ensure consistent bracketing of properties with phandles"
5d3827e1452ed # scripts/dtc: Remove unused makefile fragments
40dd266887654 # scripts/dtc: Update to upstream version v1.6.0-2-g87a656ae5ff9
8d4cf6b6acb59 # scripts/dtc: use pkg-config to include <yaml.h> in non-standard path
b9bf9ace5ae90 # scripts/dtc: Update to upstream version v1.6.0-11-g9d7888cbf19c
69a883b6f5ac0 # scripts/dtc: dtx_diff - make help text formatting consistent
8f829108b8aed # scripts/dtc: only append to HOST_EXTRACFLAGS instead of overwriting
b39b4342ac495 # scripts/dtc: Update to upstream version v1.6.0-31-gcbca977ea121
93c6424c486b3 # scripts: dtc: Fetch fdtoverlay.c from external DTC project
0dd574a1d75c3 # scripts/dtc: Update to upstream version v1.6.0-51-g183df9e9c2b9
ec38b5df8a231 # scripts: dtc: Build fdtoverlay tool
a0c8c431411f5 # scripts: dtc: Remove the unused fdtdump.c file
e7dc653d4e890 # scripts/dtc: Add missing fdtoverlay to gitignore
d2bf5d2e3f09c # scripts/dtc: Update to upstream version v1.6.1-19-g0a3a9d3449c8
a60878f5532d0 # scripts/dtc: dtx_diff: remove broken example from help text
8b739d8658a9b # scripts/dtc: Call pkg-config POSIXly correct
b6eeafa67df00 # scripts/dtc: Update to upstream version v1.6.1-63-g55778a03df61
f96cc4c787588 # scripts/dtc: Update to upstream version v1.6.1-66-gabbd523bae6e
09ab9c092ef2b # scripts/dtc: Update to upstream version v1.7.0-93-g1df7b047fe43
ded8a5a498f2d # scripts/dtc: Update to upstream version v1.7.0-95-gbcd02b523429
ee6ff6fca7e71 # scripts/dtc: Update to upstream version v1.7.2-35-g52f07dcca47c
This also includes forward port of U-Boot commit
e8c2d25845c7 ("libfdt: Revert 6dcb8ba4 from upstream libfdt")
to avoid binary size growth.
Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
294 lines
5.2 KiB
C
294 lines
5.2 KiB
C
// SPDX-License-Identifier: GPL-2.0-or-later
|
|
/*
|
|
* (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation. 2005.
|
|
*/
|
|
|
|
#include "dtc.h"
|
|
|
|
void data_free(struct data d)
|
|
{
|
|
struct marker *m, *nm;
|
|
|
|
m = d.markers;
|
|
while (m) {
|
|
nm = m->next;
|
|
free(m->ref);
|
|
free(m);
|
|
m = nm;
|
|
}
|
|
|
|
if (d.val)
|
|
free(d.val);
|
|
}
|
|
|
|
struct data data_grow_for(struct data d, unsigned int xlen)
|
|
{
|
|
struct data nd;
|
|
unsigned int newsize;
|
|
|
|
if (xlen == 0)
|
|
return d;
|
|
|
|
nd = d;
|
|
|
|
newsize = xlen;
|
|
|
|
while ((d.len + xlen) > newsize)
|
|
newsize *= 2;
|
|
|
|
nd.val = xrealloc(d.val, newsize);
|
|
|
|
return nd;
|
|
}
|
|
|
|
struct data data_copy_mem(const char *mem, int len)
|
|
{
|
|
struct data d;
|
|
|
|
d = data_grow_for(empty_data, len);
|
|
|
|
d.len = len;
|
|
memcpy(d.val, mem, len);
|
|
|
|
return d;
|
|
}
|
|
|
|
struct data data_copy_escape_string(const char *s, int len)
|
|
{
|
|
int i = 0;
|
|
struct data d;
|
|
char *q;
|
|
|
|
d = data_add_marker(empty_data, TYPE_STRING, NULL);
|
|
d = data_grow_for(d, len + 1);
|
|
|
|
q = d.val;
|
|
while (i < len) {
|
|
char c = s[i++];
|
|
|
|
if (c == '\\')
|
|
c = get_escape_char(s, &i);
|
|
|
|
q[d.len++] = c;
|
|
}
|
|
|
|
q[d.len++] = '\0';
|
|
return d;
|
|
}
|
|
|
|
struct data data_copy_file(FILE *f, size_t maxlen)
|
|
{
|
|
struct data d = empty_data;
|
|
|
|
d = data_add_marker(d, TYPE_NONE, NULL);
|
|
while (!feof(f) && (d.len < maxlen)) {
|
|
size_t chunksize, ret;
|
|
|
|
if (maxlen == (size_t)-1)
|
|
chunksize = 4096;
|
|
else
|
|
chunksize = maxlen - d.len;
|
|
|
|
d = data_grow_for(d, chunksize);
|
|
ret = fread(d.val + d.len, 1, chunksize, f);
|
|
|
|
if (ferror(f))
|
|
die("Error reading file into data: %s", strerror(errno));
|
|
|
|
if (d.len + ret < d.len)
|
|
die("Overflow reading file into data\n");
|
|
|
|
d.len += ret;
|
|
}
|
|
|
|
return d;
|
|
}
|
|
|
|
struct data data_append_data(struct data d, const void *p, int len)
|
|
{
|
|
d = data_grow_for(d, len);
|
|
memcpy(d.val + d.len, p, len);
|
|
d.len += len;
|
|
return d;
|
|
}
|
|
|
|
struct data data_insert_at_marker(struct data d, struct marker *m,
|
|
const void *p, int len)
|
|
{
|
|
d = data_grow_for(d, len);
|
|
memmove(d.val + m->offset + len, d.val + m->offset, d.len - m->offset);
|
|
memcpy(d.val + m->offset, p, len);
|
|
d.len += len;
|
|
|
|
/* Adjust all markers after the one we're inserting at */
|
|
m = m->next;
|
|
for_each_marker(m)
|
|
m->offset += len;
|
|
return d;
|
|
}
|
|
|
|
static struct data data_append_markers(struct data d, struct marker *m)
|
|
{
|
|
struct marker **mp = &d.markers;
|
|
|
|
/* Find the end of the markerlist */
|
|
while (*mp)
|
|
mp = &((*mp)->next);
|
|
*mp = m;
|
|
return d;
|
|
}
|
|
|
|
struct data data_merge(struct data d1, struct data d2)
|
|
{
|
|
struct data d;
|
|
struct marker *m2 = d2.markers;
|
|
|
|
d = data_append_markers(data_append_data(d1, d2.val, d2.len), m2);
|
|
|
|
/* Adjust for the length of d1 */
|
|
for_each_marker(m2)
|
|
m2->offset += d1.len;
|
|
|
|
d2.markers = NULL; /* So data_free() doesn't clobber them */
|
|
data_free(d2);
|
|
|
|
return d;
|
|
}
|
|
|
|
struct data data_append_integer(struct data d, uint64_t value, int bits)
|
|
{
|
|
uint8_t value_8;
|
|
fdt16_t value_16;
|
|
fdt32_t value_32;
|
|
fdt64_t value_64;
|
|
|
|
switch (bits) {
|
|
case 8:
|
|
value_8 = value;
|
|
return data_append_data(d, &value_8, 1);
|
|
|
|
case 16:
|
|
value_16 = cpu_to_fdt16(value);
|
|
return data_append_data(d, &value_16, 2);
|
|
|
|
case 32:
|
|
value_32 = cpu_to_fdt32(value);
|
|
return data_append_data(d, &value_32, 4);
|
|
|
|
case 64:
|
|
value_64 = cpu_to_fdt64(value);
|
|
return data_append_data(d, &value_64, 8);
|
|
|
|
default:
|
|
die("Invalid literal size (%d)\n", bits);
|
|
}
|
|
}
|
|
|
|
struct data data_append_re(struct data d, uint64_t address, uint64_t size)
|
|
{
|
|
struct fdt_reserve_entry re;
|
|
|
|
re.address = cpu_to_fdt64(address);
|
|
re.size = cpu_to_fdt64(size);
|
|
|
|
return data_append_data(d, &re, sizeof(re));
|
|
}
|
|
|
|
struct data data_append_cell(struct data d, cell_t word)
|
|
{
|
|
return data_append_integer(d, word, sizeof(word) * 8);
|
|
}
|
|
|
|
struct data data_append_addr(struct data d, uint64_t addr)
|
|
{
|
|
return data_append_integer(d, addr, sizeof(addr) * 8);
|
|
}
|
|
|
|
struct data data_append_byte(struct data d, uint8_t byte)
|
|
{
|
|
return data_append_data(d, &byte, 1);
|
|
}
|
|
|
|
struct data data_append_zeroes(struct data d, int len)
|
|
{
|
|
d = data_grow_for(d, len);
|
|
|
|
memset(d.val + d.len, 0, len);
|
|
d.len += len;
|
|
return d;
|
|
}
|
|
|
|
struct data data_append_align(struct data d, int align)
|
|
{
|
|
int newlen = ALIGN(d.len, align);
|
|
return data_append_zeroes(d, newlen - d.len);
|
|
}
|
|
|
|
struct data data_add_marker(struct data d, enum markertype type, char *ref)
|
|
{
|
|
struct marker *m;
|
|
|
|
m = alloc_marker(d.len, type, ref);
|
|
|
|
return data_append_markers(d, m);
|
|
}
|
|
|
|
bool data_is_one_string(struct data d)
|
|
{
|
|
int i;
|
|
int len = d.len;
|
|
|
|
if (len == 0)
|
|
return false;
|
|
|
|
for (i = 0; i < len-1; i++)
|
|
if (d.val[i] == '\0')
|
|
return false;
|
|
|
|
if (d.val[len-1] != '\0')
|
|
return false;
|
|
|
|
return true;
|
|
}
|
|
|
|
struct data data_insert_data(struct data d, struct marker *m, struct data old)
|
|
{
|
|
unsigned int offset = m->offset;
|
|
struct marker *next = m->next;
|
|
struct marker *marker;
|
|
struct data new_data;
|
|
char *ref;
|
|
|
|
new_data = data_insert_at_marker(d, m, old.val, old.len);
|
|
|
|
/* Copy all markers from old value */
|
|
marker = old.markers;
|
|
for_each_marker(marker) {
|
|
ref = NULL;
|
|
|
|
if (marker->ref)
|
|
ref = xstrdup(marker->ref);
|
|
|
|
m->next = alloc_marker(marker->offset + offset, marker->type,
|
|
ref);
|
|
m = m->next;
|
|
}
|
|
m->next = next;
|
|
|
|
return new_data;
|
|
}
|
|
|
|
struct marker *alloc_marker(unsigned int offset, enum markertype type,
|
|
char *ref)
|
|
{
|
|
struct marker *m;
|
|
|
|
m = xmalloc(sizeof(*m));
|
|
m->offset = offset;
|
|
m->type = type;
|
|
m->ref = ref;
|
|
m->next = NULL;
|
|
|
|
return m;
|
|
}
|