mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-12-30 06:53:09 +00:00
832bfad745
This is a combination of upstream libfdt commits to fix warnings about comparing signed and unsigned integers: ========== scripts/dtc/libfdt/fdt.c: In function ‘fdt_offset_ptr’: scripts/dtc/libfdt/fdt.c:137:18: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] if ((absoffset < offset) ... ========== For a detailed description of the fixes, see the dtc repo: https://git.kernel.org/pub/scm/utils/dtc/dtc.git/log/?id=73e0f143b73d808 For this patch the commits between 73e0f143b73d8088 and ca19c3db2bf62000 have been combined and adjusted for the slight differences in U-Boot's libfdt code base. Signed-off-by: Andre Przywara <andre.przywara@arm.com>
94 lines
1.9 KiB
C
94 lines
1.9 KiB
C
// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause)
|
|
/*
|
|
* libfdt - Flat Device Tree manipulation
|
|
* Copyright (C) 2006 David Gibson, IBM Corporation.
|
|
*/
|
|
#include "libfdt_env.h"
|
|
|
|
#include <fdt.h>
|
|
#include <libfdt.h>
|
|
|
|
#include "libfdt_internal.h"
|
|
|
|
int fdt_setprop_inplace_namelen_partial(void *fdt, int nodeoffset,
|
|
const char *name, int namelen,
|
|
uint32_t idx, const void *val,
|
|
int len)
|
|
{
|
|
void *propval;
|
|
int proplen;
|
|
|
|
propval = fdt_getprop_namelen_w(fdt, nodeoffset, name, namelen,
|
|
&proplen);
|
|
if (!propval)
|
|
return proplen;
|
|
|
|
if ((unsigned)proplen < (len + idx))
|
|
return -FDT_ERR_NOSPACE;
|
|
|
|
memcpy((char *)propval + idx, val, len);
|
|
return 0;
|
|
}
|
|
|
|
int fdt_setprop_inplace(void *fdt, int nodeoffset, const char *name,
|
|
const void *val, int len)
|
|
{
|
|
const void *propval;
|
|
int proplen;
|
|
|
|
propval = fdt_getprop(fdt, nodeoffset, name, &proplen);
|
|
if (!propval)
|
|
return proplen;
|
|
|
|
if (proplen != len)
|
|
return -FDT_ERR_NOSPACE;
|
|
|
|
return fdt_setprop_inplace_namelen_partial(fdt, nodeoffset, name,
|
|
strlen(name), 0,
|
|
val, len);
|
|
}
|
|
|
|
static void fdt_nop_region_(void *start, int len)
|
|
{
|
|
fdt32_t *p;
|
|
|
|
for (p = start; (char *)p < ((char *)start + len); p++)
|
|
*p = cpu_to_fdt32(FDT_NOP);
|
|
}
|
|
|
|
int fdt_nop_property(void *fdt, int nodeoffset, const char *name)
|
|
{
|
|
struct fdt_property *prop;
|
|
int len;
|
|
|
|
prop = fdt_get_property_w(fdt, nodeoffset, name, &len);
|
|
if (!prop)
|
|
return len;
|
|
|
|
fdt_nop_region_(prop, len + sizeof(*prop));
|
|
|
|
return 0;
|
|
}
|
|
|
|
int fdt_node_end_offset_(void *fdt, int offset)
|
|
{
|
|
int depth = 0;
|
|
|
|
while ((offset >= 0) && (depth >= 0))
|
|
offset = fdt_next_node(fdt, offset, &depth);
|
|
|
|
return offset;
|
|
}
|
|
|
|
int fdt_nop_node(void *fdt, int nodeoffset)
|
|
{
|
|
int endoffset;
|
|
|
|
endoffset = fdt_node_end_offset_(fdt, nodeoffset);
|
|
if (endoffset < 0)
|
|
return endoffset;
|
|
|
|
fdt_nop_region_(fdt_offset_ptr_w(fdt, nodeoffset, 0),
|
|
endoffset - nodeoffset);
|
|
return 0;
|
|
}
|