Date: Sat, 25 Apr 2020 00:43:27 -0700 From: Mark Millard <marklmi@yahoo.com> To: freebsd-arm <freebsd-arm@freebsd.org>, freebsd-uboot@freebsd.org, FreeBSD ports <freebsd-ports@freebsd.org> Subject: Applying distribution patches for u-boot-rpi4-2020.04 fails during build (poudriere-devel context) Message-ID: <2AB77D60-F960-4C84-A9DC-8C2873A5C1FE@yahoo.com> References: <2AB77D60-F960-4C84-A9DC-8C2873A5C1FE.ref@yahoo.com>
next in thread | previous in thread | raw e-mail | index | archive | help
=46rom the log file: =3D=3D=3D> Patching for u-boot-rpi4-2020.04 =3D=3D=3D> Applying distribution patches for u-boot-rpi4-2020.04 2 out of 2 hunks failed--saving rejects to = scripts/dtc/libfdt/fdt_addresses.c.rej *** Error code 1 Details: amd64 head -r360289 context. Ports head -r532914 context. # svnlite status /usr/ports/sysutils/u-boot-rpi4/ #=20 # svnlite status /usr/ports/sysutils/u-boot-master/ #=20 # more = /wrkdirs/usr/ports/sysutils/u-boot-rpi4/work/u-boot-2020.04/scripts/dtc/li= bfdt/fdt_addresses.c.rej @@ -1,6 +1,7 @@ /* * libfdt - Flat Device Tree manipulation * Copyright (C) 2014 David Gibson <david@gibson.dropbear.id.au> + * Copyright (C) 2018 embedded brains GmbH * * libfdt is dual licensed: you can use it either under the terms of * the GPL, or the BSD license, at your option. @@ -55,42 +56,32 @@ =20 #include "libfdt_internal.h" =20 -int fdt_address_cells(const void *fdt, int nodeoffset) +static int fdt_cells(const void *fdt, int nodeoffset, const char *name) { - const fdt32_t *ac; + const fdt32_t *c; int val; int len; =20 - ac =3D fdt_getprop(fdt, nodeoffset, "#address-cells", &len); - if (!ac) + c =3D fdt_getprop(fdt, nodeoffset, name, &len); + if (!c) return 2; =20 - if (len !=3D sizeof(*ac)) + if (len !=3D sizeof(*c)) return -FDT_ERR_BADNCELLS; =20 - val =3D fdt32_to_cpu(*ac); + val =3D fdt32_to_cpu(*c); if ((val <=3D 0) || (val > FDT_MAX_NCELLS)) return -FDT_ERR_BADNCELLS; =20 return val; } =20 -int fdt_size_cells(const void *fdt, int nodeoffset) +int fdt_address_cells(const void *fdt, int nodeoffset) { - const fdt32_t *sc; - int val; - int len; - - sc =3D fdt_getprop(fdt, nodeoffset, "#size-cells", &len); - if (!sc) - return 2; - - if (len !=3D sizeof(*sc)) - return -FDT_ERR_BADNCELLS; - - val =3D fdt32_to_cpu(*sc); - if ((val < 0) || (val > FDT_MAX_NCELLS)) - return -FDT_ERR_BADNCELLS; + return fdt_cells(fdt, nodeoffset, "#address-cells"); +} =20 - return val; +int fdt_size_cells(const void *fdt, int nodeoffset) +{ + return fdt_cells(fdt, nodeoffset, "#size-cells"); } =3D=3D=3D Mark Millard marklmi at yahoo.com ( dsl-only.net went away in early 2018-Mar)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?2AB77D60-F960-4C84-A9DC-8C2873A5C1FE>