Release 2023.08-rc2

-----BEGIN PGP SIGNATURE----- iG8EABECADAWIQSrB9gG0s50H7iG7lCwJbqLWcNjGQUCZOKHvRIcamFjbWV0QHVj bGliYy5vcmcACgkQsCW6i1nDYxn1/QCg2un/vUk0HEIbpn4d1fMRZFBDSlwAmKRp iO+4qkBgt1h+2LxZSJmNbPY= =nvGJ -----END PGP SIGNATURE----- Merge tag '2023.08-rc2' into next Conflicts: - .checkpackageignore - Makefile - board/versal/post-image.sh - package/sentry-cli/0001-Disable-SSL-support-for-the-curl-module.patch => keep version in next - Config.in.legacy => merge, introduce legacy comment for 2023.11 - toolchain/toolchain-external/toolchain-external-bootlin/Config.in.options => regenerate, drop dependency on inexistant BR2_ARCH_NEEDS_GCC_AT_LEAST_14 Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
2023-08-21 21:36:17 +02:00 · 2023-08-21 21:36:17 +02:00 · 2423d9f16b
commit 2423d9f16b
parent bfa4a7c8f2 bdd80863cf
154 changed files with 2761 additions and 2404 deletions
--- a/.checkpackageignore
+++ b/.checkpackageignore
@ -107,11 +107,6 @@ boot/at91dataflashboot/0001-do-not-install.patch Upstream
 boot/at91dataflashboot/0002-eabi-fixes.patch Upstream
 boot/grub2/0001-Makefile-Make-grub_fstest.pp-depend-on-config-util.h.patch Upstream
 boot/grub2/0002-grub-mkconfig-Restore-umask-for-the-grub.cfg.patch Upstream
-boot/lpc32xxcdl/0001-compiler_name.patch Upstream
-boot/lpc32xxcdl/0002-delete_redundant_files.patch Upstream
-boot/lpc32xxcdl/0003-libnosys_gnu.patch Upstream
-boot/lpc32xxcdl/0004-slashes.patch Upstream
-boot/mv-ddr-marvell/0001-Makefile-disable-stack-protection.patch Upstream
 boot/optee-os/3.13.0/0001-core-zlib-fix-build-warning-when-_LFS64_LARGEFILE-is.patch Upstream
 boot/syslinux/0001-bios-Fix-alignment-change-with-gcc-5.patch Upstream
 boot/syslinux/0002-Disable-PIE-to-avoid-FTBFS-on-amd64.patch Upstream
@ -267,9 +262,6 @@ package/chrony/S49chrony Indent Shellcheck Variables
 package/cmake/0001-rename-cmake-rootfile.patch Upstream
 package/cmocka/0001-Don-t-redefine-uintptr_t.patch Upstream
 package/collectd/0001-src-netlink.c-remove-REG_NOERROR.patch Upstream
-package/connman/0001-gweb-Fix-OOB-write-in-received_data.patch Upstream
-package/connman/0002-wispr-Add-reference-counter-to-portal-context.patch Upstream
-package/connman/0003-wispr-Update-portal-context-references.patch Upstream
 package/connman/S45connman Variables
 package/copas/0001-Do-not-load-coxpcall-for-LuaJIT.patch Upstream
 package/coremark-pro/coremark-pro.sh.in Shellcheck
@ -394,7 +386,7 @@ package/elf2flt/0002-elf2flt.ld-reinstate-32-byte-alignment-for-.data-sec.patch
 package/elf2flt/0003-elf2flt-add-riscv-64-bits-support.patch Upstream
 package/elf2flt/0004-elf2flt-create-a-common-helper-function.patch Upstream
 package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch Upstream
-package/elf2flt/0006-elf2flt-xtensa-fix-text-relocations.patch Upstream
+package/elf2flt/0006-xtensa-fix-text-relocations.patch Upstream
 package/elftosb/0001-fixes-includes.patch Upstream
 package/elftosb/0002-force-cxx-compiler.patch Upstream
 package/elfutils/0001-Add-a-enable-disable-progs-configure-option.patch Upstream
--- a/32
+++ b/32
@ -1,3 +1,35 @@
+2023.08-rc2, released August 20th, 2023
+
+	Fixes all over the tree.
+
+	Toolchains: Only show external toolchains based on a GCC
+	version supporting the selected architecture
+	variant. Correctly mark Codescape MIPS external toolchains as
+	not providing a gdbserver.
+
+	Defconfigs: Andes ae350_45: Drop custom U-Boot march setting,
+	breaking builds with GCC 12. Nitrogen*: Bump
+	U-Boot/Linux. Nitrogen8*: Use ATF 2.8, fixing array bounds
+	errors. QEMU m68k: Add Linux patch to fix build issue with
+	binutils >= 2.41. Raspberrypi*: Enable console on HDMI when
+	using systemd as well.
+
+	Updated/fixed packages: at91dataflashboot, aubio, berkeleydb,
+	bwm-ng, ccache, check, chocolate-doom, compiler-rt, composer,
+	conmon, connman, dav1d, diffutils, dracut, e2fsprogs, elf2flt,
+	esp-hosted, flite, gcc, gdb, go-bootstrap-stage2,
+	intel-microcode, kodi-imagedecoder-heif, less, libcoap,
+	libedit, libglib2, libksba, liblo, libserial, log4cxx, lsof,
+	luvi, meson, mosquitto, mpd, mpv, mv-ddr-marvell, nftables,
+	ntpsec, openssh, optee-test, perftest, python-botocore,
+	python-docker, python-pylibfdt, python3, screenfetch,
+	sentry-cli, sngrep, stellarium, trinity, tvheadend, uboot,
+	uclibc, util-linux, xfsprogs, yajl
+
+	New packages: nftables-python, xlib_libXpresent
+
+	Removed packages: lpc32xxcdl
+
 2023.08-rc1, released August 5, 2023

 	Numerous package updates and fixes, additional runtime tests.
--- a/Config.in.legacy
+++ b/Config.in.legacy
@ -144,7 +144,7 @@ endif

 ###############################################################################

-comment "Legacy options removed in 2023.08"
+comment "Legacy options removed in 2023.11"

 config BR2_PACKAGE_GOOGLE_MATERIAL_DESIGN_ICONS
 	bool "google-material-design-icons removed"
@ -158,6 +158,14 @@ config BR2_GDB_VERSION_10
 	help
 	  gdb 10.x has been removed, use a newer version.

+comment "Legacy options removed in 2023.08"
+
+config BR2_TARGET_LPC32XXCDL
+	bool "lpc32xxcdl has been removed"
+	select BR2_LEGACY
+	help
+	  lpc32xxcdl has been removed, due to licensing concerns.
+
 config BR2_BINUTILS_VERSION_2_38_X
 	bool "binutils 2.38.x has been removed"
 	select BR2_LEGACY
--- a/3
+++ b/3
@ -1033,6 +1033,7 @@ F:	package/tinycbor/
 F:	package/tinydtls/
 F:	package/tinymembench/
 F:	package/whois/
+F:	package/x11r7/xlib_libXpresent/
 F:	package/zeek/

 N:	Fabrice Goucem <fabrice.goucem@oss.nxp.com>
@ -1803,6 +1804,8 @@ F:	support/testing/tests/package/test_lz4.py
 F:	support/testing/tests/package/test_lzop.py
 F:	support/testing/tests/package/test_mtools.py
 F:	support/testing/tests/package/test_ncdu.py
+F:	support/testing/tests/package/test_nftables.py
+F:	support/testing/tests/package/test_nftables/
 F:	support/testing/tests/package/test_octave.py
 F:	support/testing/tests/package/test_ola.py
 F:	support/testing/tests/package/test_ola/
--- a/2
+++ b/2
@ -92,7 +92,7 @@ all:
 # Set and export the version string
 export BR2_VERSION := 2023.11-git
 # Actual time the release is cut (for reproducible builds)
-BR2_VERSION_EPOCH = 1691269000
+BR2_VERSION_EPOCH = 1692567000

 # Save running make version since it's clobbered by the make package
 RUNNING_MAKE_VERSION := $(MAKE_VERSION)
--- a/board/qemu/m68k-mcf5208/0001-m68k-Fix-invalid-.section-syntax.patch
+++ b/board/qemu/m68k-mcf5208/0001-m68k-Fix-invalid-.section-syntax.patch
@ -0,0 +1,97 @@
+From 0bb6b7477f5dcfafbdd76eea9c7aa7a5f78d7613 Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <benh@debian.org>
+Date: Fri, 16 Jun 2023 17:36:10 +0200
+Subject: [PATCH] m68k: Fix invalid .section syntax
+
+gas supports several different forms for .section for ELF targets,
+including:
+    .section NAME [, "FLAGS"[, @TYPE[,FLAG_SPECIFIC_ARGUMENTS]]]
+and:
+    .section "NAME"[, #FLAGS...]
+
+In several places we use a mix of these two forms:
+    .section NAME, #FLAGS...
+
+A current development snapshot of binutils (2.40.50.20230611) treats
+this mixed syntax as an error.
+
+Change to consistently use:
+    .section NAME, "FLAGS"
+as is used elsewhere in the kernel.
+
+Link: https://buildd.debian.org/status/fetch.php?pkg=linux&arch=m68k&ver=6.4%7Erc6-1%7Eexp1&stamp=1686907300&raw=1
+Signed-off-by: Ben Hutchings <benh@debian.org>
+Tested-by: Jan-Benedict Glaw <jbglaw@lug-owl.de>
+Link: https://lore.kernel.org/r/ZIyBaueWT9jnTwRC@decadent.org.uk
+Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
+Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=922a9bd138101e3e5718f0f4d40dba68ef89bb43
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+---
+ arch/m68k/fpsp040/skeleton.S       | 4 ++--
+ arch/m68k/ifpsp060/os.S            | 4 ++--
+ arch/m68k/kernel/relocate_kernel.S | 4 ++--
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/arch/m68k/fpsp040/skeleton.S b/arch/m68k/fpsp040/skeleton.S
+index 439395aa6fb4..081922c72daa 100644
+--- a/arch/m68k/fpsp040/skeleton.S
+++ b/arch/m68k/fpsp040/skeleton.S
+@@ -499,13 +499,13 @@ in_ea:
+ 	dbf	%d0,morein
+ 	rts
+ 
+-	.section .fixup,#alloc,#execinstr
+	.section .fixup,"ax"
+ 	.even
+ 1:
+ 	jbsr	fpsp040_die
+ 	jbra	.Lnotkern
+ 
+-	.section __ex_table,#alloc
+	.section __ex_table,"a"
+ 	.align	4
+ 
+ 	.long	in_ea,1b
+diff --git a/arch/m68k/ifpsp060/os.S b/arch/m68k/ifpsp060/os.S
+index 7a0d6e428066..89e2ec224ab6 100644
+--- a/arch/m68k/ifpsp060/os.S
+++ b/arch/m68k/ifpsp060/os.S
+@@ -379,11 +379,11 @@ _060_real_access:
+ 
+ 
+ | Execption handling for movs access to illegal memory
+-	.section .fixup,#alloc,#execinstr
+	.section .fixup,"ax"
+ 	.even
+ 1:	moveq		#-1,%d1
+ 	rts
+-.section __ex_table,#alloc
+.section __ex_table,"a"
+ 	.align 4
+ 	.long	dmrbuae,1b
+ 	.long	dmrwuae,1b
+diff --git a/arch/m68k/kernel/relocate_kernel.S b/arch/m68k/kernel/relocate_kernel.S
+index ab0f1e7d4653..f7667079e08e 100644
+--- a/arch/m68k/kernel/relocate_kernel.S
+++ b/arch/m68k/kernel/relocate_kernel.S
+@@ -26,7 +26,7 @@ ENTRY(relocate_new_kernel)
+ 	lea %pc@(.Lcopy),%a4
+ 2:	addl #0x00000000,%a4		/* virt_to_phys() */
+ 
+-	.section ".m68k_fixup","aw"
+	.section .m68k_fixup,"aw"
+ 	.long M68K_FIXUP_MEMOFFSET, 2b+2
+ 	.previous
+ 
+@@ -49,7 +49,7 @@ ENTRY(relocate_new_kernel)
+ 	lea %pc@(.Lcont040),%a4
+ 5:	addl #0x00000000,%a4		/* virt_to_phys() */
+ 
+-	.section ".m68k_fixup","aw"
+	.section .m68k_fixup,"aw"
+ 	.long M68K_FIXUP_MEMOFFSET, 5b+2
+ 	.previous
+ 
+-- 
+2.41.0
+
--- a/board/qemu/m68k-q800/0001-m68k-Fix-invalid-.section-syntax.patch
+++ b/board/qemu/m68k-q800/0001-m68k-Fix-invalid-.section-syntax.patch
@ -0,0 +1,97 @@
+From 0bb6b7477f5dcfafbdd76eea9c7aa7a5f78d7613 Mon Sep 17 00:00:00 2001
+From: Ben Hutchings <benh@debian.org>
+Date: Fri, 16 Jun 2023 17:36:10 +0200
+Subject: [PATCH] m68k: Fix invalid .section syntax
+
+gas supports several different forms for .section for ELF targets,
+including:
+    .section NAME [, "FLAGS"[, @TYPE[,FLAG_SPECIFIC_ARGUMENTS]]]
+and:
+    .section "NAME"[, #FLAGS...]
+
+In several places we use a mix of these two forms:
+    .section NAME, #FLAGS...
+
+A current development snapshot of binutils (2.40.50.20230611) treats
+this mixed syntax as an error.
+
+Change to consistently use:
+    .section NAME, "FLAGS"
+as is used elsewhere in the kernel.
+
+Link: https://buildd.debian.org/status/fetch.php?pkg=linux&arch=m68k&ver=6.4%7Erc6-1%7Eexp1&stamp=1686907300&raw=1
+Signed-off-by: Ben Hutchings <benh@debian.org>
+Tested-by: Jan-Benedict Glaw <jbglaw@lug-owl.de>
+Link: https://lore.kernel.org/r/ZIyBaueWT9jnTwRC@decadent.org.uk
+Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
+Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=922a9bd138101e3e5718f0f4d40dba68ef89bb43
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+---
+ arch/m68k/fpsp040/skeleton.S       | 4 ++--
+ arch/m68k/ifpsp060/os.S            | 4 ++--
+ arch/m68k/kernel/relocate_kernel.S | 4 ++--
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/arch/m68k/fpsp040/skeleton.S b/arch/m68k/fpsp040/skeleton.S
+index 439395aa6fb4..081922c72daa 100644
+--- a/arch/m68k/fpsp040/skeleton.S
+++ b/arch/m68k/fpsp040/skeleton.S
+@@ -499,13 +499,13 @@ in_ea:
+ 	dbf	%d0,morein
+ 	rts
+ 
+-	.section .fixup,#alloc,#execinstr
+	.section .fixup,"ax"
+ 	.even
+ 1:
+ 	jbsr	fpsp040_die
+ 	jbra	.Lnotkern
+ 
+-	.section __ex_table,#alloc
+	.section __ex_table,"a"
+ 	.align	4
+ 
+ 	.long	in_ea,1b
+diff --git a/arch/m68k/ifpsp060/os.S b/arch/m68k/ifpsp060/os.S
+index 7a0d6e428066..89e2ec224ab6 100644
+--- a/arch/m68k/ifpsp060/os.S
+++ b/arch/m68k/ifpsp060/os.S
+@@ -379,11 +379,11 @@ _060_real_access:
+ 
+ 
+ | Execption handling for movs access to illegal memory
+-	.section .fixup,#alloc,#execinstr
+	.section .fixup,"ax"
+ 	.even
+ 1:	moveq		#-1,%d1
+ 	rts
+-.section __ex_table,#alloc
+.section __ex_table,"a"
+ 	.align 4
+ 	.long	dmrbuae,1b
+ 	.long	dmrwuae,1b
+diff --git a/arch/m68k/kernel/relocate_kernel.S b/arch/m68k/kernel/relocate_kernel.S
+index ab0f1e7d4653..f7667079e08e 100644
+--- a/arch/m68k/kernel/relocate_kernel.S
+++ b/arch/m68k/kernel/relocate_kernel.S
+@@ -26,7 +26,7 @@ ENTRY(relocate_new_kernel)
+ 	lea %pc@(.Lcopy),%a4
+ 2:	addl #0x00000000,%a4		/* virt_to_phys() */
+ 
+-	.section ".m68k_fixup","aw"
+	.section .m68k_fixup,"aw"
+ 	.long M68K_FIXUP_MEMOFFSET, 2b+2
+ 	.previous
+ 
+@@ -49,7 +49,7 @@ ENTRY(relocate_new_kernel)
+ 	lea %pc@(.Lcont040),%a4
+ 5:	addl #0x00000000,%a4		/* virt_to_phys() */
+ 
+-	.section ".m68k_fixup","aw"
+	.section .m68k_fixup,"aw"
+ 	.long M68K_FIXUP_MEMOFFSET, 5b+2
+ 	.previous
+ 
+-- 
+2.41.0
+
--- a/board/qemu/ppc64le-powernv8/readme.txt
+++ b/board/qemu/ppc64le-powernv8/readme.txt
@ -1,5 +1,5 @@
 Run the emulation with:

-qemu-system-ppc64 -M powernv9 -kernel vmlinux -append "console=hvc0 rootwait root=/dev/nvme0n1" -device nvme,bus=pcie.3,addr=0x0,drive=drive0,serial=1234 -drive file=./rootfs.ext2,if=none,id=drive0,format=raw,cache=none -device e1000e,netdev=net0,mac=C0:FF:EE:00:01:03,bus=pcie.1,addr=0x0  -netdev user,id=net0 -serial mon:stdio -nographic # qemu_ppc64le_powernv8_defconfig
+qemu-system-ppc64 -M powernv9 -kernel output/images/vmlinux -append "console=hvc0 rootwait root=/dev/nvme0n1" -device nvme,bus=pcie.3,addr=0x0,drive=drive0,serial=1234 -drive file=output/images/rootfs.ext2,if=none,id=drive0,format=raw,cache=none -device e1000e,netdev=net0,mac=C0:FF:EE:00:01:03,bus=pcie.1,addr=0x0  -netdev user,id=net0 -serial mon:stdio -nographic # qemu_ppc64le_powernv8_defconfig

 The login prompt will appear in the terminal window.
--- a/board/radxa/rock5b/linux.fragment
+++ b/board/radxa/rock5b/linux.fragment
@ -1 +1,4 @@
 CONFIG_R8169=y
+# Disable Rockchip specific WiFi drivers, as the kernel
+# code cannot be build with GCC 12 due to several Werrors
+# CONFIG_WL_ROCKCHIP is not set
--- a/board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch
+++ b/board/radxa/rock5b/patches/linux/0001-etherdevice-Adjust-ether_addr-prototypes-to-silence-.patch
@ -0,0 +1,64 @@
+From 2618a0dae09ef37728dab89ff60418cbe25ae6bd Mon Sep 17 00:00:00 2001
+From: Kees Cook <keescook@chromium.org>
+Date: Sat, 12 Feb 2022 09:14:49 -0800
+Subject: etherdevice: Adjust ether_addr* prototypes to silence
+ -Wstringop-overead
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+With GCC 12, -Wstringop-overread was warning about an implicit cast from
+char[6] to char[8]. However, the extra 2 bytes are always thrown away,
+alignment doesn't matter, and the risk of hitting the edge of unallocated
+memory has been accepted, so this prototype can just be converted to a
+regular char *. Silences:
+
+net/core/dev.c: In function ‘bpf_prog_run_generic_xdp’: net/core/dev.c:4618:21: warning: ‘ether_addr_equal_64bits’ reading 8 bytes from a region of size 6 [-Wstringop-overread]
+ 4618 |         orig_host = ether_addr_equal_64bits(eth->h_dest, > skb->dev->dev_addr);
+      |                     ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+net/core/dev.c:4618:21: note: referencing argument 1 of type ‘const u8[8]’ {aka ‘const unsigned char[8]’}
+net/core/dev.c:4618:21: note: referencing argument 2 of type ‘const u8[8]’ {aka ‘const unsigned char[8]’}
+In file included from net/core/dev.c:91: include/linux/etherdevice.h:375:20: note: in a call to function ‘ether_addr_equal_64bits’
+  375 | static inline bool ether_addr_equal_64bits(const u8 addr1[6+2],
+      |                    ^~~~~~~~~~~~~~~~~~~~~~~
+
+Reported-by: Marc Kleine-Budde <mkl@pengutronix.de>
+Tested-by: Marc Kleine-Budde <mkl@pengutronix.de>
+Link: https://lore.kernel.org/netdev/20220212090811.uuzk6d76agw2vv73@pengutronix.de
+Cc: Jakub Kicinski <kuba@kernel.org>
+Cc: "David S. Miller" <davem@davemloft.net>
+Cc: netdev@vger.kernel.org
+Signed-off-by: Kees Cook <keescook@chromium.org>
+Signed-off-by: David S. Miller <davem@davemloft.net>
+Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=2618a0dae09ef37728dab89ff60418cbe25ae6bd
+Signed-off-by: Kilian Zinnecker <kilian.zinnecker@mail.de>
+---
+ include/linux/etherdevice.h | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h
+index 2ad71cc90b37d..92b10e67d5f87 100644
+--- a/include/linux/etherdevice.h
+++ b/include/linux/etherdevice.h
+@@ -134,7 +134,7 @@ static inline bool is_multicast_ether_addr(const u8 *addr)
+ #endif
+ }
+ 
+-static inline bool is_multicast_ether_addr_64bits(const u8 addr[6+2])
+static inline bool is_multicast_ether_addr_64bits(const u8 *addr)
+ {
+ #if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64
+ #ifdef __BIG_ENDIAN
+@@ -372,8 +372,7 @@ static inline bool ether_addr_equal(const u8 *addr1, const u8 *addr2)
+  * Please note that alignment of addr1 & addr2 are only guaranteed to be 16 bits.
+  */
+ 
+-static inline bool ether_addr_equal_64bits(const u8 addr1[6+2],
+-					   const u8 addr2[6+2])
+static inline bool ether_addr_equal_64bits(const u8 *addr1, const u8 *addr2)
+ {
+ #if defined(CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS) && BITS_PER_LONG == 64
+ 	u64 fold = (*(const u64 *)addr1) ^ (*(const u64 *)addr2);
+-- 
+cgit 
+
--- a/board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch
+++ b/board/radxa/rock5b/patches/linux/0002-mm-page_alloc-fix-building-error-on-Werror-array-com.patch
@ -0,0 +1,43 @@
+From ca831f29f8f25c97182e726429b38c0802200c8f Mon Sep 17 00:00:00 2001
+From: Xiongwei Song <sxwjean@gmail.com>
+Date: Fri, 14 Jan 2022 14:07:24 -0800
+Subject: mm: page_alloc: fix building error on -Werror=array-compare
+
+Arthur Marsh reported we would hit the error below when building kernel
+with gcc-12:
+
+  CC      mm/page_alloc.o
+  mm/page_alloc.c: In function `mem_init_print_info':
+  mm/page_alloc.c:8173:27: error: comparison between two arrays [-Werror=array-compare]
+   8173 |                 if (start <= pos && pos < end && size > adj) \
+        |
+
+In C++20, the comparision between arrays should be warned.
+
+Link: https://lkml.kernel.org/r/20211125130928.32465-1-sxwjean@me.com
+Signed-off-by: Xiongwei Song <sxwjean@gmail.com>
+Reported-by: Arthur Marsh <arthur.marsh@internode.on.net>
+Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
+Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
+Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ca831f29f8f25c97182e726429b38c0802200c8f
+Signed-off-by: Kilian Zinnecker <kilian.zinnecker@mail.de>
+---
+ mm/page_alloc.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/mm/page_alloc.c b/mm/page_alloc.c
+index 806f317c2e7e2..c4ef450ac4428 100644
+--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
+@@ -8228,7 +8228,7 @@ void __init mem_init_print_info(void)
+ 	 */
+ #define adj_init_size(start, end, size, pos, adj) \
+ 	do { \
+-		if (start <= pos && pos < end && size > adj) \
+		if (&start[0] <= &pos[0] && &pos[0] < &end[0] && size > adj) \
+ 			size -= adj; \
+ 	} while (0)
+ 
+-- 
+cgit 
+
--- a/board/radxa/rock5b/readme.txt
+++ b/board/radxa/rock5b/readme.txt
@ -60,3 +60,23 @@ Enter 'root' as login user, and the prompt is ready.
 wiki link:
 ----------
 https://forum.radxa.com/c/rock5
+
+Issues:
+=======
+
+The custom Radxa kernel provides custom code to support WiFi. However,
+that code does not compile with GCC 12, which is the current default
+version in buildroot. Hence, the WiFi kernel drivers are disabled, until
+the issues get fixed (if ever). If they are desperately needed, one may
+apply the following workaround, as long as buildroot still supports GCC
+version 11:
+
+1. Set GCC version 11, by adding the following line to
+configs/rock5b_defconfig:
+
+BR2_GCC_VERSION_11_X=y
+
+2. Re-enable custom WiFi drivers by removing the following line from
+board/radxa/rock5b/linux.fragment:
+
+# CONFIG_WL_ROCKCHIP is not set
--- a/board/raspberrypi/post-build.sh
+++ b/board/raspberrypi/post-build.sh
@ -8,6 +8,11 @@ if [ -e ${TARGET_DIR}/etc/inittab ]; then
    grep -qE '^tty1::' ${TARGET_DIR}/etc/inittab || \
 	sed -i '/GENERIC_SERIAL/a\
 tty1::respawn:/sbin/getty -L  tty1 0 vt100 # HDMI console' ${TARGET_DIR}/etc/inittab
+# systemd doesn't use /etc/inittab, enable getty.tty1.service instead
+elif [ -d ${TARGET_DIR}/etc/systemd ]; then
+    mkdir -p "${TARGET_DIR}/etc/systemd/system/getty.target.wants"
+    ln -sf /lib/systemd/system/getty@.service \
+       "${TARGET_DIR}/etc/systemd/system/getty.target.wants/getty@tty1.service"
 fi

 # exnsure overlays exists for genimage
--- a/board/zynq/post-image.sh
+++ b/board/zynq/post-image.sh
@ -1,6 +1,6 @@
 #!/bin/sh

-# By default U-Boot loads DTB from a file named "devicetree.dtb", so
+# By default U-Boot loads DTB from a file named "system.dtb", so
 # let's use a symlink with that name that points to the *first*
 # devicetree listed in the config.

--- a/boot/Config.in
+++ b/boot/Config.in
@ -12,7 +12,6 @@ source "boot/binaries-marvell/Config.in"
 source "boot/boot-wrapper-aarch64/Config.in"
 source "boot/edk2/Config.in"
 source "boot/grub2/Config.in"
-source "boot/lpc32xxcdl/Config.in"
 source "boot/mv-ddr-marvell/Config.in"
 source "boot/mxs-bootlets/Config.in"
 source "boot/optee-os/Config.in"
--- a/boot/at91dataflashboot/at91dataflashboot.mk
+++ b/boot/at91dataflashboot/at91dataflashboot.mk
@ -11,9 +11,14 @@ AT91DATAFLASHBOOT_SITE = ftp://www.at91.com/pub/buildroot
 AT91DATAFLASHBOOT_INSTALL_TARGET = NO
 AT91DATAFLASHBOOT_INSTALL_IMAGES = YES

+AT91DATAFLASHBOOT_CFLAGS = $(TARGET_CFLAGS) -fno-stack-protector
+ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y)
+AT91DATAFLASHBOOT_CFLAGS += -marm
+endif
+
 define AT91DATAFLASHBOOT_BUILD_CMDS
 	make -C $(@D) CROSS_COMPILE=$(TARGET_CROSS) \
-		CFLAGS="$(TARGET_CFLAGS) -fno-stack-protector"
+		CFLAGS="$(AT91DATAFLASHBOOT_CFLAGS)"
 endef

 define AT91DATAFLASHBOOT_INSTALL_IMAGES_CMDS
--- a/boot/lpc32xxcdl/0001-compiler_name.patch
+++ b/boot/lpc32xxcdl/0001-compiler_name.patch
@ -1,52 +0,0 @@
-Use CROSS_COMPILE as compiler name and stop using libc
-
-Signed-off-by: Alexandre Belloni <abelloni@adeneo-embedded.com>
---
- makerule/lpc32xx/make.lpc32xx.gnu |   22 +++++++++++-----------
- 1 files changed, 11 insertions(+), 11 deletions(-)
-
-diff --git a/makerule/lpc32xx/make.lpc32xx.gnu b/makerule/lpc32xx/make.lpc32xx.gnu
-index 1014c28..3277d99 100644
--- a/makerule/lpc32xx/make.lpc32xx.gnu
-+++ b/makerule/lpc32xx/make.lpc32xx.gnu
-@@ -27,19 +27,19 @@ CFLAGS   += -mno-sched-prolog -fno-hosted -mno-thumb-interwork -ffunction-sectio
- CFLAGS   += -I$(CSP_INC_DIR) -I$(BSP_INC_DIR) -I$(GEN_INC_DIR)
- AFLAGS   = -mcpu=arm926ej-s
- AFLAGS   += -I$(CSP_INC_DIR) -I$(BSP_INC_DIR) -I$(GEN_INC_DIR)
-CC       = arm-none-eabi-gcc
-AS       = arm-none-eabi-as
-AR       = arm-none-eabi-ar -r
-LD       = arm-none-eabi-gcc
-NM       = arm-none-eabi-nm
-OBJDUMP  = arm-none-eabi-objdump
-OBJCOPY  = arm-none-eabi-objcopy
-READELF  = arm-none-eabi-readelf
-+CC       = $(CROSS_COMPILE)gcc
-+AS       = $(CROSS_COMPILE)as
-+AR       = $(CROSS_COMPILE)ar -r
-+LD       = $(CROSS_COMPILE)gcc
-+NM       = $(CROSS_COMPILE)nm
-+OBJDUMP  = $(CROSS_COMPILE)objdump
-+OBJCOPY  = $(CROSS_COMPILE)objcopy
-+READELF  = $(CROSS_COMPILE)readelf
- LDFLAGS  += -Wl,--gc-sections
- 
- LK       =  -static
- LK       += -Wl,--start-group $(TARGET_CSP_LIB) $(TARGET_BSP_LIB) $(TARGET_GEN_LIB)
-LK       +=  -lgcc -lc -lg -lm -lstdc++ -lsupc++ 
-+LK       +=  -nostdlib -lgcc #-lc -lg -lm -lstdc++ -lsupc++ 
- LK       += -Wl,--end-group
- MAP      = -Xlinker -Map -Xlinker
- LDESC    = -Xlinker -T  
-@@ -47,6 +47,6 @@ ENTRY    = -e
- BIN      = -bin
- EXT      = .elf
- LEXT     = 
-ELFTOREC =arm-none-eabi-objcopy -O srec --strip-all --verbose
-ELFTOBIN =arm-none-eabi-objcopy -I elf32-littlearm -O binary --strip-all --verbose
-+ELFTOREC = $(OBJCOPY) -O srec --strip-all --verbose
-+ELFTOBIN = $(OBJCOPY) -I elf32-littlearm -O binary --strip-all --verbose
- REC      =.srec
-- 
-1.7.7.3
-
--- a/boot/lpc32xxcdl/0002-delete_redundant_files.patch
+++ b/boot/lpc32xxcdl/0002-delete_redundant_files.patch
@ -1,969 +0,0 @@
-Remove duplicated files to stop the linker from complaining about duplicate
-symbols
-
-Signed-off-by: Alexandre Belloni <abelloni@adeneo-embedded.com>
---
--- a/csps/lpc32xx/bsps/fdi3250/startup/examples/s1l/sysapi_timer.c	2011-10-05 19:10:37.000000000 +0200
-+++ /dev/null	2012-01-01 16:39:47.918907000 +0100
-@@ -1,212 +0,0 @@
-/***********************************************************************
- * $Id:: sysapi_timer.c 3394 2010-05-06 17:56:27Z usb10132             $
- *
- * Project: Time support functions
- *
- * Description:
- *     Implements the following functions required for the S1L API
- *         time_init
- *         time_reset
- *         time_start
- *         time_stop
- *         time_get
- *         time_get_rate
- *
- ***********************************************************************
- * Software that is described herein is for illustrative purposes only  
- * which provides customers with programming information regarding the  
- * products. This software is supplied "AS IS" without any warranties.  
- * NXP Semiconductors assumes no responsibility or liability for the 
- * use of the software, conveys no license or title under any patent, 
- * copyright, or mask work right to the product. NXP Semiconductors 
- * reserves the right to make changes in the software without 
- * notification. NXP Semiconductors also make no representation or 
- * warranty that such application will be suitable for the specified 
- * use without further testing or modification. 
- **********************************************************************/
-
-#include "s1l_sys_inf.h"
-#include "lpc32xx_intc_driver.h"
-#include "lpc32xx_timer_driver.h"
-
-static UNS_64 base_rate;
-static INT_32 tdev = 0;
-
-/***********************************************************************
- *
- * Function: time_init
- *
- * Purpose: Initializes time system
- *
- * Processing: Initializes the system timer.
- *
- * Parameters: None
- *
- * Outputs: None
- *
- * Returns: 0 if the init failed, otherwise non-zero
- *
- * Notes: None
- *
- **********************************************************************/
-INT_32 time_init(void)
-{
-	TMR_PSCALE_SETUP_T pscale;
-
-	/* Open timer driver */
-	if (tdev == 0)
-	{
-		tdev = timer_open((void *) TIMER_CNTR0, 0);
-		if (tdev != 0)
-		{
-			/* Use a prescale count to 100000 */
-			pscale.ps_tick_val = 100000;
-			pscale.ps_us_val = 0; /* Not needed when ps_tick_val != 0 */
-			timer_ioctl(tdev, TMR_SETUP_PSCALE, (INT_32) &pscale);
-
-			/* Get timer clock rate */
-			base_rate = (UNS_64) timer_ioctl(tdev, TMR_GET_STATUS,
-				TMR_GET_CLOCK);
-		}
-	}
-
-	return tdev;
-}
-
-/***********************************************************************
- *
- * Function: time_reset
- *
- * Purpose: Resets system timer
- *
- * Processing:
- *     See function.
- *
- * Parameters: None
- *
- * Outputs: None
- *
- * Returns: Nothing
- *
- * Notes: None
- *
- **********************************************************************/
-void time_reset(void)
-{
-	if (tdev != 0)
-	{
-		timer_ioctl(tdev, TMR_RESET, 1);
-	}
-}
-
-/***********************************************************************
- *
- * Function: time_start
- *
- * Purpose: Starts system timer
- *
- * Processing:
- *     See function.
- *
- * Parameters: None
- *
- * Outputs: None
- *
- * Returns: Nothing
- *
- * Notes: None
- *
- **********************************************************************/
-void time_start(void)
-{
-	if (tdev != 0)
-	{
-		timer_ioctl(tdev, TMR_ENABLE, 1);
-	}
-}
-
-/***********************************************************************
- *
- * Function: time_stop
- *
- * Purpose: Stops system timer
- *
- * Processing:
- *     See function.
- *
- * Parameters: None
- *
- * Outputs: None
- *
- * Returns: Nothing
- *
- * Notes: None
- *
- **********************************************************************/
-void time_stop(void)
-{
-	if (tdev != 0)
-	{
-		timer_ioctl(tdev, TMR_ENABLE, 0);
-	}
-}
-
-/***********************************************************************
- *
- * Function: time_get
- *
- * Purpose: Returns current system time value
- *
- * Processing:
- *     See function.
- *
- * Parameters: None
- *
- * Outputs: None
- *
- * Returns: The number of ticks of the timer counter
- *
- * Notes: None
- *
- **********************************************************************/
-UNS_64 time_get(void)
-{
-	TMR_COUNTS_T tcounts;
-	UNS_64 ticks = 0;
-
-	if (tdev != 0)
-	{
-		timer_ioctl(tdev, TMR_GET_COUNTS, (INT_32) &tcounts);
-
-		/* Compute number of timer ticks */
-		ticks = (UNS_64) tcounts.count_val * 100000;
-		ticks = ticks + (UNS_64) tcounts.ps_count_val;
-	}
-
-	return ticks;
-}
-
-/***********************************************************************
- *
- * Function: time_get_rate
- *
- * Purpose:
- *     Returns base tick rate (ticks per second) of the time counter
- *
- * Processing:
- *     See function.
- *
- * Parameters: None
- *
- * Outputs: None
- *
- * Returns: The timer tick rate (in ticks per second)
- *
- * Notes: None
- *
- **********************************************************************/
-UNS_64 time_get_rate(void)
-{
-	return base_rate;
-}
-
--- a/csps/lpc32xx/bsps/fdi3250/startup/examples/s1l/sys_mmu_cmd_group.c	2011-10-05 19:10:37.000000000 +0200
-+++ /dev/null	2012-01-01 16:39:47.918907000 +0100
-@@ -1,746 +0,0 @@
-/***********************************************************************
- * $Id:: sys_mmu_cmd_group.c 3430 2010-05-07 17:39:08Z usb10132        $
- *
- * Project: Command processor for peek, poke, dump, and fill
- *
- * Description:
- *     Processes commands from the command prompt
- *
- ***********************************************************************
- * Software that is described herein is for illustrative purposes only  
- * which provides customers with programming information regarding the  
- * products. This software is supplied "AS IS" without any warranties.  
- * NXP Semiconductors assumes no responsibility or liability for the 
- * use of the software, conveys no license or title under any patent, 
- * copyright, or mask work right to the product. NXP Semiconductors 
- * reserves the right to make changes in the software without 
- * notification. NXP Semiconductors also make no representation or 
- * warranty that such application will be suitable for the specified 
- * use without further testing or modification. 
- **********************************************************************/
-
-#include "lpc_arm922t_cp15_driver.h"
-#include "lpc_string.h"
-#include "startup.h"
-#include "s1l_cmds.h"
-#include "s1l_sys_inf.h"
-
-/* dcache command */
-BOOL_32 cmd_dcache(void);
-static UNS_32 cmd_dcache_plist[] =
-{
-	(PARSE_TYPE_STR), /* The "dcache" command */
-	(PARSE_TYPE_DEC | PARSE_TYPE_END)
-};
-static CMD_ROUTE_T core_dcache_cmd =
-{
-	(UNS_8 *) "dcache",
-	cmd_dcache,
-	(UNS_8 *) "Enables, disables, or flushes data cache",
-	(UNS_8 *) "dcache [0(disable), 1(enable), 2(flush)]",
-	cmd_dcache_plist,
-	NULL
-};
-
-/* icache command */
-BOOL_32 cmd_icache(void);
-static UNS_32 cmd_icache_plist[] =
-{
-	(PARSE_TYPE_STR), /* The "icache" command */
-	(PARSE_TYPE_DEC | PARSE_TYPE_END)
-};
-static CMD_ROUTE_T core_icache_cmd =
-{
-	(UNS_8 *) "icache",
-	cmd_icache,
-	(UNS_8 *) "Enables or disables instruction cache",
-	(UNS_8 *) "icache [0(disable), 1(enable)]",
-	cmd_icache_plist,
-	NULL
-};
-
-/* inval command */
-BOOL_32 cmd_inval(void);
-static UNS_32 cmd_inval_plist[] =
-{
-	(PARSE_TYPE_STR | PARSE_TYPE_END) /* The "inval" command */
-};
-static CMD_ROUTE_T core_inval_cmd =
-{
-	(UNS_8 *) "inval",
-	cmd_inval,
-	(UNS_8 *) "Flushes data cache and invalidates instruction cache",
-	(UNS_8 *) "inval",
-	cmd_inval_plist,
-	NULL
-};
-
-/* mmuenab command */
-BOOL_32 cmd_mmuenab(void);
-static UNS_32 cmd_mmuenab_plist[] =
-{
-	(PARSE_TYPE_STR), /* The "mmuenab" command */
-	(PARSE_TYPE_DEC | PARSE_TYPE_END)
-};
-static CMD_ROUTE_T core_mmuenab_cmd =
-{
-	(UNS_8 *) "mmuenab",
-	cmd_mmuenab,
-	(UNS_8 *) "Enables or disables the MMU",
-	(UNS_8 *) "mmuenab [0(disable), 1(enable)]",
-	cmd_mmuenab_plist,
-	NULL
-};
-
-/* map command */
-BOOL_32 cmd_map(void);
-static UNS_32 cmd_map_plist[] =
-{
-	(PARSE_TYPE_STR), /* The "map" command */
-	(PARSE_TYPE_HEX),
-	(PARSE_TYPE_HEX),
-	(PARSE_TYPE_DEC),
-	(PARSE_TYPE_DEC | PARSE_TYPE_END),
-};
-static CMD_ROUTE_T core_map_cmd =
-{
-	(UNS_8 *) "map",
-	cmd_map,
-	(UNS_8 *) "Maps a range of physical address sections to virtual addresses",
-	(UNS_8 *) "map [virt hex addr][phy hex addr][sections][0(uncached), 1(cached), 2(unmap)]",
-	cmd_map_plist,
-	NULL
-};
-
-/* mmuinfo command */
-static BOOL_32 cmd_mmuinfo(void);
-static UNS_32 cmd_mmuinfo_plist[] =
-{
-	(PARSE_TYPE_STR | PARSE_TYPE_END) /* The "mmuinfo" command */
-};
-static CMD_ROUTE_T core_mmuinfo_cmd =
-{
-	(UNS_8 *) "mmuinfo",
-	cmd_mmuinfo,
-	(UNS_8 *) "Dumps page table and MMU info",
-	(UNS_8 *) "mmuinfo",
-	cmd_mmuinfo_plist,
-	NULL
-};
-
-/* MMU group */
-static GROUP_LIST_T mmu_group =
-{
-	(UNS_8 *) "mmu", /* mmu group */
-	(UNS_8 *) "MMU command group",
-	NULL,
-	NULL
-};
-
-static UNS_8 enabled_msg [] =" enabled";
-static UNS_8 disabled_msg [] =" disabled";
-static UNS_8 dcache_msg[] = "Data cache";
-static UNS_8 icache_msg[] = "Instruction cache";
-static UNS_8 pagetab_msg[] = "Page table at address: ";
-static UNS_8 slist_msg[] = "Type        Virt       Phy        fl Size";
-static UNS_8 mmu_msg [] ="MMU";
-static UNS_8 cpage_msg[] = "Coarse page:";
-static UNS_8 fpage_msg[] = "Fine page  :";
-static UNS_8 sect_msg[] =  "Section    :";
-static UNS_8 mbytes_msg[] = "M";
-static UNS_8 map1_err_msg[] =
-	"Error : section addresses must be aligned on a 32-bit boundary";
-static UNS_8 map2_err_msg[] =
-	"Error : Number of sections exceeds address range of device";
-static UNS_8 phya_msg[] = "Virtual address ";
-static UNS_8 mapped_msg[] = " mapped to physical address ";
-static UNS_8 unmapped_msg[] = " unmapped from physical address ";
-static UNS_8 cached_msg[] = " (cached)";
-static UNS_8 inval_msg[] = " invalidated";
-static UNS_8 caches_msg [] ="Caches";
-static UNS_8 flushed_msg[] = " flushed";
-
-/***********************************************************************
- *
- * Function: show_section
- *
- * Purpose: Display section information
- *
- * Processing:
- *     See function.
- *
- * Parameters:
- *     mmu_reg   : MMU settings for this section
- *     virt_addr : Starting virtual address for this section
- *     segs      : Number of 1M segments for this section
- *
- * Outputs: None
- *
- * Returns: Nothing
- *
- * Notes: None
- *
- **********************************************************************/
-static void show_section(UNS_32 mmu_reg,
-						 UNS_32 virt_addr,
-						 UNS_32 segs) 
-{
-	UNS_8 straddr [16];
-	UNS_32 mmu_phy;
-
-	if ((mmu_reg & ARM922T_L1D_TYPE_PG_SN_MASK) !=
-		ARM922T_L1D_TYPE_FAULT) 
-	{
-		if ((mmu_reg & ARM922T_L1D_TYPE_PG_SN_MASK) ==
-			ARM922T_L1D_TYPE_CPAGE) 
-		{
-			term_dat_out(cpage_msg);
-		}
-		else if ((mmu_reg & ARM922T_L1D_TYPE_PG_SN_MASK) ==
-			ARM922T_L1D_TYPE_FPAGE) 
-		{
-			term_dat_out(fpage_msg);
-		}
-		else
-		{
-			term_dat_out(sect_msg);
-		}
-
-		/* Compute virtual address */
-		str_makehex(straddr, virt_addr, 8);
-		term_dat_out(straddr);
-		term_dat_out((UNS_8 *) " ");
-
-		/* Compute mapped physical address */
-		if ((mmu_reg & ARM922T_L1D_TYPE_PG_SN_MASK) ==
-		ARM922T_L1D_TYPE_SECTION) 
-		{
-			mmu_phy = mmu_reg & 0xFFF00000;
-		}
-		else 
-		{
-			/* Don't compute addresses for non-sections */
-			mmu_phy = 0;
-		}
-		str_makehex(straddr, mmu_phy, 8);
-		term_dat_out(straddr);
-		term_dat_out((UNS_8 *) " ");
-
-		/* MMU flags */
-		if ((mmu_reg & ARM922T_L1D_BUFFERABLE) != 0) 
-		{
-			term_dat_out((UNS_8 *) "b");
-		}
-		else 
-		{
-			term_dat_out((UNS_8 *) " ");
-		}
-		if ((mmu_reg & ARM922T_L1D_CACHEABLE) != 0) 
-		{
-			term_dat_out((UNS_8 *) "c");
-		}
-		else 
-		{
-			term_dat_out((UNS_8 *) " ");
-		}
-		term_dat_out((UNS_8 *) " ");
-
-		/* Displays used megabytes */
-		str_makedec(straddr, segs);
-		term_dat_out(straddr);
-		term_dat_out_crlf(mbytes_msg);
-	}
-}
-
-/***********************************************************************
- *
- * Function: mmu_dumpinfo
- *
- * Purpose: Display MMU info
- *
- * Processing:
- *     Display the MMU information, including enable status, cache
- *     status, and page table.
- *
- * Parameters: None
- *
- * Outputs: None
- *
- * Returns: TRUE if the command was processed, otherwise FALSE
- *
- * Notes: None
- *
- **********************************************************************/
-static BOOL_32 mmu_dumpinfo(void) 
-{
-	UNS_32 segsz, last_mmu_reg, mmu_vrt, mmu_reg, mmu_vrtsav = 0, *pt;
-	UNS_32 mlast_mmu_reg, mmmu_reg;
-	int idx;
-	UNS_8 hexaddr [16];
-
-	term_dat_out(mmu_msg);
-	if (cp15_mmu_enabled() == FALSE) 
-	{
-		term_dat_out_crlf(disabled_msg);
-	}
-	else 
-	{
-		term_dat_out_crlf(enabled_msg);
-
-	    /* Get MMU control register word */
-  		mmu_reg = cp15_get_mmu_control_reg();
-
-		/* Instruction cache status */
-		term_dat_out(icache_msg);
-		if ((mmu_reg & ARM922T_MMU_CONTROL_I) == 0) 
-		{
-			term_dat_out_crlf(disabled_msg);
-		}
-		else 
-		{
-			term_dat_out_crlf(enabled_msg);
-		}
-
-		/* Data cache status */
-		term_dat_out(dcache_msg);
-		if ((mmu_reg & ARM922T_MMU_CONTROL_C) == 0) 
-		{
-			term_dat_out_crlf(disabled_msg);
-		}
-		else 
-		{
-			term_dat_out_crlf(enabled_msg);
-		}
-
-		term_dat_out(pagetab_msg);
-		mmu_reg = (UNS_32) cp15_get_ttb();
-		str_makehex(hexaddr, mmu_reg, 8);
-		term_dat_out_crlf(hexaddr);
-		term_dat_out_crlf(slist_msg);
-
-		/* Process MMU table - assume that the physical and
-		   virtual locations of table are the same */
-		pt = (UNS_32 *) mmu_reg;
-		mmu_vrt = 0x0;
-		segsz = 0xFFFFFFFF;
-		last_mmu_reg = mlast_mmu_reg = 0xFFFFFFFF;
-		for (idx = 0; idx < 4096; idx++) 
-		{
-			mmu_reg = *pt;
-			mmmu_reg = (mmu_reg & (ARM922T_L1D_TYPE_PG_SN_MASK |
-				ARM922T_L1D_BUFFERABLE | ARM922T_L1D_CACHEABLE));
-			segsz = segsz + 1;
-
-			if ((last_mmu_reg != 0xFFFFFFFF) &&
-				(mlast_mmu_reg != mmmu_reg))
-			{
-				show_section(last_mmu_reg, mmu_vrtsav, segsz);
-				segsz = 0;
-			}
-
-			if (mlast_mmu_reg != mmmu_reg) 
-			{
-				mmu_vrtsav = mmu_vrt;
-				last_mmu_reg = mmu_reg;
-				mlast_mmu_reg = mmmu_reg;
-			}
-
-			pt++;
-			mmu_vrt += 0x00100000;
-		}
-	}
-
-	return TRUE;
-}
-
-/***********************************************************************
- *
- * Function: mmu_dumpmap
- *
- * Purpose: Map a virtual address range to a physical range
- *
- * Processing:
- *     From the input addresses and number of sections, generate the
- *     appropriate entries in the page table.
- *
- * Parameters: None
- *
- * Outputs: None
- *
- * Returns: TRUE if the command was processed, otherwise FALSE
- *
- * Notes: None
- *
- **********************************************************************/
-static BOOL_32 mmu_dumpmap(UNS_32 vrt,
-						   UNS_32 phy,
-						   UNS_32 sections,
-						   UNS_32 cache) 
-{
-	BOOL_32 processed = FALSE;
-	UNS_32 mmu_phy, mmu_vrt, tmp1 = 0, tmp2, *pt;
-	UNS_8 hexaddr [16];
-
-	/* Verify address boundaries are sectional */
-	mmu_vrt = vrt & ~ARM922T_L2D_SN_BASE_MASK;
-	mmu_phy = phy & ~ARM922T_L2D_SN_BASE_MASK;
-	if ((mmu_vrt != 0) || (mmu_phy != 0)) 
-	{
-		term_dat_out_crlf(map1_err_msg);
-	}
-	else 
-	{
-		/* Verify that address range and section count will not
-		   exceed address range of device */
-		tmp1 = vrt >> 20;
-		tmp1 = (tmp1 + sections) - 1;
-		tmp2 = phy >> 20;
-		tmp2 = (tmp2 + sections) - 1;
-		if ((tmp1 < 4096) && (tmp2 < 4096)) 
-		{
-			/* Good address range and good section count */
-			processed = TRUE;
-		}
-		else 
-		{
-			term_dat_out_crlf(map2_err_msg);
-		}
-	}
-	
-	/* Generate static part of MMU word */
-	if (cache == 0) 
-	{
-		/* Section mapped with cache disabled */
-		tmp1 = ARM922T_L1D_TYPE_SECTION;
-	}
-	else if (cache == 1)
-	{
-		/* Section mapped with cache enabled */
-		tmp1 = (ARM922T_L1D_BUFFERABLE | ARM922T_L1D_CACHEABLE |
-			ARM922T_L1D_TYPE_SECTION);
-	}
-	else if (cache == 2)
-	{
-		/* Section unmapped */
-		tmp1 = ARM922T_L1D_TYPE_FAULT;
-	}
-	tmp1 |= ARM922T_L1D_AP_ALL;
-
-	/* Offset into page table for virtual address */
-	tmp2 = (vrt >> 20);
-	pt = cp15_get_ttb() + tmp2;
-
-	/* Loop until all sections are complete */
-	while ((sections > 0) && (processed == TRUE)) 
-	{
-		/* Add in physical address */
-		tmp2 = tmp1 | (phy & ARM922T_L2D_SN_BASE_MASK);
-
-		/* Save new section descriptor for virtual address */
-		*pt = tmp2;
-
-		/* Output message shown the map */
-		term_dat_out(phya_msg);
-		str_makehex(hexaddr, phy, 8);
-		term_dat_out(hexaddr);
-		if (cache == 2) 
-		{
-			term_dat_out(unmapped_msg);
-		}
-		else 
-		{
-			term_dat_out(mapped_msg);
-		}
-		str_makehex(hexaddr, vrt, 8);
-		term_dat_out(hexaddr);
-		if (cache == 1) 
-		{
-			term_dat_out(cached_msg);
-		}
-		term_dat_out_crlf((UNS_8 *) "");
-
-		/* Next section and page table entry*/
-		phy += 0x00100000;
-		vrt += 0x00100000;
-		pt++;
-		sections--;
-	}
-
-	return processed;
-}
-
-/***********************************************************************
- *
- * Function: cmd_mmuinfo
- *
- * Purpose: Display MMU information
- *
- * Processing:
- *     See function. 
- *
- * Parameters: None
- *
- * Outputs: None
- *
- * Returns: TRUE if the command was processed, otherwise FALSE
- *
- * Notes: None
- *
- **********************************************************************/
-static BOOL_32 cmd_mmuinfo(void) 
-{
-	mmu_dumpinfo();
-
-	return TRUE;
-}
-
-/***********************************************************************
- *
- * Function: cmd_map
- *
- * Purpose: Map a physical address region to a virtual region
- *
- * Processing:
- *     See function. 
- *
- * Parameters: None
- *
- * Outputs: None
- *
- * Returns: TRUE if the command was processed, otherwise FALSE
- *
- * Notes: None
- *
- **********************************************************************/
-BOOL_32 cmd_map(void) 
-{
-	UNS_32 phy, virt, sects, ce = 0;
-
-	/* Get arguments */
-	virt = cmd_get_field_val(1);
-	phy = cmd_get_field_val(2);
-	sects = cmd_get_field_val(3);
-	ce = cmd_get_field_val(4);
-
-	if (ce <= 2) 
-	{
-		mmu_dumpmap(virt, phy, sects, ce);
-	}
-
-	return TRUE;
-}
-
-/***********************************************************************
- *
- * Function: cmd_inval
- *
- * Purpose: MMU cache flush and invalidate
- *
- * Processing:
- *     See function. 
- *
- * Parameters: None
- *
- * Outputs: None
- *
- * Returns: TRUE if the command was processed, otherwise FALSE
- *
- * Notes: None
- *
- **********************************************************************/
-BOOL_32 cmd_inval(void) 
-{
-	dcache_flush();
-	icache_inval();
-	term_dat_out(caches_msg);
-	term_dat_out(inval_msg);
-
-	return TRUE;
-}
-
-/***********************************************************************
- *
- * Function: cmd_dcache
- *
- * Purpose: MMU data cache enable and disable
- *
- * Processing:
- *     If the value passed in the parser is 1, enable the data cache,
- *     otherwise disable the data cache.
- *
- * Parameters: None
- *
- * Outputs: None
- *
- * Returns: TRUE if the command was processed, otherwise FALSE
- *
- * Notes: None
- *
- **********************************************************************/
-BOOL_32 cmd_dcache(void) 
-{
-	UNS_32 cenable;
-	UNS_8 *ppar;
-
-	/* Get argument */
-	cenable = cmd_get_field_val(1);
-
-	switch (cenable)
-	{
-		case 0:
-			dcache_flush();
-			cp15_set_dcache(0);
-			ppar = disabled_msg;
-			break;
-
-		case 1:
-			cp15_invalidate_cache();
-			cp15_set_dcache(1);
-			ppar = enabled_msg;
-			break;
-
-		case 2:
-		default:
-			dcache_flush();
-			ppar = flushed_msg;
-			break;
-	}
-
-	term_dat_out(dcache_msg);
-	term_dat_out_crlf(ppar);
-
-	return TRUE;
-}
-
-/***********************************************************************
- *
- * Function: cmd_icache
- *
- * Purpose: MMU instruction cache enable and disable
- *
- * Processing:
- *     If the value passed in the parser is 1, enable the instruction
- *     cache, otherwise disable the instruction cache.
- *
- * Parameters: None
- *
- * Outputs: None
- *
- * Returns: TRUE if the command was processed, otherwise FALSE
- *
- * Notes: None
- *
- **********************************************************************/
-BOOL_32 cmd_icache(void)
-{
-	UNS_32 cenable;
-	UNS_8 *ppar;
-
-	/* Get argument */
-	cenable = cmd_get_field_val(1);
-
-	if (cenable == 1) 
-	{
-		dcache_flush();
-		cp15_invalidate_cache();
-		cp15_set_icache(1);
-		ppar = enabled_msg;
-	}
-	else
-	{
-		cp15_set_icache(0);
-		ppar = disabled_msg;
-	}
-
-	term_dat_out(icache_msg);
-	term_dat_out_crlf(ppar);
-
-	return TRUE;
-}
-
-
-/***********************************************************************
- *
- * Function: cmd_mmuenab
- *
- * Purpose: Enable or disable MMU
- *
- * Processing:
- *     See function. 
- *
- * Parameters: None
- *
- * Outputs: None
- *
- * Returns: TRUE if the command was processed, otherwise FALSE
- *
- * Notes: None
- *
- **********************************************************************/
-BOOL_32 cmd_mmuenab(void) 
-{
-	UNS_8 *ppar;
-	UNS_32 cenable;
-
-	term_dat_out_crlf((UNS_8 *) "Warning: Changing MMU status on "
-		" cached and buffered code can cause system crashes.");
-
-	/* Get argument */
-	cenable = cmd_get_field_val(1);
-
-	if (cenable == 1) 
-	{
-		if ((cp15_get_mmu_control_reg() & ARM922T_MMU_CONTROL_C) != 0)
-		{
-			cp15_invalidate_cache();
-		}
-
-		cp15_set_mmu(1);
-		ppar = enabled_msg;
-	}
-	else
-	{
-		cp15_dcache_flush();
-		cp15_write_buffer_flush();
-		cp15_invalidate_cache();
-		cp15_set_mmu(0);
-		ppar = disabled_msg;
-	}
-
-	term_dat_out(mmu_msg);
-	term_dat_out_crlf(ppar);
-
-	return TRUE;
-}
-
-/***********************************************************************
- *
- * Function: mmu_cmd_group_init
- *
- * Purpose: Initialize MMU command group
- *
- * Processing:
- *     See function. 
- *
- * Parameters: None
- *
- * Outputs: None
- *
- * Returns: Nothin
- *
- * Notes: None
- *
- **********************************************************************/
-void mmu_cmd_group_init(void)
-{
-	/* Add MMU group */
-	cmd_add_group(&mmu_group);
-
-	/* Add commands to the MMU group */
-	cmd_add_new_command(&mmu_group, &core_dcache_cmd);
-	cmd_add_new_command(&mmu_group, &core_icache_cmd);
-	cmd_add_new_command(&mmu_group, &core_inval_cmd);
-	cmd_add_new_command(&mmu_group, &core_mmuenab_cmd);
-	cmd_add_new_command(&mmu_group, &core_map_cmd);
-	cmd_add_new_command(&mmu_group, &core_mmuinfo_cmd);
-}
--- a/boot/lpc32xxcdl/0003-libnosys_gnu.patch
+++ b/boot/lpc32xxcdl/0003-libnosys_gnu.patch
@ -1,188 +0,0 @@
-Fix compilation and eabi issues
-
-Since we are not linking with libc anymore, we need to define our own memset,
-strlen and memcpy. Also, as we are using a *libc compiler, we need to "handle"
-exceptions (mostly division by 0) by defining raise() and
-__aeabi_unwind_cpp_pr0.
-
-Signed-off-by: Alexandre Belloni <abelloni@adeneo-embedded.com>
---
- csps/lpc32xx/bsps/ea3250/source/libnosys_gnu.c  |   41 +++++++++++++++++++++++
- csps/lpc32xx/bsps/fdi3250/source/libnosys_gnu.c |   41 +++++++++++++++++++++++
- csps/lpc32xx/bsps/phy3250/source/libnosys_gnu.c |   41 +++++++++++++++++++++++
- 3 files changed, 123 insertions(+), 0 deletions(-)
-
-diff --git a/csps/lpc32xx/bsps/ea3250/source/libnosys_gnu.c b/csps/lpc32xx/bsps/ea3250/source/libnosys_gnu.c
-index 385b0ab..f1f0a0a 100644
--- a/csps/lpc32xx/bsps/ea3250/source/libnosys_gnu.c
-+++ b/csps/lpc32xx/bsps/ea3250/source/libnosys_gnu.c
-@@ -25,6 +25,7 @@
- #include <errno.h>
- #include <sys/times.h>
- #include <sys/stat.h>
-+#include <sys/types.h>
- 
- /* errno definition */
- #undef errno
-@@ -125,4 +126,44 @@ int _write(int file, char *ptr, int len){
-     return 0;
- }
- 
-+void * memset(void * s,int c,size_t count)
-+{
-+        char *xs = (char *) s;
-+
-+        while (count--)
-+                *xs++ = c;
-+
-+        return s;
-+}
-+
-+
-+size_t strlen(const char * s)
-+{
-+        const char *sc;
-+
-+        for (sc = s; *sc != '\0'; ++sc)
-+                /* nothing */;
-+        return sc - s;
-+}
-+
-+void * memcpy(void * dest,const void *src,size_t count)
-+{
-+        char *tmp = (char *) dest, *s = (char *) src;
-+
-+        while (count--)
-+                *tmp++ = *s++;
-+
-+        return dest;
-+}
-+
-+
-+/* Dummy functions to avoid linker complaints */
-+void __aeabi_unwind_cpp_pr0(void)
-+{
-+};
-+
-+void raise(void)
-+{
-+};
-+
- #endif /*__GNUC__*/
-diff --git a/csps/lpc32xx/bsps/fdi3250/source/libnosys_gnu.c b/csps/lpc32xx/bsps/fdi3250/source/libnosys_gnu.c
-index 385b0ab..f1f0a0a 100644
--- a/csps/lpc32xx/bsps/fdi3250/source/libnosys_gnu.c
-+++ b/csps/lpc32xx/bsps/fdi3250/source/libnosys_gnu.c
-@@ -25,6 +25,7 @@
- #include <errno.h>
- #include <sys/times.h>
- #include <sys/stat.h>
-+#include <sys/types.h>
- 
- /* errno definition */
- #undef errno
-@@ -125,4 +126,44 @@ int _write(int file, char *ptr, int len){
-     return 0;
- }
- 
-+void * memset(void * s,int c,size_t count)
-+{
-+        char *xs = (char *) s;
-+
-+        while (count--)
-+                *xs++ = c;
-+
-+        return s;
-+}
-+
-+
-+size_t strlen(const char * s)
-+{
-+        const char *sc;
-+
-+        for (sc = s; *sc != '\0'; ++sc)
-+                /* nothing */;
-+        return sc - s;
-+}
-+
-+void * memcpy(void * dest,const void *src,size_t count)
-+{
-+        char *tmp = (char *) dest, *s = (char *) src;
-+
-+        while (count--)
-+                *tmp++ = *s++;
-+
-+        return dest;
-+}
-+
-+
-+/* Dummy functions to avoid linker complaints */
-+void __aeabi_unwind_cpp_pr0(void)
-+{
-+};
-+
-+void raise(void)
-+{
-+};
-+
- #endif /*__GNUC__*/
-diff --git a/csps/lpc32xx/bsps/phy3250/source/libnosys_gnu.c b/csps/lpc32xx/bsps/phy3250/source/libnosys_gnu.c
-index cfdb674..6b50c60 100644
--- a/csps/lpc32xx/bsps/phy3250/source/libnosys_gnu.c
-+++ b/csps/lpc32xx/bsps/phy3250/source/libnosys_gnu.c
-@@ -25,6 +25,7 @@
- #include <errno.h>
- #include <sys/times.h>
- #include <sys/stat.h>
-+#include <sys/types.h>
- 
- /* errno definition */
- #undef errno
-@@ -125,4 +126,44 @@ int _write(int file, char *ptr, int len){
-     return 0;
- }
- 
-+void * memset(void * s,int c,size_t count)
-+{
-+        char *xs = (char *) s;
-+
-+        while (count--)
-+                *xs++ = c;
-+
-+        return s;
-+}
-+
-+
-+size_t strlen(const char * s)
-+{
-+        const char *sc;
-+
-+        for (sc = s; *sc != '\0'; ++sc)
-+                /* nothing */;
-+        return sc - s;
-+}
-+
-+void * memcpy(void * dest,const void *src,size_t count)
-+{
-+        char *tmp = (char *) dest, *s = (char *) src;
-+
-+        while (count--)
-+                *tmp++ = *s++;
-+
-+        return dest;
-+}
-+
-+
-+/* Dummy functions to avoid linker complaints */
-+void __aeabi_unwind_cpp_pr0(void)
-+{
-+};
-+
-+void raise(void)
-+{
-+};
-+
- #endif /*__GNUC__*/
-- 
-1.7.7.3
-
--- a/boot/lpc32xxcdl/0004-slashes.patch
+++ b/boot/lpc32xxcdl/0004-slashes.patch
@ -1,521 +0,0 @@
-Use slashes instead of backslashes
-
-Signed-off-by: Alexandre Belloni <abelloni@adeneo-embedded.com>
---
- .../bsps/common/examples/buildfiles/makefile       |   10 +++---
- .../startup/examples/burners/makefile.burner       |   16 +++++-----
- csps/lpc32xx/bsps/ea3250/source/makefile           |   10 +++---
- csps/lpc32xx/bsps/fdi3250/source/makefile          |   12 ++++----
- csps/lpc32xx/bsps/phy3250/examples/makefile        |    2 +-
- csps/lpc32xx/bsps/phy3250/source/makefile          |    2 +-
- .../examples/Burners/nor/kickstart/makefile        |    2 +-
- .../startup/examples/Burners/nor/norerase/makefile |    2 +-
- .../startup/examples/Burners/nor/s1lapp/makefile   |    2 +-
- .../examples/Burners/spi/kickstart/makefile        |    2 +-
- csps/lpc32xx/source/makefile                       |   10 +++---
- lpc/source/makefile                                |   10 +++---
- makefile                                           |    2 +-
- makerule/common/make.rules.environment             |   30 ++++++++++----------
- makerule/lpc32xx/make.lpc32xx.gnu                  |    2 +-
- makerule/lpc32xx/make.lpc32xx.iar                  |   12 ++++----
- makerule/lpc32xx/make.lpc32xx.keil                 |    6 ++--
- makerule/lpc32xx/make.lpc32xx.rvw                  |    2 +-
- 18 files changed, 67 insertions(+), 67 deletions(-)
-
-diff --git a/csps/lpc32xx/bsps/common/examples/buildfiles/makefile b/csps/lpc32xx/bsps/common/examples/buildfiles/makefile
-index cf4977c..1da2201 100644
--- a/csps/lpc32xx/bsps/common/examples/buildfiles/makefile
-+++ b/csps/lpc32xx/bsps/common/examples/buildfiles/makefile
-@@ -25,16 +25,16 @@
- #
- ########################################################################
- 
-include $(NXPMCU_SOFTWARE)\makerule\$(CSP)\make.$(CSP).$(TOOL)
-+include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL)
- 
- ########################################################################
- #
- # Pick up the assembler and C source files in the directory  
- #
- ########################################################################
-include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.ftypes
-AFLAGS +=-I..\Include
-CFLAGS +=-I..\Include
-+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.ftypes
-+AFLAGS +=-I../Include
-+CFLAGS +=-I../Include
- 
- ########################################################################
- #
-@@ -42,6 +42,6 @@ CFLAGS +=-I..\Include
- #
- ########################################################################
- 
-include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.build
-+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.build
- 
- 
-diff --git a/csps/lpc32xx/bsps/common/startup/examples/burners/makefile.burner b/csps/lpc32xx/bsps/common/startup/examples/burners/makefile.burner
-index fca3947..18bd703 100644
--- a/csps/lpc32xx/bsps/common/startup/examples/burners/makefile.burner
-+++ b/csps/lpc32xx/bsps/common/startup/examples/burners/makefile.burner
-@@ -22,9 +22,9 @@
- #
- ########################################################################
- 
-COMMON_BASE := $(NXPMCU_SOFTWARE)\csps\$(CSP)\bsps\common
-include $(NXPMCU_SOFTWARE)\makerule\$(CSP)\make.$(CSP).$(TOOL)
-include $(COMMON_BASE)\startup\examples\buildfiles\make.env
-+COMMON_BASE := $(NXPMCU_SOFTWARE)/csps/$(CSP)/bsps/common
-+include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL)
-+include $(COMMON_BASE)/startup/examples/buildfiles/make.env
- 
- ########################################################################
- # ARM Realview
-@@ -38,7 +38,7 @@ AFLAGS += --predefine "USE_ALL_STACKS SETL {TRUE}"
- #AFLAGS += --predefine "RW_RELOC SETL {TRUE}"
- 
- # This runs from IRAM
-LDSCRIPT =$(COMMON_BASE)\startup\examples\buildfiles\ldscript_iram_rvw.ld
-+LDSCRIPT =$(COMMON_BASE)/startup/examples/buildfiles/ldscript_iram_rvw.ld
- LDFLAGS = --remove
- MAP = --map --info=totals,sizes,unused --symbols --list
- endif
-@@ -55,7 +55,7 @@ AFLAGS += --predefine "USE_ALL_STACKS SETL {TRUE}"
- #AFLAGS += --predefine "RW_RELOC SETL {TRUE}"
- 
- # This runs from IRAM
-LDSCRIPT =$(COMMON_BASE)\startup\examples\buildfiles\ldscript_iram_rvw.ld
-+LDSCRIPT =$(COMMON_BASE)/startup/examples/buildfiles/ldscript_iram_rvw.ld
- LDFLAGS = --remove
- MAP = --map --info=totals,sizes,unused --symbols --list
- endif
-@@ -72,7 +72,7 @@ AFLAGS += --defsym USE_ALL_STACKS=1
- #AFLAGS += --defsym RW_RELOC=1
- 
- # This runs from IRAM
-LDSCRIPT =$(COMMON_BASE)\startup\examples\buildfiles\ldscript_iram_gnu.ld
-+LDSCRIPT =$(COMMON_BASE)/startup/examples/buildfiles/ldscript_iram_gnu.ld
- 
- endif
- 
-@@ -108,7 +108,7 @@ endif
- # Pick up the assembler and C source files in the directory  
- #
- ########################################################################
-include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.ftypes
-+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.ftypes
- 
- ########################################################################
- #
-@@ -157,6 +157,6 @@ endif
- #
- ########################################################################
- 
-include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.build
-+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.build
- 
- .PHONY: debug bin
-diff --git a/csps/lpc32xx/bsps/ea3250/source/makefile b/csps/lpc32xx/bsps/ea3250/source/makefile
-index 7cada25..2899b20 100644
--- a/csps/lpc32xx/bsps/ea3250/source/makefile
-+++ b/csps/lpc32xx/bsps/ea3250/source/makefile
-@@ -22,16 +22,16 @@
- #
- ########################################################################
- 
-include $(NXPMCU_SOFTWARE)\makerule\$(CSP)\make.$(CSP).$(TOOL)
-+include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL)
- 
- ########################################################################
- #
- # Pick up the assembler and C source files in the directory  
- #
- ########################################################################
-include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.ftypes
-AFLAGS +=-I..\Include
-CFLAGS +=-I..\Include
-+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.ftypes
-+AFLAGS +=-I../Include
-+CFLAGS +=-I../Include
- 
- ########################################################################
- #
-@@ -64,7 +64,7 @@ realclean: lib_realclean
- #
- ########################################################################
- 
-include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.build
-+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.build
- 
- .PHONY: all lib_clean lib_realclean
- 
-diff --git a/csps/lpc32xx/bsps/fdi3250/source/makefile b/csps/lpc32xx/bsps/fdi3250/source/makefile
-index 4e153bb..11e4b63 100644
--- a/csps/lpc32xx/bsps/fdi3250/source/makefile
-+++ b/csps/lpc32xx/bsps/fdi3250/source/makefile
-@@ -22,16 +22,16 @@
- #
- ########################################################################
- 
-include $(NXPMCU_SOFTWARE)\makerule\$(CSP)\make.$(CSP).$(TOOL)
-+include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL)
- 
- ########################################################################
- #
- # Pick up the assembler and C source files in the directory  
- #
- ########################################################################
-include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.ftypes
-AFLAGS +=-I..\Include
-CFLAGS +=-I..\Include
-+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.ftypes
-+AFLAGS +=-I../Include
-+CFLAGS +=-I../Include
- 
- ########################################################################
- #
-@@ -53,7 +53,7 @@ lib_clean:
- # delete all targets this Makefile can make and all built libraries
- # linked in
- lib_realclean: 
-	-@$(RM) $(BSP_LIB_DIR)\*.a
-+	-@$(RM) $(BSP_LIB_DIR)/*.a
- 	-@$(RMDIR) $(BSP_LIB_DIR)
- 	
- clean: lib_clean
-@@ -65,7 +65,7 @@ realclean: lib_realclean
- #
- ########################################################################
- 
-include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.build
-+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.build
- 
- .PHONY: all lib_clean lib_realclean
- 
-diff --git a/csps/lpc32xx/bsps/phy3250/examples/makefile b/csps/lpc32xx/bsps/phy3250/examples/makefile
-index b939252..e7feaa6 100644
--- a/csps/lpc32xx/bsps/phy3250/examples/makefile
-+++ b/csps/lpc32xx/bsps/phy3250/examples/makefile
-@@ -25,7 +25,7 @@
- #
- ########################################################################
- 
-include $(NXPMCU_SOFTWARE)\makerule\$(CSP)\make.$(CSP).$(TOOL)
-+include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL)
- 
- SUBDIRS = adc dram_self_refresh hstimer hsuart i2c kscan lcd_colorbars
- SUBDIRS += lcd_tsc mi2c mstimer pwm pwm_simple rtc sdcard sdcard_dma
-diff --git a/csps/lpc32xx/bsps/phy3250/source/makefile b/csps/lpc32xx/bsps/phy3250/source/makefile
-index 7c48e7d..750b776 100644
--- a/csps/lpc32xx/bsps/phy3250/source/makefile
-+++ b/csps/lpc32xx/bsps/phy3250/source/makefile
-@@ -32,7 +32,7 @@ include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL)
- # Pick up the assembler and C source files in the directory  
- #
- ########################################################################
-include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.ftypes
-+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.ftypes
- AFLAGS +=-I../Include
- CFLAGS +=-I../Include
- 
-diff --git a/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/kickstart/makefile b/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/kickstart/makefile
-index 01e2b38..526d6cc 100644
--- a/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/kickstart/makefile
-+++ b/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/kickstart/makefile
-@@ -78,7 +78,7 @@ endif
- 
- ########################################################################
- #
-# Compiler\linker specific stuff
-+# Compiler/linker specific stuff
- #
- ########################################################################
- 
-diff --git a/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/norerase/makefile b/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/norerase/makefile
-index ce329f5..e81b8db 100644
--- a/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/norerase/makefile
-+++ b/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/norerase/makefile
-@@ -77,7 +77,7 @@ endif
- 
- ########################################################################
- #
-# Compiler\linker specific stuff
-+# Compiler/linker specific stuff
- #
- ########################################################################
- 
-diff --git a/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/s1lapp/makefile b/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/s1lapp/makefile
-index 4426fc7..196faec 100644
--- a/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/s1lapp/makefile
-+++ b/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/nor/s1lapp/makefile
-@@ -77,7 +77,7 @@ endif
- 
- ########################################################################
- #
-# Compiler\linker specific stuff
-+# Compiler/linker specific stuff
- #
- ########################################################################
- 
-diff --git a/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/spi/kickstart/makefile b/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/spi/kickstart/makefile
-index dc73b64..39fc304 100644
--- a/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/spi/kickstart/makefile
-+++ b/csps/lpc32xx/bsps/phy3250/startup/examples/Burners/spi/kickstart/makefile
-@@ -78,7 +78,7 @@ endif
- 
- ########################################################################
- #
-# Compiler\linker specific stuff
-+# Compiler/linker specific stuff
- #
- ########################################################################
- 
-diff --git a/csps/lpc32xx/source/makefile b/csps/lpc32xx/source/makefile
-index 8e05456..16bd944 100644
--- a/csps/lpc32xx/source/makefile
-+++ b/csps/lpc32xx/source/makefile
-@@ -25,16 +25,16 @@
- #
- ########################################################################
- 
-include $(NXPMCU_SOFTWARE)\makerule\$(CSP)\make.$(CSP).$(TOOL)
-+include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL)
- 
- ########################################################################
- #
- # Pick up the assembler and C source files in the directory  
- #
- ########################################################################
-include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.ftypes
-AFLAGS +=-I..\Include
-CFLAGS +=-I..\Include
-+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.ftypes
-+AFLAGS +=-I../Include
-+CFLAGS +=-I../Include
- 
- 
- ########################################################################
-@@ -68,7 +68,7 @@ realclean: lib_realclean
- #
- ########################################################################
- 
-include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.build
-+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.build
- 
- .PHONY: all lib_clean lib_realclean
- 
-diff --git a/lpc/source/makefile b/lpc/source/makefile
-index 2860db9..ae7d612 100644
--- a/lpc/source/makefile
-+++ b/lpc/source/makefile
-@@ -25,16 +25,16 @@
- #
- ########################################################################
- 
-include $(NXPMCU_SOFTWARE)\makerule\$(CSP)\make.$(CSP).$(TOOL)
-+include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL)
- 
- ########################################################################
- #
- # Pick up the assembler and C source files in the directory  
- #
- ########################################################################
-include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.ftypes
-AFLAGS +=-I..\Include
-CFLAGS +=-I..\Include
-+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.ftypes
-+AFLAGS +=-I../Include
-+CFLAGS +=-I../Include
- 
- ########################################################################
- #
-@@ -67,7 +67,7 @@ realclean: lib_realclean
- #
- ########################################################################
- 
-include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.build
-+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.build
- 
- .PHONY: all lib_clean lib_realclean
- 
-diff --git a/makefile b/makefile
-index 8645fcc..86fa6bc 100644
--- a/makefile
-+++ b/makefile
-@@ -34,7 +34,7 @@ TARGETS_CLN	=gen_clean csp_clean bsp_clean
- #
- ########################################################################
- 
-include $(NXPMCU_SOFTWARE)\makerule\$(CSP)\make.$(CSP).$(TOOL)
-+include $(NXPMCU_SOFTWARE)/makerule/$(CSP)/make.$(CSP).$(TOOL)
- 
- ########################################################################
- #
-diff --git a/makerule/common/make.rules.environment b/makerule/common/make.rules.environment
-index d5737fe..4e6df48 100644
--- a/makerule/common/make.rules.environment
-+++ b/makerule/common/make.rules.environment
-@@ -52,7 +52,7 @@ ASTYLE          =astyle --options=$(BUILD_ROOT)/tools/astyle.cfg
- #
- ########################################################################
-   
-CSP_LIB_DIR  =$(BUILD_ROOT)\csps\$(CSP)\lib
-+CSP_LIB_DIR  =$(BUILD_ROOT)/csps/$(CSP)/lib
- 
- ########################################################################
- #
-@@ -60,7 +60,7 @@ CSP_LIB_DIR  =$(BUILD_ROOT)\csps\$(CSP)\lib
- #
- ########################################################################
- 
-BSP_LIB_DIR =$(BUILD_ROOT)\csps\$(CSP)\bsps\$(BSP)\lib
-+BSP_LIB_DIR =$(BUILD_ROOT)/csps/$(CSP)/bsps/$(BSP)/lib
- 
- ########################################################################
- #
-@@ -68,7 +68,7 @@ BSP_LIB_DIR =$(BUILD_ROOT)\csps\$(CSP)\bsps\$(BSP)\lib
- #
- ########################################################################
- 
-GEN_LIB_DIR =$(BUILD_ROOT)\$(GEN)\lib
-+GEN_LIB_DIR =$(BUILD_ROOT)/$(GEN)/lib
- 
- ########################################################################
- # 
-@@ -76,9 +76,9 @@ GEN_LIB_DIR =$(BUILD_ROOT)\$(GEN)\lib
- # 
- ########################################################################
- 
-CSP_DIR     =$(BUILD_ROOT)\csps\$(CSP)
-CSP_SRC_DIR =$(CSP_DIR)\source
-CSP_INC_DIR =$(CSP_DIR)\include
-+CSP_DIR     =$(BUILD_ROOT)/csps/$(CSP)
-+CSP_SRC_DIR =$(CSP_DIR)/source
-+CSP_INC_DIR =$(CSP_DIR)/include
- 
- ########################################################################
- # 
-@@ -86,9 +86,9 @@ CSP_INC_DIR =$(CSP_DIR)\include
- # 
- ########################################################################
- 
-BSP_DIR     =$(BUILD_ROOT)\csps\$(CSP)\bsps\$(BSP)
-BSP_SRC_DIR =$(BSP_DIR)\source
-BSP_INC_DIR =$(BSP_DIR)\include
-+BSP_DIR     =$(BUILD_ROOT)/csps/$(CSP)/bsps/$(BSP)
-+BSP_SRC_DIR =$(BSP_DIR)/source
-+BSP_INC_DIR =$(BSP_DIR)/include
- 
- ########################################################################
- # 
-@@ -96,9 +96,9 @@ BSP_INC_DIR =$(BSP_DIR)\include
- # 
- ########################################################################
- 
-GEN_DIR     =$(BUILD_ROOT)\$(GEN)
-GEN_SRC_DIR =$(GEN_DIR)\source
-GEN_INC_DIR =$(GEN_DIR)\include
-+GEN_DIR     =$(BUILD_ROOT)/$(GEN)
-+GEN_SRC_DIR =$(GEN_DIR)/source
-+GEN_INC_DIR =$(GEN_DIR)/include
- 
- ########################################################################
- #
-@@ -151,6 +151,6 @@ endif
- # 
- ########################################################################
- 
-TARGET_CSP_LIB =$(CSP_LIB_DIR)\$(CSP_ARCHIVE)
-TARGET_BSP_LIB =$(BSP_LIB_DIR)\$(BSP_ARCHIVE)
-TARGET_GEN_LIB =$(GEN_LIB_DIR)\$(GEN_ARCHIVE)
-+TARGET_CSP_LIB =$(CSP_LIB_DIR)/$(CSP_ARCHIVE)
-+TARGET_BSP_LIB =$(BSP_LIB_DIR)/$(BSP_ARCHIVE)
-+TARGET_GEN_LIB =$(GEN_LIB_DIR)/$(GEN_ARCHIVE)
-diff --git a/makerule/lpc32xx/make.lpc32xx.gnu b/makerule/lpc32xx/make.lpc32xx.gnu
-index 3277d99..d80b98d 100644
--- a/makerule/lpc32xx/make.lpc32xx.gnu
-+++ b/makerule/lpc32xx/make.lpc32xx.gnu
-@@ -19,7 +19,7 @@
- # use without further testing or modification. 
- ########################################################################
- 
-include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.environment
-+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.environment
- 
- CPU      = arm926ej-s
- CFLAGS   = -mcpu=arm926ej-s -Wall -Os
-diff --git a/makerule/lpc32xx/make.lpc32xx.iar b/makerule/lpc32xx/make.lpc32xx.iar
-index 238ebbf..27d163f 100644
--- a/makerule/lpc32xx/make.lpc32xx.iar
-+++ b/makerule/lpc32xx/make.lpc32xx.iar
-@@ -19,12 +19,12 @@
- # use without further testing or modification. 
- ########################################################################
- 
-include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.environment
-+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.environment
- 
-IARBASE   = $(IAR_ROOT)\ARM
-IARTOOLS  = $(IARBASE)\bin
-IAR_LIB   = $(IARBASE)\lib
-IAR_INC   = $(IARBASE)\inc
-+IARBASE   = $(IAR_ROOT)/ARM
-+IARTOOLS  = $(IARBASE)/bin
-+IAR_LIB   = $(IARBASE)/lib
-+IAR_INC   = $(IARBASE)/inc
- CC        = iccarm
- CCP       = iccarm
- AS        = iasmarm
-@@ -36,7 +36,7 @@ CFLAGS    += -I"$(IAR_INC)"
- AFLAGS    = --cpu 5TEJ
- LDFLAGS   = 
- LK        = "$(TARGET_GEN_LIB)" "$(TARGET_CSP_LIB)" "$(TARGET_BSP_LIB)"
-;LK        += "$(IAR_LIB)\dl4tpannl8f.r79"
-+;LK        += "$(IAR_LIB)/dl4tpannl8f.r79"
- MAP       = --map
- LDESC     = --config
- ENTRY     = --entry
-diff --git a/makerule/lpc32xx/make.lpc32xx.keil b/makerule/lpc32xx/make.lpc32xx.keil
-index dd27583..7334d3f 100644
--- a/makerule/lpc32xx/make.lpc32xx.keil
-+++ b/makerule/lpc32xx/make.lpc32xx.keil
-@@ -19,7 +19,7 @@
- # use without further testing or modification. 
- ########################################################################
- 
-include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.environment
-+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.environment
- 
- CC        =armcc
- CCP       =armcc
-@@ -27,11 +27,11 @@ AS        =armasm
- LD        =armlink
- AR        =armar -r -s
- CFLAGS    =--arm -O3 -g --device DARMP3 -D__MICROLIB 
-CFLAGS    +=-I$(KEIL_RVCT)\inc -I$(CSP_INC_DIR) -I$(BSP_INC_DIR) -I$(GEN_INC_DIR) 
-+CFLAGS    +=-I$(KEIL_RVCT)/inc -I$(CSP_INC_DIR) -I$(BSP_INC_DIR) -I$(GEN_INC_DIR) 
- AFLAGS    =--arm --device=DARMP3 
- AFLAGS    +=-I$(CSP_INC_DIR) -I$(BSP_INC_DIR) -I$(GEN_INC_DIR)
- LDFLAGS   =--noremove
-LK        =--device DARMP3 --libpath $(KEIL_RVCT)\lib --scan $(TARGET_CSP_LIB)
-+LK        =--device DARMP3 --libpath $(KEIL_RVCT)/lib --scan $(TARGET_CSP_LIB)
- LK        +=--scan $(TARGET_BSP_LIB) 
- LK        +=--scan $(TARGET_GEN_LIB)
- MAP       =--map --list
-diff --git a/makerule/lpc32xx/make.lpc32xx.rvw b/makerule/lpc32xx/make.lpc32xx.rvw
-index 59961dd..2419976 100644
--- a/makerule/lpc32xx/make.lpc32xx.rvw
-+++ b/makerule/lpc32xx/make.lpc32xx.rvw
-@@ -19,7 +19,7 @@
- # use without further testing or modification. 
- ########################################################################
- 
-include $(NXPMCU_SOFTWARE)\makerule\common\make.rules.environment
-+include $(NXPMCU_SOFTWARE)/makerule/common/make.rules.environment
- 
- CC        =armcc
- CCP       =armcpp
-- 
-1.7.7.3
-
--- a/boot/lpc32xxcdl/Config.in
+++ b/boot/lpc32xxcdl/Config.in
@ -1,10 +0,0 @@
-config BR2_TARGET_LPC32XXCDL
-	bool "LPC32XX CDL (kickstart and S1L)"
-	depends on BR2_arm926t
-
-if BR2_TARGET_LPC32XXCDL
-
-config BR2_TARGET_LPC32XXCDL_BOARDNAME
-	string "LPC32xx board name"
-
-endif #BR2_TARGET_LPC32XXCDL
--- a/boot/lpc32xxcdl/lpc32xxcdl.hash
+++ b/boot/lpc32xxcdl/lpc32xxcdl.hash
@ -1,2 +0,0 @@
-# Locally computed
-sha256  ded3fa936a96d3fb8188ca6214f57b5208bd49e5416bd69f38bfc810b34197bc  lpc32xx_cdl-v2.11.zip
--- a/boot/lpc32xxcdl/lpc32xxcdl.mk
+++ b/boot/lpc32xxcdl/lpc32xxcdl.mk
@ -1,71 +0,0 @@
-################################################################################
-#
-# lpc32xxcdl
-#
-################################################################################
-
-LPC32XXCDL_VERSION = 2.11
-LPC32XXCDL_SOURCE = lpc32xx_cdl-v$(LPC32XXCDL_VERSION).zip
-LPC32XXCDL_SITE = https://community.nxp.com/pwmxy87654/attachments/pwmxy87654/lpcware-archive/61/2
-
-LPC32XXCDL_INSTALL_TARGET = NO
-LPC32XXCDL_INSTALL_IMAGES = YES
-
-ifeq ($(BR2_TARGET_LPC32XXCDL_BOARDNAME),"ea3250")
-LPC32XXCDL_KICKSTART = kickstart/nand
-LPC32XXCDL_KICKSTART_BURNER = nand/kickstart
-LPC32XXCDL_S1L = s1l
-LPC32XXCDL_S1L_BURNER = nand/s1lapp
-endif
-
-ifeq ($(BR2_TARGET_LPC32XXCDL_BOARDNAME),"phy3250")
-LPC32XXCDL_KICKSTART = kickstart/kickstart_nand
-LPC32XXCDL_KICKSTART_BURNER = nand/kickstart
-LPC32XXCDL_S1L = s1l/s1l_nand_boot
-LPC32XXCDL_S1L_BURNER = nand/s1lapp
-endif
-
-ifeq ($(BR2_TARGET_LPC32XXCDL_BOARDNAME),"fdi3250")
-LPC32XXCDL_KICKSTART = kickstart/nand
-LPC32XXCDL_KICKSTART_BURNER = nand/kickstart_jtag
-LPC32XXCDL_S1L = s1l
-LPC32XXCDL_S1L_BURNER = nand/s1lapp_jtag
-endif
-
-LPC32XXCDL_BUILD_FLAGS = \
-	CROSS_COMPILE=$(TARGET_CROSS) \
-	NXPMCU_WINBASE=$(@D) \
-	NXPMCU_SOFTWARE=$(@D) \
-	BSP=$(BR2_TARGET_LPC32XXCDL_BOARDNAME) \
-	CSP=lpc32xx TOOL=gnu GEN=lpc
-
-LPC32XXCDL_BOARD_STARTUP_DIR = \
-	csps/lpc32xx/bsps/$(BR2_TARGET_LPC32XXCDL_BOARDNAME)/startup/examples/
-
-# Source files are with dos newlines, which our patch infrastructure doesn't
-# handle. Work around it by converting the affected files to unix newlines
-# before patching
-define LPC32XXCDL_EXTRACT_CMDS
-	unzip $(LPC32XXCDL_DL_DIR)/$(LPC32XXCDL_SOURCE) -d $(@D)
-	mv $(@D)/lpc3xxx_cdl/* $(@D)
-	rmdir $(@D)/lpc3xxx_cdl/
-	sed -n 's|^[+-]\{3\} [^/]\+\([^ \t]*\)\(.*\)|$(@D)\1|p' \
-		boot/lpc32xxcdl/*.patch| sort -u | xargs $(SED) 's/\x0D$$//'
-endef
-
-define LPC32XXCDL_BUILD_CMDS
-	$(MAKE1) $(LPC32XXCDL_BUILD_FLAGS) -C $(@D)
-	$(MAKE1) $(LPC32XXCDL_BUILD_FLAGS) -C $(@D)/$(LPC32XXCDL_BOARD_STARTUP_DIR)/Burners/$(LPC32XXCDL_KICKSTART_BURNER)
-	$(MAKE1) $(LPC32XXCDL_BUILD_FLAGS) -C $(@D)/$(LPC32XXCDL_BOARD_STARTUP_DIR)/$(LPC32XXCDL_KICKSTART)
-	$(MAKE1) $(LPC32XXCDL_BUILD_FLAGS) -C $(@D)/$(LPC32XXCDL_BOARD_STARTUP_DIR)/Burners/$(LPC32XXCDL_S1L_BURNER)
-	$(MAKE1) $(LPC32XXCDL_BUILD_FLAGS) -C $(@D)/$(LPC32XXCDL_BOARD_STARTUP_DIR)/$(LPC32XXCDL_S1L)
-endef
-
-define LPC32XXCDL_INSTALL_IMAGES_CMDS
-	cp $(@D)/$(LPC32XXCDL_BOARD_STARTUP_DIR)/Burners/$(LPC32XXCDL_KICKSTART_BURNER)/*gnu.bin $(BINARIES_DIR)
-	cp $(@D)/$(LPC32XXCDL_BOARD_STARTUP_DIR)/$(LPC32XXCDL_KICKSTART)/*gnu.bin $(BINARIES_DIR)
-	cp $(@D)/$(LPC32XXCDL_BOARD_STARTUP_DIR)/Burners/$(LPC32XXCDL_S1L_BURNER)/*gnu.bin $(BINARIES_DIR)
-	cp $(@D)/$(LPC32XXCDL_BOARD_STARTUP_DIR)/$(LPC32XXCDL_S1L)/*gnu.bin $(BINARIES_DIR)
-endef
-
-$(eval $(generic-package))
--- a/boot/mv-ddr-marvell/0001-Allow-access-to-low-addresses-with-gcc-12.patch
+++ b/boot/mv-ddr-marvell/0001-Allow-access-to-low-addresses-with-gcc-12.patch
@ -0,0 +1,49 @@
+From 4796a1eacc6a5ccb623e7d2e46a5196f8335e496 Mon Sep 17 00:00:00 2001
+From: Baruch Siach <baruch@tkos.co.il>
+Date: Fri, 11 Aug 2023 11:19:49 +0300
+Subject: [PATCH] Allow access to low addresses with gcc 12
+
+gcc 12 added a warning that triggers on access to low addresses. Add a
+compile option that allows access to lower addresses.
+
+Add the 'cc_option' macro to avoid the compile option when the compiler
+does not support it.
+
+This fixes build with TF-A. TF-A added a similar fix in commit
+dea23e245fb89.
+
+See some more details in
+https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105523
+
+Upstream: https://github.com/MarvellEmbeddedProcessors/mv-ddr-marvell/pull/42
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+ Makefile | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/Makefile b/Makefile
+index 3f0dd89a7381..045284c30cbc 100644
+--- a/Makefile
+++ b/Makefile
+@@ -108,6 +108,10 @@ MV_DDR_VER_CSRC = mv_ddr_build_message.c
+ # create mv_ddr build message and version string source file
+ $(shell $(MV_DDR_ROOT)/scripts/localversion.sh $(MV_DDR_ROOT) $(MV_DDR_VER_CSRC) 2> /dev/null)
+ 
+define cc_option
+	$(shell if $(CC) $(1) -c -x c /dev/null -o /dev/null >/dev/null 2>&1; then echo $(1); fi )
+endef
+
+ # ******************
+ # U-BOOT SPL SUPPORT
+ # ******************
+@@ -331,6 +335,7 @@ OBJ_DIR ?= $(MV_DDR_ROOT)
+ CFLAGS = -DMV_DDR_ATF -DCONFIG_DDR4
+ CFLAGS += -Wall -Werror -Os -ffreestanding -mlittle-endian -g -gdwarf-2 -nostdinc
+ CFLAGS += -march=armv8-a -fpie
+CFLAGS += $(call cc_option, --param=min-pagesize=0)
+ 
+ # PLATFORM is set in ble/ble.mk
+ ifneq ($(findstring a80x0,$(PLATFORM)),)
+-- 
+2.40.1
+
--- a/boot/mv-ddr-marvell/0002-Makefile-disable-stack-protection.patch
+++ b/boot/mv-ddr-marvell/0002-Makefile-disable-stack-protection.patch
@ -10,25 +10,24 @@ routines.
 The mv-ddr-marvell Makefile provides no way to add custom CFLAGS. Patch
 Makefile to disable stack protection.

+Upstream: not applicable; Buildroot specific
 Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
-Upstream status: not applicable; Buildroot specific
 ---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

 diff --git a/Makefile b/Makefile
-index 3f0dd89a7381..feae75cc16e4 100644
+index 045284c30cbc..9641354bcf86 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -331,6 +331,7 @@ OBJ_DIR ?= $(MV_DDR_ROOT)
- CFLAGS = -DMV_DDR_ATF -DCONFIG_DDR4
+@@ -336,6 +336,7 @@ CFLAGS = -DMV_DDR_ATF -DCONFIG_DDR4
 CFLAGS += -Wall -Werror -Os -ffreestanding -mlittle-endian -g -gdwarf-2 -nostdinc
 CFLAGS += -march=armv8-a -fpie
+ CFLAGS += $(call cc_option, --param=min-pagesize=0)
 +CFLAGS += -fno-stack-protector
 
 # PLATFORM is set in ble/ble.mk
 ifneq ($(findstring a80x0,$(PLATFORM)),)
 -- 
-2.35.1
+2.40.1

--- a/configs/andes_ae350_45_defconfig
+++ b/configs/andes_ae350_45_defconfig
@ -38,7 +38,6 @@ BR2_TARGET_UBOOT_NEEDS_OPENSBI=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot.itb"
 BR2_TARGET_UBOOT_SPL=y
-BR2_TARGET_UBOOT_CUSTOM_MAKEOPTS="ARCH_FLAGS=-march=rv64imafdc"
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_MTOOLS=y
--- a/configs/nitrogen6sx_defconfig
+++ b/configs/nitrogen6sx_defconfig
@ -17,15 +17,15 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS=y
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y

-# Linux headers same as kernel, a 5.15 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
+# Linux headers same as kernel, a 6.1 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y

 # bootloader
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
 # Latest revision of branch boundary-v2022.04
-BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/c2042594.tar.gz"
+BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/7e7eff74.tar.gz"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen6sx"
 BR2_TARGET_UBOOT_FORMAT_IMX=y
 BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
@ -36,8 +36,8 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/boundarydevices/common/bo
 # kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-# Latest revision  of branch boundary-imx_5.15.y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/42598e4b.tar.gz"
+# Latest revision  of branch boundary-imx_6.1.y
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/4470b050.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="boundary"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
--- a/configs/nitrogen6x_defconfig
+++ b/configs/nitrogen6x_defconfig
@ -16,15 +16,15 @@ BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y

-# Linux headers same as kernel, a 5.15 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
+# Linux headers same as kernel, a 6.1 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y

 # bootloader
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
 # Latest revision of branch boundary-v2022.04
-BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/c2042594.tar.gz"
+BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/7e7eff74.tar.gz"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen6q"
 BR2_TARGET_UBOOT_FORMAT_IMX=y
 BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
@ -35,8 +35,8 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/boundarydevices/common/bo
 # kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-# Latest revision  of branch boundary-imx_5.15.y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/42598e4b.tar.gz"
+# Latest revision  of branch boundary-imx_6.1.y
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/4470b050.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="boundary"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
--- a/configs/nitrogen7_defconfig
+++ b/configs/nitrogen7_defconfig
@ -16,15 +16,15 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS=y
 BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y

-# Linux headers same as kernel, a 5.15 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
+# Linux headers same as kernel, a 6.1 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y

 # bootloader
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
 # Latest revision of branch boundary-v2022.04
-BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/c2042594.tar.gz"
+BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/7e7eff74.tar.gz"
 BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen7"
 BR2_TARGET_UBOOT_FORMAT_IMX=y
 BR2_TARGET_UBOOT_NEEDS_OPENSSL=y
@ -35,8 +35,8 @@ BR2_PACKAGE_HOST_UBOOT_TOOLS_BOOT_SCRIPT_SOURCE="board/boundarydevices/common/bo
 # kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-# Latest revision  of branch boundary-imx_5.15.y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/42598e4b.tar.gz"
+# Latest revision  of branch boundary-imx_6.1.y
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/4470b050.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="boundary"
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
--- a/configs/nitrogen8m_defconfig
+++ b/configs/nitrogen8m_defconfig
@ -18,8 +18,8 @@ BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_ROOTFS_EXT2_SIZE="120M"

-# Linux headers same as kernel, a 5.15 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
+# Linux headers same as kernel, a 6.1 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y

 # DDR training binaries
 BR2_PACKAGE_FREESCALE_IMX=y
@ -29,8 +29,8 @@ BR2_PACKAGE_FIRMWARE_IMX=y
 # ARM Trusted Firmware
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y
-# Latest revision of branch boundary-lf-5.15.52-2.1.0
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/697a8319.tar.gz"
+# Latest revision of branch boundary-lf-6.1.22-2.0.0
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/7e3484cc.tar.gz"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mq"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y

@ -40,7 +40,7 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen8m"
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
 # Latest revision of branch boundary-v2022.04
-BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/c2042594.tar.gz"
+BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/7e7eff74.tar.gz"
 BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
@ -51,8 +51,8 @@ BR2_TARGET_UBOOT_SPL=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-# Latest revision  of branch boundary-imx_5.15.y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/42598e4b.tar.gz"
+# Latest revision  of branch boundary-imx_6.1.y
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/4470b050.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="boundary"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
--- a/configs/nitrogen8mm_defconfig
+++ b/configs/nitrogen8mm_defconfig
@ -18,8 +18,8 @@ BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_ROOTFS_EXT2_SIZE="120M"

-# Linux headers same as kernel, a 5.15 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
+# Linux headers same as kernel, a 6.1 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y

 # DDR training binaries
 BR2_PACKAGE_FREESCALE_IMX=y
@ -29,8 +29,8 @@ BR2_PACKAGE_FIRMWARE_IMX=y
 # ARM Trusted Firmware
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y
-# Latest revision of branch boundary-lf-5.15.52-2.1.0
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/697a8319.tar.gz"
+# Latest revision of branch boundary-lf-6.1.22-2.0.0
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/7e3484cc.tar.gz"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mm"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y

@ -40,7 +40,7 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen8mm_2g"
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
 # Latest revision of branch boundary-v2022.04
-BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/c2042594.tar.gz"
+BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/7e7eff74.tar.gz"
 BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
@ -51,8 +51,8 @@ BR2_TARGET_UBOOT_SPL=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-# Latest revision  of branch boundary-imx_5.15.y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/42598e4b.tar.gz"
+# Latest revision  of branch boundary-imx_6.1.y
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/4470b050.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="boundary"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
--- a/configs/nitrogen8mn_defconfig
+++ b/configs/nitrogen8mn_defconfig
@ -18,8 +18,8 @@ BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_ROOTFS_EXT2_SIZE="120M"

-# Linux headers same as kernel, a 5.15 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
+# Linux headers same as kernel, a 6.1 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y

 # DDR training binaries
 BR2_PACKAGE_FREESCALE_IMX=y
@ -29,8 +29,8 @@ BR2_PACKAGE_FIRMWARE_IMX=y
 # ARM Trusted Firmware
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y
-# Latest revision of branch boundary-lf-5.15.52-2.1.0
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/697a8319.tar.gz"
+# Latest revision of branch boundary-lf-6.1.22-2.0.0
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/7e3484cc.tar.gz"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mn"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y

@ -40,7 +40,7 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen8_nano_8mn1gr0"
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
 # Latest revision of branch boundary-v2022.04
-BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/c2042594.tar.gz"
+BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/7e7eff74.tar.gz"
 BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
@ -51,8 +51,8 @@ BR2_TARGET_UBOOT_SPL=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-# Latest revision  of branch boundary-imx_5.15.y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/42598e4b.tar.gz"
+# Latest revision  of branch boundary-imx_6.1.y
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/4470b050.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="boundary"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
--- a/configs/nitrogen8mp_defconfig
+++ b/configs/nitrogen8mp_defconfig
@ -18,8 +18,8 @@ BR2_TARGET_ROOTFS_EXT2=y
 BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_ROOTFS_EXT2_SIZE="120M"

-# Linux headers same as kernel, a 5.15 series
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_15=y
+# Linux headers same as kernel, a 6.1 series
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_6_1=y

 # DDR training binaries
 BR2_PACKAGE_FREESCALE_IMX=y
@ -29,8 +29,8 @@ BR2_PACKAGE_FIRMWARE_IMX=y
 # ARM Trusted Firmware
 BR2_TARGET_ARM_TRUSTED_FIRMWARE=y
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL=y
-# Latest revision of branch boundary-lf-5.15.52-2.1.0
-BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/697a8319.tar.gz"
+# Latest revision of branch boundary-lf-6.1.22-2.0.0
+BR2_TARGET_ARM_TRUSTED_FIRMWARE_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/imx-atf/archive/7e3484cc.tar.gz"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_PLATFORM="imx8mp"
 BR2_TARGET_ARM_TRUSTED_FIRMWARE_BL31=y

@ -40,7 +40,7 @@ BR2_TARGET_UBOOT_BOARD_DEFCONFIG="nitrogen8mp_2gr0"
 BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y
 BR2_TARGET_UBOOT_CUSTOM_TARBALL=y
 # Latest revision of branch boundary-v2022.04
-BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/c2042594.tar.gz"
+BR2_TARGET_UBOOT_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/u-boot/archive/7e7eff74.tar.gz"
 BR2_TARGET_UBOOT_FORMAT_CUSTOM=y
 BR2_TARGET_UBOOT_FORMAT_CUSTOM_NAME="u-boot-nodtb.bin"
 BR2_TARGET_UBOOT_NEEDS_DTC=y
@ -51,10 +51,10 @@ BR2_TARGET_UBOOT_SPL=y
 # Kernel
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
-# Latest revision  of branch boundary-imx_5.15.y
-BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/42598e4b.tar.gz"
+# Latest revision  of branch boundary-imx_6.1.y
+BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/boundarydevices/linux/archive/4470b050.tar.gz"
 BR2_LINUX_KERNEL_DEFCONFIG="boundary"
 BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_INSTALL_TARGET=y
-BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mp-nitrogen8mp freescale/imx8mp-nitrogen8mp-m4 freescale/imx8mp-nitrogen8mp-enc freescale/imx8mp-nitrogen8mp-enc-tc358743"
+BR2_LINUX_KERNEL_INTREE_DTS_NAME="freescale/imx8mp-nitrogen_smarc freescale/imx8mp-nitrogen8mp freescale/imx8mp-nitrogen8mp-m4 freescale/imx8mp-nitrogen8mp-enc freescale/imx8mp-nitrogen8mp-enc-tc358743"
 BR2_LINUX_KERNEL_NEEDS_HOST_OPENSSL=y
--- a/configs/qemu_m68k_mcf5208_defconfig
+++ b/configs/qemu_m68k_mcf5208_defconfig
@ -22,6 +22,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-mcf5208/linux.config"
+BR2_LINUX_KERNEL_PATCH="board/qemu/m68k-mcf5208/0001-m68k-Fix-invalid-.section-syntax.patch"
 BR2_LINUX_KERNEL_VMLINUX=y

 # Serial port config
--- a/configs/qemu_m68k_q800_defconfig
+++ b/configs/qemu_m68k_q800_defconfig
@ -22,6 +22,7 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.26"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/m68k-q800/linux.config"
+BR2_LINUX_KERNEL_PATCH="board/qemu/m68k-q800/0001-m68k-Fix-invalid-.section-syntax.patch"
 BR2_LINUX_KERNEL_VMLINUX=y

 # Serial port config
--- a/configs/rock5b_defconfig
+++ b/configs/rock5b_defconfig
@ -5,6 +5,7 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/radxa/rock5b/post-image.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS=""
 BR2_TARGET_GENERIC_HOSTNAME="rock5b"
 BR2_TARGET_GENERIC_ISSUE="Welcome to the rock5b board"
+BR2_GLOBAL_PATCH_DIR="board/radxa/rock5b/patches"
 BR2_SYSTEM_DHCP="eth0"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_GIT=y
--- a/docs/website/download.html
+++ b/docs/website/download.html
@ -76,37 +76,37 @@
 	</div>
      </div>

-      <h3 style="text-align: center;">Latest release candidate: <b>2023.08-rc1</b></h3>
+      <h3 style="text-align: center;">Latest release candidate: <b>2023.08-rc2</b></h3>
      <div class="row mt centered">
 	<div class="col-sm-6">
 	  <div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
 	    <div class="flipper">
 	      <div class="front">
-		<a href="/downloads/buildroot-2023.08-rc1.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
+		<a href="/downloads/buildroot-2023.08-rc2.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
 	      </div>
 	      <div class="back">
-		<a href="/downloads/buildroot-2023.08-rc1.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
+		<a href="/downloads/buildroot-2023.08-rc2.tar.gz"><img src="images/zip.png" width="180" alt=""></a>
 	      </div>
 	    </div>
 	  </div>

-	  <h3><a href="/downloads/buildroot-2023.08-rc1.tar.gz">buildroot-2023.08-rc1.tar.gz</a></h3>
-	  <p><a href="/downloads/buildroot-2023.08-rc1.tar.gz.sign">PGP signature</a></p>
+	  <h3><a href="/downloads/buildroot-2023.08-rc2.tar.gz">buildroot-2023.08-rc2.tar.gz</a></h3>
+	  <p><a href="/downloads/buildroot-2023.08-rc2.tar.gz.sign">PGP signature</a></p>
 	</div>
 	<div class="col-sm-6">
 	  <div class="flip-container center-block" ontouchstart="this.classList.toggle('hover');">
 	    <div class="flipper">
 	      <div class="front">
-		<a href="/downloads/buildroot-2023.08-rc1.tar.xz"><img src="images/package.png" width="180" alt=""></a>
+		<a href="/downloads/buildroot-2023.08-rc2.tar.xz"><img src="images/package.png" width="180" alt=""></a>
 	      </div>
 	      <div class="back">
-		<a href="/downloads/buildroot-2023.08-rc1.tar.xz"><img src="images/package.png" width="180" alt=""></a>
+		<a href="/downloads/buildroot-2023.08-rc2.tar.xz"><img src="images/package.png" width="180" alt=""></a>
 	      </div>
 	    </div>
 	  </div>

-	  <h3><a href="/downloads/buildroot-2023.08-rc1.tar.xz">buildroot-2023.08-rc1.tar.xz</a></h3>
-	  <p><a href="/downloads/buildroot-2023.08-rc1.tar.xz.sign">PGP signature</a></p>
+	  <h3><a href="/downloads/buildroot-2023.08-rc2.tar.xz">buildroot-2023.08-rc2.tar.xz</a></h3>
+	  <p><a href="/downloads/buildroot-2023.08-rc2.tar.xz.sign">PGP signature</a></p>
 	</div>
      </div>

--- a/docs/website/news.html
+++ b/docs/website/news.html
@ -9,6 +9,27 @@
 <h2>News</h2>
 <ul class="timeline">

+  <li>
+    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
+    <div class="timeline-panel">
+      <div class="timeline-heading">
+	<h4 class="timeline-title">2023.08-rc2 released</h4>
+	<p><small class="text-muted"><i class="glyphicon glyphicon-time"></i>20 August 2023</small></p>
+      </div>
+      <div class="timeline-body">
+        <p>2023.08-rc2 has been released with more cleanups and build fixes. See the
+	  <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2023.08-rc2">CHANGES</a>
+	  file for details.</p>
+
+	<p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+	  <a href="/downloads/buildroot-2023.08-rc2.tar.xz">2023.08-rc2
+	  release candidate</a>, and report any problems found to the
+	  <a href="support.html">mailing list</a> or
+	  <a href="https://bugs.buildroot.org">bug tracker</a>.</p>
+      </div>
+    </div>
+  </li>
+
  <li class="timeline-inverted">
    <div class="timeline-badge"><i class="glyphicon glyphicon-thumbs-up"></i></div>
    <div class="timeline-panel">
--- a/linux/Config.in
+++ b/linux/Config.in
@ -128,7 +128,7 @@ endif

 config BR2_LINUX_KERNEL_VERSION
 	string
-	default "6.4.7" if BR2_LINUX_KERNEL_LATEST_VERSION
+	default "6.4.9" if BR2_LINUX_KERNEL_LATEST_VERSION
 	default "5.10.162-cip24" if BR2_LINUX_KERNEL_LATEST_CIP_VERSION
 	default "5.10.162-cip24-rt10" if BR2_LINUX_KERNEL_LATEST_CIP_RT_VERSION
 	default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE \
--- a/linux/linux.hash
+++ b/linux/linux.hash
@ -1,13 +1,13 @@
 # From https://www.kernel.org/pub/linux/kernel/v6.x/sha256sums.asc
-sha256  de143cb61dcaa756c05f56ff35144316d810615819518a33e34754f064c4a7d8  linux-6.4.7.tar.xz
-sha256  aaf8261b551c8b76b81eab8780b446e88cea4d551ae517ac3a9b2dbdbd381ed3  linux-6.1.42.tar.xz
+sha256  b8b8a29852b999f337c4e93eff6c91fb7fd2d49a6614cbcbeb6fa171ba55cc9f  linux-6.4.9.tar.xz
+sha256  2e51d41fe11d082ae167cee05772bb07ca7f19448d2b46772d8ca2db7673a1a5  linux-6.1.44.tar.xz
 # From https://www.kernel.org/pub/linux/kernel/v5.x/sha256sums.asc
-sha256  2de69544a12e6a059163c58fc901c13bcf22e8cac39c66b56f8fbb633399bf93  linux-5.15.123.tar.xz
-sha256  c9558bab35e23ae67661bfb3192c609c857f78582a035449ae63e33d04ab6112  linux-5.10.188.tar.xz
-sha256  bcb4953ed68131ef17f9f1ba52cac8b9d70007f5ab600bf3dee1fbf8beb218ca  linux-5.4.251.tar.xz
+sha256  150f3846b76cd23a6135f49cef71372bade5a06e851cb4f8558df8b862d8fec7  linux-5.15.125.tar.xz
+sha256  4c03516ae1d417571faaef175932d0892710bcbe0173e40550014d043d9098c9  linux-5.10.189.tar.xz
+sha256  3a78587523940374a7319089b63357c7dc412b90f5879d512265e59173588267  linux-5.4.252.tar.xz
 # From https://www.kernel.org/pub/linux/kernel/v4.x/sha256sums.asc
-sha256  118f7411793868db8dcb043cdc82e9ac6f722fbec8dcdde30b07889d941aa3b3  linux-4.19.289.tar.xz
-sha256  ed82679c0c6e600db80050d09e2294fb28b61cf27dc98657296c7eb5250a7625  linux-4.14.320.tar.xz
+sha256  9fa5e24b7d791583f8cd001bcf02b52f569f261e276dc1dab2552974dca20ecf  linux-4.19.290.tar.xz
+sha256  d0e32bd47a547cc20e0ce09ff45514282742edb2af38df5dc0a03f22d4321715  linux-4.14.321.tar.xz
 # Locally computed
 sha256  fb0edc3c18e47d2b6974cb0880a0afb5c3fa08f50ee87dfdf24349405ea5f8ae  linux-cip-5.10.162-cip24.tar.gz
 sha256  b5539243f187e3d478d76d44ae13aab83952c94b885ad889df6fa9997e16a441  linux-cip-5.10.162-cip24-rt10.tar.gz
--- a/package/aubio/aubio.mk
+++ b/package/aubio/aubio.mk
@ -9,6 +9,7 @@ AUBIO_SITE = https://aubio.org/pub
 AUBIO_SOURCE = aubio-$(AUBIO_VERSION).tar.bz2
 AUBIO_LICENSE = GPL-3.0+
 AUBIO_LICENSE_FILES = COPYING
+AUBIO_CPE_ID_VENDOR = aubio
 AUBIO_INSTALL_STAGING = YES

 AUBIO_DEPENDENCIES = host-pkgconf
--- a/package/berkeleydb/Config.in
+++ b/package/berkeleydb/Config.in
@ -13,6 +13,11 @@ config BR2_PACKAGE_BERKELEYDB_COMPAT185
 	help
 	  Build and install DB 1.85 compatibility API.

+config BR2_PACKAGE_BERKELEYDB_DBM
+	bool "historic dbm interface"
+	help
+	  Enable the historic dbm interface.
+
 config BR2_PACKAGE_BERKELEYDB_TOOLS
 	bool "install tools"
 	help
--- a/package/berkeleydb/berkeleydb.mk
+++ b/package/berkeleydb/berkeleydb.mk
@ -39,6 +39,7 @@ define BERKELEYDB_CONFIGURE_CMDS
 		--disable-java \
 		--disable-tcl \
 		$(if $(BR2_PACKAGE_BERKELEYDB_COMPAT185),--enable-compat185,--disable-compat185) \
+		$(if $(BR2_PACKAGE_BERKELEYDB_DBM),--enable-dbm,--disable-dbm) \
 		$(SHARED_STATIC_LIBS_OPTS) \
 		--with-pic \
 		--enable-o_direct \
--- a/package/bwm-ng/bwm-ng.mk
+++ b/package/bwm-ng/bwm-ng.mk
@ -9,6 +9,7 @@ BWM_NG_SITE = $(call github,vgropp,bwm-ng,v$(BWM_NG_VERSION))
 BWM_NG_CONF_OPTS = --with-procnetdev --with-diskstats
 BWM_NG_LICENSE = GPL-2.0+
 BWM_NG_LICENSE_FILES = COPYING
+BWM_NG_CPE_ID_VENDOR = bwm-ng_project
 BWM_NG_AUTORECONF = YES

 ifeq ($(BR2_PACKAGE_NCURSES),y)
--- a/package/ccache/0001-fix-Work-around-GCC-12.3-bug-109241.patch
+++ b/package/ccache/0001-fix-Work-around-GCC-12.3-bug-109241.patch
@ -0,0 +1,29 @@
+From 689168c292f1ed26c5f4a3070aeb649dad7facb5 Mon Sep 17 00:00:00 2001
+From: Joel Rosdahl <joel@rosdahl.net>
+Date: Tue, 1 Aug 2023 12:30:12 +0200
+Subject: [PATCH] fix: Work around GCC 12.3 bug 109241
+
+See also #1289.
+
+Upstream: https://github.com/ccache/ccache/commit/689168c292f1ed26c5f4a3070aeb649dad7facb5
+
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+---
+ src/storage/local/LocalStorage.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/src/storage/local/LocalStorage.cpp b/src/storage/local/LocalStorage.cpp
+index 3e5abe5074..d0a904e553 100644
+--- a/src/storage/local/LocalStorage.cpp
+++ b/src/storage/local/LocalStorage.cpp
+@@ -854,7 +854,9 @@ LocalStorage::recompress(const std::optional<int8_t> level,
+           auto l2_content_lock = get_level_2_content_lock(l1_index, l2_index);
+           l2_content_lock.make_long_lived(lock_manager);
+           if (!l2_content_lock.acquire()) {
+-            LOG("Failed to acquire content lock for {}/{}", l1_index, l2_index);
+            // LOG_RAW+fmt::format instead of LOG due to GCC 12.3 bug #109241
+            LOG_RAW(fmt::format(
+              "Failed to acquire content lock for {}/{}", l1_index, l2_index));
+             return;
+           }
+ 
--- a/package/check/check.hash
+++ b/package/check/check.hash
@ -1,4 +1,4 @@
 # Locally computed
-sha256  a8de4e0bacfb4d76dd1c618ded263523b53b85d92a146d8835eb1a52932fa20a  check-0.15.2.tar.gz
+sha256  998d355294bb94072f40584272cf4424571c396c631620ce463f6ea97aa67d2e  check-0.15.2.tar.gz
 # License files, locally calculated
 sha256  a9bdde5616ecdd1e980b44f360600ee8783b1f99b8cc83a2beb163a0a390e861  COPYING.LESSER
--- a/package/check/check.mk
+++ b/package/check/check.mk
@ -5,7 +5,7 @@
 ################################################################################

 CHECK_VERSION = 0.15.2
-CHECK_SITE = https://github.com/libcheck/check/releases/download/$(CHECK_VERSION)
+CHECK_SITE = $(call github,libcheck,check,$(CHECK_VERSION))
 CHECK_INSTALL_STAGING = YES
 CHECK_DEPENDENCIES = host-pkgconf
 CHECK_LICENSE = LGPL-2.1+
--- a/package/chocolate-doom/chocolate-doom.mk
+++ b/package/chocolate-doom/chocolate-doom.mk
@ -8,6 +8,8 @@ CHOCOLATE_DOOM_VERSION = 3.0.1
 CHOCOLATE_DOOM_SITE = http://www.chocolate-doom.org/downloads/$(CHOCOLATE_DOOM_VERSION)
 CHOCOLATE_DOOM_LICENSE = GPL-2.0+
 CHOCOLATE_DOOM_LICENSE_FILES = COPYING
+CHOCOLATE_DOOM_CPE_ID_VENDOR = chocolate-doom
+CHOCOLATE_DOOM_CPE_ID_PRODUCT = chocolate_doom
 CHOCOLATE_DOOM_DEPENDENCIES = host-pkgconf sdl2 sdl2_mixer sdl2_net

 # Avoid installing desktop entries, icons, etc.
--- a/package/composer/composer.mk
+++ b/package/composer/composer.mk
@ -13,8 +13,10 @@ BASE_SITE = https://getcomposer.org/download/$(COMPOSER_VERSION)/composer.phar
 COMPOSER_SITE = $(BASE_SITE)?n=f/$(COMPOSER_SOURCE)
 COMPOSER_LICENSE = MIT
 COMPOSER_LICENSE_FILES = LICENSE
+COMPOSER_CPE_ID_VENDOR = getcomposer

 HOST_COMPOSER_DEPENDENCIES = host-php
+HOST_COMPOSER_EXTRACT_DEPENDENCIES = host-php

 define HOST_COMPOSER_EXTRACT_CMDS
 	cp $(HOST_COMPOSER_DL_DIR)/$(COMPOSER_SOURCE) $(@D)
--- a/package/conmon/0001-remove-unused-dlfcn.h-header-file.patch
+++ b/package/conmon/0001-remove-unused-dlfcn.h-header-file.patch
@ -0,0 +1,26 @@
+From e28634a0e847a14c58482f962bc9b1d69937387f Mon Sep 17 00:00:00 2001
+From: Waldemar Brodkorb <wbx@openadk.org>
+Date: Sat, 12 Aug 2023 12:53:37 +0200
+Subject: [PATCH] remove unused dlfcn.h header file
+
+Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
+Upstream: https://github.com/containers/conmon/issues/443
+---
+ src/seccomp_notify.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/seccomp_notify.c b/src/seccomp_notify.c
+index 8d34d9d..2a8371d 100644
+--- a/src/seccomp_notify.c
+++ b/src/seccomp_notify.c
+@@ -7,7 +7,6 @@
+ 
+ #include <errno.h>
+ #include <sys/ioctl.h>
+-#include <dlfcn.h>
+ #include <sys/wait.h>
+ #include <sys/mount.h>
+ #include <signal.h>
+-- 
+2.39.2
+
--- a/package/connman/0001-gweb-Fix-OOB-write-in-received_data.patch
+++ b/package/connman/0001-gweb-Fix-OOB-write-in-received_data.patch
@ -1,36 +0,0 @@
-From d1a5ede5d255bde8ef707f8441b997563b9312bd Mon Sep 17 00:00:00 2001
-From: Nathan Crandall <ncrandall@tesla.com>
-Date: Tue, 12 Jul 2022 08:56:34 +0200
-Subject: gweb: Fix OOB write in received_data()
-
-There is a mismatch of handling binary vs. C-string data with memchr
-and strlen, resulting in pos, count, and bytes_read to become out of
-sync and result in a heap overflow.  Instead, do not treat the buffer
-as an ASCII C-string. We calculate the count based on the return value
-of memchr, instead of strlen.
-
-Fixes: CVE-2022-32292
-
-[Retrieved from:
-https://git.kernel.org/pub/scm/network/connman/connman.git/commit/?id=d1a5ede5d255bde8ef707f8441b997563b9312bd]
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
- gweb/gweb.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/gweb/gweb.c b/gweb/gweb.c
-index 12fcb1d8..13c6c5f2 100644
--- a/gweb/gweb.c
-+++ b/gweb/gweb.c
-@@ -918,7 +918,7 @@ static gboolean received_data(GIOChannel *channel, GIOCondition cond,
- 		}
- 
- 		*pos = '\0';
-		count = strlen((char *) ptr);
-+		count = pos - ptr;
- 		if (count > 0 && ptr[count - 1] == '\r') {
- 			ptr[--count] = '\0';
- 			bytes_read--;
-- 
-cgit 
-
--- a/package/connman/0002-wispr-Add-reference-counter-to-portal-context.patch
+++ b/package/connman/0002-wispr-Add-reference-counter-to-portal-context.patch
@ -1,142 +0,0 @@
-From 72343929836de80727a27d6744c869dff045757c Mon Sep 17 00:00:00 2001
-From: Daniel Wagner <wagi@monom.org>
-Date: Tue, 5 Jul 2022 08:32:12 +0200
-Subject: wispr: Add reference counter to portal context
-
-Track the connman_wispr_portal_context live time via a
-refcounter. This only adds the infrastructure to do proper reference
-counting.
-
-Fixes: CVE-2022-32293
-
-[Retrieved from:
-https://git.kernel.org/pub/scm/network/connman/connman.git/commit/?id=72343929836de80727a27d6744c869dff045757c]
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
- src/wispr.c | 52 ++++++++++++++++++++++++++++++++++++++++++----------
- 1 file changed, 42 insertions(+), 10 deletions(-)
-
-diff --git a/src/wispr.c b/src/wispr.c
-index a07896ca..bde7e63b 100644
--- a/src/wispr.c
-+++ b/src/wispr.c
-@@ -56,6 +56,7 @@ struct wispr_route {
- };
- 
- struct connman_wispr_portal_context {
-+	int refcount;
- 	struct connman_service *service;
- 	enum connman_ipconfig_type type;
- 	struct connman_wispr_portal *wispr_portal;
-@@ -97,6 +98,11 @@ static char *online_check_ipv4_url = NULL;
- static char *online_check_ipv6_url = NULL;
- static bool enable_online_to_ready_transition = false;
- 
-+#define wispr_portal_context_ref(wp_context) \
-+	wispr_portal_context_ref_debug(wp_context, __FILE__, __LINE__, __func__)
-+#define wispr_portal_context_unref(wp_context) \
-+	wispr_portal_context_unref_debug(wp_context, __FILE__, __LINE__, __func__)
-+
- static void connman_wispr_message_init(struct connman_wispr_message *msg)
- {
- 	DBG("");
-@@ -162,9 +168,6 @@ static void free_connman_wispr_portal_context(
- {
- 	DBG("context %p", wp_context);
- 
-	if (!wp_context)
-		return;
-
- 	if (wp_context->wispr_portal) {
- 		if (wp_context->wispr_portal->ipv4_context == wp_context)
- 			wp_context->wispr_portal->ipv4_context = NULL;
-@@ -201,9 +204,38 @@ static void free_connman_wispr_portal_context(
- 	g_free(wp_context);
- }
- 
-+static struct connman_wispr_portal_context *
-+wispr_portal_context_ref_debug(struct connman_wispr_portal_context *wp_context,
-+			const char *file, int line, const char *caller)
-+{
-+	DBG("%p ref %d by %s:%d:%s()", wp_context,
-+		wp_context->refcount + 1, file, line, caller);
-+
-+	__sync_fetch_and_add(&wp_context->refcount, 1);
-+
-+	return wp_context;
-+}
-+
-+static void wispr_portal_context_unref_debug(
-+		struct connman_wispr_portal_context *wp_context,
-+		const char *file, int line, const char *caller)
-+{
-+	if (!wp_context)
-+		return;
-+
-+	DBG("%p ref %d by %s:%d:%s()", wp_context,
-+		wp_context->refcount - 1, file, line, caller);
-+
-+	if (__sync_fetch_and_sub(&wp_context->refcount, 1) != 1)
-+		return;
-+
-+	free_connman_wispr_portal_context(wp_context);
-+}
-+
- static struct connman_wispr_portal_context *create_wispr_portal_context(void)
- {
-	return g_try_new0(struct connman_wispr_portal_context, 1);
-+	return wispr_portal_context_ref(
-+		g_new0(struct connman_wispr_portal_context, 1));
- }
- 
- static void free_connman_wispr_portal(gpointer data)
-@@ -215,8 +247,8 @@ static void free_connman_wispr_portal(gpointer data)
- 	if (!wispr_portal)
- 		return;
- 
-	free_connman_wispr_portal_context(wispr_portal->ipv4_context);
-	free_connman_wispr_portal_context(wispr_portal->ipv6_context);
-+	wispr_portal_context_unref(wispr_portal->ipv4_context);
-+	wispr_portal_context_unref(wispr_portal->ipv6_context);
- 
- 	g_free(wispr_portal);
- }
-@@ -452,7 +484,7 @@ static void portal_manage_status(GWebResult *result,
- 		connman_info("Client-Timezone: %s", str);
- 
- 	if (!enable_online_to_ready_transition)
-		free_connman_wispr_portal_context(wp_context);
-+		wispr_portal_context_unref(wp_context);
- 
- 	__connman_service_ipconfig_indicate_state(service,
- 					CONNMAN_SERVICE_STATE_ONLINE, type);
-@@ -616,7 +648,7 @@ static void wispr_portal_request_wispr_login(struct connman_service *service,
- 				return;
- 		}
- 
-		free_connman_wispr_portal_context(wp_context);
-+		wispr_portal_context_unref(wp_context);
- 		return;
- 	}
- 
-@@ -952,7 +984,7 @@ static int wispr_portal_detect(struct connman_wispr_portal_context *wp_context)
- 
- 		if (wp_context->token == 0) {
- 			err = -EINVAL;
-			free_connman_wispr_portal_context(wp_context);
-+			wispr_portal_context_unref(wp_context);
- 		}
- 	} else if (wp_context->timeout == 0) {
- 		wp_context->timeout = g_idle_add(no_proxy_callback, wp_context);
-@@ -1001,7 +1033,7 @@ int __connman_wispr_start(struct connman_service *service,
- 
- 	/* If there is already an existing context, we wipe it */
- 	if (wp_context)
-		free_connman_wispr_portal_context(wp_context);
-+		wispr_portal_context_unref(wp_context);
- 
- 	wp_context = create_wispr_portal_context();
- 	if (!wp_context)
-- 
-cgit 
-
--- a/package/connman/0003-wispr-Update-portal-context-references.patch
+++ b/package/connman/0003-wispr-Update-portal-context-references.patch
@ -1,175 +0,0 @@
-From 416bfaff988882c553c672e5bfc2d4f648d29e8a Mon Sep 17 00:00:00 2001
-From: Daniel Wagner <wagi@monom.org>
-Date: Tue, 5 Jul 2022 09:11:09 +0200
-Subject: wispr: Update portal context references
-
-Maintain proper portal context references to avoid UAF.
-
-Fixes: CVE-2022-32293
-
-[Retrieved from:
-https://git.kernel.org/pub/scm/network/connman/connman.git/commit/?id=416bfaff988882c553c672e5bfc2d4f648d29e8a]
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
- src/wispr.c | 34 ++++++++++++++++++++++------------
- 1 file changed, 22 insertions(+), 12 deletions(-)
-
-diff --git a/src/wispr.c b/src/wispr.c
-index bde7e63b..84bed33f 100644
--- a/src/wispr.c
-+++ b/src/wispr.c
-@@ -105,8 +105,6 @@ static bool enable_online_to_ready_transition = false;
- 
- static void connman_wispr_message_init(struct connman_wispr_message *msg)
- {
-	DBG("");
-
- 	msg->has_error = false;
- 	msg->current_element = NULL;
- 
-@@ -166,8 +164,6 @@ static void free_wispr_routes(struct connman_wispr_portal_context *wp_context)
- static void free_connman_wispr_portal_context(
- 		struct connman_wispr_portal_context *wp_context)
- {
-	DBG("context %p", wp_context);
-
- 	if (wp_context->wispr_portal) {
- 		if (wp_context->wispr_portal->ipv4_context == wp_context)
- 			wp_context->wispr_portal->ipv4_context = NULL;
-@@ -483,9 +479,6 @@ static void portal_manage_status(GWebResult *result,
- 				&str))
- 		connman_info("Client-Timezone: %s", str);
- 
-	if (!enable_online_to_ready_transition)
-		wispr_portal_context_unref(wp_context);
-
- 	__connman_service_ipconfig_indicate_state(service,
- 					CONNMAN_SERVICE_STATE_ONLINE, type);
- 
-@@ -546,14 +539,17 @@ static void wispr_portal_request_portal(
- {
- 	DBG("");
- 
-+	wispr_portal_context_ref(wp_context);
- 	wp_context->request_id = g_web_request_get(wp_context->web,
- 					wp_context->status_url,
- 					wispr_portal_web_result,
- 					wispr_route_request,
- 					wp_context);
- 
-	if (wp_context->request_id == 0)
-+	if (wp_context->request_id == 0) {
- 		wispr_portal_error(wp_context);
-+		wispr_portal_context_unref(wp_context);
-+	}
- }
- 
- static bool wispr_input(const guint8 **data, gsize *length,
-@@ -618,13 +614,15 @@ static void wispr_portal_browser_reply_cb(struct connman_service *service,
- 		return;
- 
- 	if (!authentication_done) {
-		wispr_portal_error(wp_context);
- 		free_wispr_routes(wp_context);
-+		wispr_portal_error(wp_context);
-+		wispr_portal_context_unref(wp_context);
- 		return;
- 	}
- 
- 	/* Restarting the test */
- 	__connman_service_wispr_start(service, wp_context->type);
-+	wispr_portal_context_unref(wp_context);
- }
- 
- static void wispr_portal_request_wispr_login(struct connman_service *service,
-@@ -700,11 +698,13 @@ static bool wispr_manage_message(GWebResult *result,
- 
- 		wp_context->wispr_result = CONNMAN_WISPR_RESULT_LOGIN;
- 
-+		wispr_portal_context_ref(wp_context);
- 		if (__connman_agent_request_login_input(wp_context->service,
- 					wispr_portal_request_wispr_login,
-					wp_context) != -EINPROGRESS)
-+					wp_context) != -EINPROGRESS) {
- 			wispr_portal_error(wp_context);
-		else
-+			wispr_portal_context_unref(wp_context);
-+		} else
- 			return true;
- 
- 		break;
-@@ -753,6 +753,7 @@ static bool wispr_portal_web_result(GWebResult *result, gpointer user_data)
- 		if (length > 0) {
- 			g_web_parser_feed_data(wp_context->wispr_parser,
- 								chunk, length);
-+			wispr_portal_context_unref(wp_context);
- 			return true;
- 		}
- 
-@@ -770,6 +771,7 @@ static bool wispr_portal_web_result(GWebResult *result, gpointer user_data)
- 
- 	switch (status) {
- 	case 000:
-+		wispr_portal_context_ref(wp_context);
- 		__connman_agent_request_browser(wp_context->service,
- 				wispr_portal_browser_reply_cb,
- 				wp_context->status_url, wp_context);
-@@ -781,11 +783,14 @@ static bool wispr_portal_web_result(GWebResult *result, gpointer user_data)
- 		if (g_web_result_get_header(result, "X-ConnMan-Status",
- 						&str)) {
- 			portal_manage_status(result, wp_context);
-+			wispr_portal_context_unref(wp_context);
- 			return false;
-		} else
-+		} else {
-+			wispr_portal_context_ref(wp_context);
- 			__connman_agent_request_browser(wp_context->service,
- 					wispr_portal_browser_reply_cb,
- 					wp_context->redirect_url, wp_context);
-+		}
- 
- 		break;
- 	case 300:
-@@ -798,6 +803,7 @@ static bool wispr_portal_web_result(GWebResult *result, gpointer user_data)
- 			!g_web_result_get_header(result, "Location",
- 							&redirect)) {
- 
-+			wispr_portal_context_ref(wp_context);
- 			__connman_agent_request_browser(wp_context->service,
- 					wispr_portal_browser_reply_cb,
- 					wp_context->status_url, wp_context);
-@@ -808,6 +814,7 @@ static bool wispr_portal_web_result(GWebResult *result, gpointer user_data)
- 
- 		wp_context->redirect_url = g_strdup(redirect);
- 
-+		wispr_portal_context_ref(wp_context);
- 		wp_context->request_id = g_web_request_get(wp_context->web,
- 				redirect, wispr_portal_web_result,
- 				wispr_route_request, wp_context);
-@@ -820,6 +827,7 @@ static bool wispr_portal_web_result(GWebResult *result, gpointer user_data)
- 
- 		break;
- 	case 505:
-+		wispr_portal_context_ref(wp_context);
- 		__connman_agent_request_browser(wp_context->service,
- 				wispr_portal_browser_reply_cb,
- 				wp_context->status_url, wp_context);
-@@ -832,6 +840,7 @@ static bool wispr_portal_web_result(GWebResult *result, gpointer user_data)
- 	wp_context->request_id = 0;
- done:
- 	wp_context->wispr_msg.message_type = -1;
-+	wispr_portal_context_unref(wp_context);
- 	return false;
- }
- 
-@@ -890,6 +899,7 @@ static void proxy_callback(const char *proxy, void *user_data)
- 					xml_wispr_parser_callback, wp_context);
- 
- 	wispr_portal_request_portal(wp_context);
-+	wispr_portal_context_unref(wp_context);
- }
- 
- static gboolean no_proxy_callback(gpointer user_data)
-- 
-cgit 
-
--- a/package/connman/connman.hash
+++ b/package/connman/connman.hash
@ -1,4 +1,4 @@
 # From https://www.kernel.org/pub/linux/network/connman/sha256sums.asc
-sha256  79fb40f4fdd5530c45aa8e592fb16ba23d3674f3a98cf10b89a6576f198de589  connman-1.41.tar.xz
+sha256  a3e6bae46fc081ef2e9dae3caa4f7649de892c3de622c20283ac0ca81423c2aa  connman-1.42.tar.xz
 # Locally computed
 sha256  b499eddebda05a8859e32b820a64577d91f1de2b52efa2a1575a2cb4000bc259  COPYING
--- a/package/connman/connman.mk
+++ b/package/connman/connman.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-CONNMAN_VERSION = 1.41
+CONNMAN_VERSION = 1.42
 CONNMAN_SOURCE = connman-$(CONNMAN_VERSION).tar.xz
 CONNMAN_SITE = $(BR2_KERNEL_MIRROR)/linux/network/connman
 CONNMAN_DEPENDENCIES = libglib2 dbus
@ -13,13 +13,6 @@ CONNMAN_LICENSE = GPL-2.0
 CONNMAN_LICENSE_FILES = COPYING
 CONNMAN_CPE_ID_VENDOR = intel

-# 0001-gweb-Fix-OOB-write-in-received_data.patch
-CONNMAN_IGNORE_CVES += CVE-2022-32292
-
-# 0002-wispr-Add-reference-counter-to-portal-context.patch
-# 0003-wispr-Update-portal-context-references.patch
-CONNMAN_IGNORE_CVES += CVE-2022-32293
-
 CONNMAN_CONF_OPTS = --with-dbusconfdir=/etc

 ifeq ($(BR2_INIT_SYSTEMD),y)
--- a/package/dav1d/dav1d.mk
+++ b/package/dav1d/dav1d.mk
@ -9,6 +9,7 @@ DAV1D_SOURCE = dav1d-$(DAV1D_VERSION).tar.xz
 DAV1D_SITE = https://download.videolan.org/pub/videolan/dav1d/$(DAV1D_VERSION)
 DAV1D_LICENSE = BSD-2-Clause
 DAV1D_LICENSE_FILES = COPYING
+DAV1D_CPE_ID_VENDOR = videolan
 DAV1D_INSTALL_STAGING = YES
 DAV1D_CONF_OPTS = \
 	-Denable_tests=false \
--- a/package/diffutils/diffutils.mk
+++ b/package/diffutils/diffutils.mk
@ -10,6 +10,7 @@ DIFFUTILS_SITE = $(BR2_GNU_MIRROR)/diffutils
 DIFFUTILS_DEPENDENCIES = $(TARGET_NLS_DEPENDENCIES)
 DIFFUTILS_LICENSE = GPL-3.0+
 DIFFUTILS_LICENSE_FILES = COPYING
+DIFFUTILS_CPE_ID_VENDOR = gnu

 # Since glibc >= 2.26, don't try to use getopt_long replacement bundled
 # with diffutils. It will conflict with the one from glibc.
--- a/package/dracut/dracut.mk
+++ b/package/dracut/dracut.mk
@ -8,6 +8,7 @@ DRACUT_VERSION = 057
 DRACUT_SITE = $(call github,dracutdevs,dracut,$(DRACUT_VERSION))
 DRACUT_LICENSE = GPL-2.0
 DRACUT_LICENSE_FILES = COPYING
+DRACUT_CPE_ID_VENDOR = dracut_project

 HOST_DRACUT_DEPENDENCIES = host-pkgconf host-kmod host-prelink-cross

--- a/package/e2fsprogs/e2fsprogs.mk
+++ b/package/e2fsprogs/e2fsprogs.mk
@ -70,6 +70,11 @@ ifeq ($(BR2_nios2),y)
 E2FSPROGS_CONF_ENV += ac_cv_func_fallocate=no
 endif

+# workaround gcc bug 111001
+ifeq ($(BR2_TOOLCHAIN_HAS_GCC_BUG_111001),y)
+E2FSPROGS_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -Os"
+endif
+
 E2FSPROGS_CONF_ENV += ac_cv_path_LDCONFIG=true

 HOST_E2FSPROGS_CONF_ENV += ac_cv_path_LDCONFIG=true
--- a/package/elf2flt/0001-elf2flt-handle-binutils-2.34.patch
+++ b/package/elf2flt/0001-elf2flt-handle-binutils-2.34.patch
@ -1,4 +1,4 @@
-From d78acba6510527aaa01a41eaf4c931f7a57e5f44 Mon Sep 17 00:00:00 2001
+From 2821fcb55cbe0f2b77237d89b5b3467fb3ad058b Mon Sep 17 00:00:00 2001
 From: Romain Naour <romain.naour@smile.fr>
 Date: Wed, 5 Feb 2020 10:31:32 +0100
 Subject: [PATCH] elf2flt: handle binutils >= 2.34
@ -373,5 +373,5 @@ index 7ac0617..ea6b5a1 100644
 	fatal("read error section %s", s->name);
       }
 -- 
-2.35.1
+2.41.0

--- a/package/elf2flt/0002-elf2flt.ld-reinstate-32-byte-alignment-for-.data-sec.patch
+++ b/package/elf2flt/0002-elf2flt.ld-reinstate-32-byte-alignment-for-.data-sec.patch
@ -1,4 +1,4 @@
-From 85ba5664eb368eb1cbd2c30b7cd574acd75edd4c Mon Sep 17 00:00:00 2001
+From 37b281e4dd0fb5832181e51943a4eb3c74d4f618 Mon Sep 17 00:00:00 2001
 From: Niklas Cassel <niklas.cassel@wdc.com>
 Date: Mon, 4 Apr 2022 15:30:24 +0200
 Subject: [PATCH] elf2flt.ld: reinstate 32 byte alignment for .data section
@ -77,5 +77,5 @@ index 0df999d..e5aea14 100644
 		@SYMBOL_PREFIX@__data_start = . ;
 		@SYMBOL_PREFIX@data_start = . ;
 -- 
-2.35.1
+2.41.0

--- a/package/elf2flt/0003-elf2flt-add-riscv-64-bits-support.patch
+++ b/package/elf2flt/0003-elf2flt-add-riscv-64-bits-support.patch
@ -1,4 +1,4 @@
-From 3f1f323feb5cf25d8c80861991d0360784f4d2e6 Mon Sep 17 00:00:00 2001
+From 1498503bde2a6055a83f1e9f3eaa6f2a104bd597 Mon Sep 17 00:00:00 2001
 From: Damien Le Moal <damien.lemoal@wdc.com>
 Date: Wed, 9 Sep 2020 17:31:33 +0900
 Subject: [PATCH] elf2flt: add riscv 64-bits support
@ -27,7 +27,7 @@ Signed-off-by: Damien Le Moal <damien.lemoal@wdc.com>
 3 files changed, 25 insertions(+)

 diff --git a/elf2flt.c b/elf2flt.c
-index da25e93..a03ea3a 100644
+index ea6b5a1..c2816b6 100644
 --- a/elf2flt.c
 +++ b/elf2flt.c
@@ -81,6 +81,8 @@ const char *elf2flt_progname;
@ -48,7 +48,7 @@ index da25e93..a03ea3a 100644
 #else
 #error "Don't know how to support your CPU architecture??"
 #endif
-@@ -812,6 +816,18 @@ output_relocs (
+@@ -821,6 +825,18 @@ output_relocs (
 					goto good_32bit_resolved_reloc;
 				default:
 					goto bad_resolved_reloc;
@ -99,5 +99,5 @@ index 7cb02d5..75ee1bb 100644
 	if (!linker_script)
 		linker_script = concat(ldscriptpath, "/elf2flt.ld", NULL);
 -- 
-2.36.1
+2.41.0

--- a/package/elf2flt/0004-elf2flt-create-a-common-helper-function.patch
+++ b/package/elf2flt/0004-elf2flt-create-a-common-helper-function.patch
@ -1,4 +1,4 @@
-From 37e1e0ace8ccebf54ec2f5522bfc1f9db86946ad Mon Sep 17 00:00:00 2001
+From 4f28e4329897b7f23d828b375fb365d0e30c9cb5 Mon Sep 17 00:00:00 2001
 From: Niklas Cassel <niklas.cassel@wdc.com>
 Date: Tue, 9 Aug 2022 12:13:50 +0200
 Subject: [PATCH] elf2flt: create a common helper function
@ -14,10 +14,10 @@ Signed-off-by: Niklas Cassel <niklas.cassel@wdc.com>
 1 file changed, 11 insertions(+), 8 deletions(-)

 diff --git a/elf2flt.c b/elf2flt.c
-index 669591e..9c32f9a 100644
+index c2816b6..8cd48d9 100644
 --- a/elf2flt.c
 +++ b/elf2flt.c
-@@ -337,6 +337,13 @@ compare_relocs (const void *pa, const void *pb)
+@@ -346,6 +346,13 @@ compare_relocs (const void *pa, const void *pb)
 }
 #endif
 
@ -31,7 +31,7 @@ index 669591e..9c32f9a 100644
 static uint32_t *
 output_relocs (
   bfd *abs_bfd,
-@@ -428,8 +435,7 @@ output_relocs (
+@@ -437,8 +444,7 @@ output_relocs (
 	 */
 	if ((!pic_with_got || ALWAYS_RELOC_TEXT) &&
 	    ((a->flags & SEC_CODE) ||
@ -41,7 +41,7 @@ index 669591e..9c32f9a 100644
 		sectionp = text + (a->vma - text_vma);
 	else if (a->flags & SEC_DATA)
 		sectionp = data + (a->vma - data_vma);
-@@ -1893,8 +1899,7 @@ int main(int argc, char *argv[])
+@@ -1902,8 +1908,7 @@ int main(int argc, char *argv[])
     bfd_vma sec_vma;
 
     if ((s->flags & SEC_CODE) ||
@ -51,7 +51,7 @@ index 669591e..9c32f9a 100644
       vma = &text_vma;
       len = &text_len;
     } else if (s->flags & SEC_DATA) {
-@@ -1932,8 +1937,7 @@ int main(int argc, char *argv[])
+@@ -1941,8 +1946,7 @@ int main(int argc, char *argv[])
    * data sections.*/
   for (s = abs_bfd->sections; s != NULL; s = s->next)
     if ((s->flags & SEC_CODE) ||
@ -60,8 +60,8 @@ index 669591e..9c32f9a 100644
 +	ro_reloc_data_section_should_be_in_text(s))
       if (!bfd_get_section_contents(abs_bfd, s,
 				   text + (s->vma - text_vma), 0,
- 				   bfd_section_size(abs_bfd, s)))
-@@ -1962,8 +1966,7 @@ int main(int argc, char *argv[])
+ 				   elf2flt_bfd_section_size(s)))
+@@ -1971,8 +1975,7 @@ int main(int argc, char *argv[])
    * data sections already included in the text output section.*/
   for (s = abs_bfd->sections; s != NULL; s = s->next)
     if ((s->flags & SEC_DATA) &&
@ -70,7 +70,7 @@ index 669591e..9c32f9a 100644
 +	!ro_reloc_data_section_should_be_in_text(s))
       if (!bfd_get_section_contents(abs_bfd, s,
 				   data + (s->vma - data_vma), 0,
- 				   bfd_section_size(abs_bfd, s)))
+ 				   elf2flt_bfd_section_size(s)))
 -- 
-2.37.1
+2.41.0

--- a/package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch
+++ b/package/elf2flt/0005-elf2flt-fix-fatal-error-regression-on-m68k-xtensa-ri.patch
@ -1,4 +1,4 @@
-From a8c9f650b82109abf7aa730f298ea5182ed62613 Mon Sep 17 00:00:00 2001
+From 87d45736a6855f2147ef9c88d2bce2cabc84cb52 Mon Sep 17 00:00:00 2001
 From: Niklas Cassel <niklas.cassel@wdc.com>
 Date: Tue, 9 Aug 2022 21:06:05 +0200
 Subject: [PATCH] elf2flt: fix fatal error regression on m68k, xtensa, riscv64
@ -50,10 +50,10 @@ Signed-off-by: Niklas Cassel <niklas.cassel@wdc.com>
 1 file changed, 7 insertions(+), 2 deletions(-)

 diff --git a/elf2flt.c b/elf2flt.c
-index e0d7891..39d035f 100644
+index 8cd48d9..60bfa57 100644
 --- a/elf2flt.c
 +++ b/elf2flt.c
-@@ -341,8 +341,13 @@ compare_relocs (const void *pa, const void *pb)
+@@ -349,8 +349,13 @@ compare_relocs (const void *pa, const void *pb)
 static bool
 ro_reloc_data_section_should_be_in_text(asection *s)
 {
@ -70,5 +70,5 @@ index e0d7891..39d035f 100644
 
 static uint32_t *
 -- 
-2.39.0
+2.41.0

--- a/package/elf2flt/0006-elf2flt-xtensa-fix-text-relocations.patch
+++ b/package/elf2flt/0006-elf2flt-xtensa-fix-text-relocations.patch
@ -1,4 +1,4 @@
-From e248d9774506fdd8698b14a7edead113f19ecdb0 Mon Sep 17 00:00:00 2001
+From 7e1c17d7fe72a0889d56d5e6a1390d493d1de144 Mon Sep 17 00:00:00 2001
 From: Max Filippov <jcmvbkbc@gmail.com>
 Date: Tue, 29 Nov 2022 17:47:54 -0800
 Subject: [PATCH] xtensa: fix text relocations
@ -21,10 +21,10 @@ Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
 1 file changed, 14 insertions(+), 1 deletion(-)

 diff --git a/elf2flt.c b/elf2flt.c
-index b93aecdaced3..cec3f4a22239 100644
+index 60bfa57..0fcb747 100644
 --- a/elf2flt.c
 +++ b/elf2flt.c
-@@ -808,7 +808,20 @@ output_relocs (
+@@ -833,7 +833,20 @@ output_relocs (
 					continue;
 				case R_XTENSA_32:
 				case R_XTENSA_PLT:
@ -45,7 +45,7 @@ index b93aecdaced3..cec3f4a22239 100644
 +					break;
 				default:
 					goto bad_resolved_reloc;
- #else
+ #elif defined(TARGET_riscv64)
 -- 
-2.30.2
+2.41.0

--- a/package/elf2flt/0007-elf2flt-remove-use-of-BFD_VMA_FMT.patch
+++ b/package/elf2flt/0007-elf2flt-remove-use-of-BFD_VMA_FMT.patch
@ -0,0 +1,169 @@
+From 9ec7dd9dead2f3c4c73c3ab2166a1f81bfb41825 Mon Sep 17 00:00:00 2001
+From: Greg Ungerer <gerg@kernel.org>
+Date: Thu, 13 Apr 2023 22:58:20 +1000
+Subject: [PATCH] elf2flt: remove use of BFD_VMA_FMT
+
+In binutils-2.40 the BFD_VMA_FMT definition used for printf style
+formatting specifiers has been removed. For reference this was done in
+commit b82817674f46 ("Don't use BFD_VMA_FMT in binutils") in the
+binutils git development tree.
+
+BFD_VMA_FMT is used in a number of places in the elf2flt code to output
+bfd offsets, values and the like. So it is broken when using the bfd
+code from binutils-2.40 and newer.
+
+According to the binutils change PRIx64 (and friends) is used to replace
+it, with appropriate casts to keep it clean for 32 and 64 bit platforms.
+Change the elf2flt.c use of it in the same way to fix.
+
+This does not change the output in any way in normal use. This fix can
+be used on all versions of binutils (older and newer), there is no
+need to only do this on 2.40 and newer.
+
+Signed-off-by: Greg Ungerer <gerg@kernel.org>
+Upstream: https://github.com/uclinux-dev/elf2flt/commit/a36df7407d9e3f93ca6449841ff0821b0d980438
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
+---
+ elf2flt.c | 58 ++++++++++++++++++++++++++++---------------------------
+ 1 file changed, 30 insertions(+), 28 deletions(-)
+
+diff --git a/elf2flt.c b/elf2flt.c
+index 0fcb747..6685bff 100644
+--- a/elf2flt.c
+++ b/elf2flt.c
+@@ -220,8 +220,8 @@ dump_symbols(asymbol **symbol_table, long number_of_symbols)
+   long i;
+   printf("SYMBOL TABLE:\n");
+   for (i=0; i<number_of_symbols; i++) {
+-	printf("  NAME=%s  VALUE=0x%"BFD_VMA_FMT"x\n",
+-		symbol_table[i]->name, symbol_table[i]->value);
+	printf("  NAME=%s  VALUE=0x%"PRIx64"\n",
+		symbol_table[i]->name, (uint64_t) symbol_table[i]->value);
+   }
+   printf("\n");
+   return(0);
+@@ -466,8 +466,8 @@ output_relocs (
+ 	if (r == NULL)
+ 	  continue;
+ 	if (verbose)
+-	  printf(" RELOCS: %s [%p]: flags=0x%x vma=0x%"BFD_VMA_FMT"x\n",
+-			r->name, r, r->flags, elf2flt_bfd_section_vma(r));
+	  printf(" RELOCS: %s [%p]: flags=0x%x vma=0x%"PRIx64"\n",
+			r->name, r, r->flags, (uint64_t) elf2flt_bfd_section_vma(r));
+   	if ((r->flags & SEC_RELOC) == 0)
+   	  continue;
+ 	relsize = bfd_get_reloc_upper_bound(rel_bfd, r);
+@@ -952,12 +952,13 @@ output_relocs (
+ 					if (verbose)
+ 						fprintf(stderr,
+ 							"%s vma=0x%x, "
+-							"value=0x%"BFD_VMA_FMT"x, "
+-							"address=0x%"BFD_VMA_FMT"x "
+							"value=0x%"PRIx64", "
+							"address=0x%"PRIx64" "
+ 							"sym_addr=0x%x rs=0x%x, opcode=0x%x\n",
+ 							"ABS32",
+-							sym_vma, (*(q->sym_ptr_ptr))->value,
+-							q->address, sym_addr,
+							sym_vma, 
+							(uint64_t) (*(q->sym_ptr_ptr))->value,
+							(uint64_t) q->address, sym_addr,
+ 							(*p)->howto->rightshift,
+ 							*(uint32_t *)r_mem);
+ 					sym_vma = elf2flt_bfd_section_vma(sym_section);
+@@ -971,12 +972,13 @@ output_relocs (
+ 					if (verbose)
+ 						fprintf(stderr,
+ 							"%s vma=0x%x, "
+-							"value=0x%"BFD_VMA_FMT"x, "
+-							"address=0x%"BFD_VMA_FMT"x "
+							"value=0x%"PRIx64", "
+							"address=0x%"PRIx64" "
+ 							"sym_addr=0x%x rs=0x%x, opcode=0x%x\n",
+ 							"PLT32",
+-							sym_vma, (*(q->sym_ptr_ptr))->value,
+-							q->address, sym_addr,
+							sym_vma,
+							(uint64_t) (*(q->sym_ptr_ptr))->value,
+							(uint64_t) q->address, sym_addr,
+ 							(*p)->howto->rightshift,
+ 							*(uint32_t *)r_mem);
+ 				case R_ARM_PC24:
+@@ -994,8 +996,8 @@ output_relocs (
+ 				case R_V850_ZDA_16_16_OFFSET:
+ 				case R_V850_ZDA_16_16_SPLIT_OFFSET:
+ 					/* Can't support zero-relocations.  */
+-					printf ("ERROR: %s+0x%"BFD_VMA_FMT"x: zero relocations not supported\n",
+-							sym_name, q->addend);
+					printf ("ERROR: %s+0x%"PRIx64": zero relocations not supported\n",
+							sym_name, (uint64_t) q->addend);
+ 					continue;
+ #endif /* TARGET_v850 */
+ 
+@@ -1194,12 +1196,12 @@ output_relocs (
+ 					temp |= (exist_val & 0x3f);
+ 					*(unsigned long *)r_mem = htoniosl(temp);
+ 					if (verbose)
+-						printf("omit: offset=0x%"BFD_VMA_FMT"x symbol=%s%s "
+						printf("omit: offset=0x%"PRIx64" symbol=%s%s "
+ 								"section=%s size=%d "
+-								"fixup=0x%x (reloc=0x%"BFD_VMA_FMT"x) GPREL\n",
+-								q->address, sym_name, addstr,
+								"fixup=0x%x (reloc=0x%"PRIx64") GPREL\n",
+								(uint64_t) q->address, sym_name, addstr,
+ 								section_name, sym_reloc_size,
+-								sym_addr, section_vma + q->address);
+								sym_addr, (uint64_t) section_vma + q->address);
+ 					continue;
+ 				}
+ 				case R_NIOS2_PCREL16:
+@@ -1214,12 +1216,12 @@ output_relocs (
+ 					exist_val |= ((sym_addr & 0xFFFF) << 6);
+ 					*(unsigned long *)r_mem = htoniosl(exist_val);
+ 					if (verbose)
+-						printf("omit: offset=0x%"BFD_VMA_FMT"x symbol=%s%s "
+						printf("omit: offset=0x%"PRIx64" symbol=%s%s "
+ 								"section=%s size=%d "
+-								"fixup=0x%x (reloc=0x%"BFD_VMA_FMT"x) PCREL\n",
+-								q->address, sym_name, addstr,
+								"fixup=0x%x (reloc=0x%"PRIx64") PCREL\n",
+								(uint64_t) q->address, sym_name, addstr,
+ 								section_name, sym_reloc_size,
+-								sym_addr, section_vma + q->address);
+								sym_addr, (uint64_t) section_vma + q->address);
+ 					continue;
+ 				}
+ 
+@@ -1231,9 +1233,9 @@ output_relocs (
+ 					    && (p[-1]->sym_ptr_ptr == p[0]->sym_ptr_ptr)
+ 					    && (p[-1]->addend == p[0]->addend)) {
+ 						if (verbose)
+-							printf("omit: offset=0x%"BFD_VMA_FMT"x symbol=%s%s "
+							printf("omit: offset=0x%"PRIx64" symbol=%s%s "
+ 								"section=%s size=%d LO16\n",
+-								q->address, sym_name, addstr,
+								(uint64_t) q->address, sym_name, addstr,
+ 								section_name, sym_reloc_size);
+ 						continue;
+ 					}
+@@ -1646,13 +1648,13 @@ DIS29_RELOCATION:
+ 			 */
+ 			if (relocation_needed) {
+ 				if (verbose)
+-					printf("  RELOC[%d]: offset=0x%"BFD_VMA_FMT"x symbol=%s%s "
+					printf("  RELOC[%d]: offset=0x%"PRIx64" symbol=%s%s "
+ 						"section=%s size=%d "
+-						"fixup=0x%x (reloc=0x%"BFD_VMA_FMT"x)\n",
+						"fixup=0x%x (reloc=0x%"PRIx64")\n",
+ 						flat_reloc_count,
+-						q->address, sym_name, addstr,
+						(uint64_t) q->address, sym_name, addstr,
+ 						section_name, sym_reloc_size,
+-						sym_addr, section_vma + q->address);
+						sym_addr, (uint64_t) section_vma + q->address);
+ 
+ #ifndef TARGET_bfin
+ 				flat_relocs = realloc(flat_relocs,
+-- 
+2.41.0
+
--- a/package/elf2flt/0008-riscv64-add-more-relocations-required-to-be-handled.patch
+++ b/package/elf2flt/0008-riscv64-add-more-relocations-required-to-be-handled.patch
@ -0,0 +1,40 @@
+From 5acfed0012f2fff9801b25403bd8a5e1c2ccfea2 Mon Sep 17 00:00:00 2001
+From: Waldemar Brodkorb <wbx@openadk.org>
+Date: Mon, 7 Aug 2023 09:30:34 +0200
+Subject: [PATCH] riscv64: add more relocations required to be handled
+
+Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
+Upstream: https://github.com/uclinux-dev/elf2flt/pull/24
+---
+ elf2flt.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/elf2flt.c b/elf2flt.c
+index 6685bff..6b3bea4 100644
+--- a/elf2flt.c
+++ b/elf2flt.c
+@@ -850,11 +850,21 @@ output_relocs (
+ 				default:
+ 					goto bad_resolved_reloc;
+ #elif defined(TARGET_riscv64)
+				case R_RISCV_NONE:
+ 				case R_RISCV_32_PCREL:
+				case R_RISCV_ADD8:
+				case R_RISCV_ADD16:
+ 				case R_RISCV_ADD32:
+ 				case R_RISCV_ADD64:
+				case R_RISCV_SUB6:
+				case R_RISCV_SUB8:
+				case R_RISCV_SUB16:
+ 				case R_RISCV_SUB32:
+ 				case R_RISCV_SUB64:
+				case R_RISCV_SET6:
+				case R_RISCV_SET8:
+				case R_RISCV_SET16:
+				case R_RISCV_SET32:
+ 					continue;
+ 				case R_RISCV_32:
+ 				case R_RISCV_64:
+-- 
+2.39.2
+
--- a/package/elf2flt/elf2flt.mk
+++ b/package/elf2flt/elf2flt.mk
@ -14,12 +14,27 @@ HOST_ELF2FLT_DEPENDENCIES = host-binutils host-zlib
 # 0001-elf2flt-handle-binutils-2.34.patch
 HOST_ELF2FLT_AUTORECONF = YES

+# elf2flt needs to link against libbfd.a and libiberty.a which are
+# provided by host-binutils, but not installed, so we poke directly
+# into the host-binutils build directory. Turns out that the location
+# of libbfd.a has changed in binutils >= 2.41, so we special case
+# binutils 2.39 and 2.40, which are the two remaining versions still
+# using the "old" path". Note: the ARC-special binutils version is not
+# considered because Buildroot only supports ARC CPUs with a MMU and
+# therefore host-elf2flt is never used on ARC. libiberty.a has
+# remained at the same location.
+ifeq ($(BR2_BINUTILS_VERSION_2_39_X)$(BR2_BINUTILS_VERSION_2_40_X),y)
+HOST_ELF2FLT_LIBBFD_PATH = $(HOST_BINUTILS_DIR)/bfd/libbfd.a
+else
+HOST_ELF2FLT_LIBBFD_PATH = $(HOST_BINUTILS_DIR)/bfd/.libs/libbfd.a
+endif
+
 # It is not exactly a host variant, but more a cross variant, which is
 # why we pass a special --target option.
 HOST_ELF2FLT_CONF_OPTS = \
 	--with-bfd-include-dir=$(HOST_BINUTILS_DIR)/bfd/ \
 	--with-binutils-include-dir=$(HOST_BINUTILS_DIR)/include/ \
-	--with-libbfd=$(HOST_BINUTILS_DIR)/bfd/libbfd.a \
+	--with-libbfd=$(HOST_ELF2FLT_LIBBFD_PATH) \
 	--with-libiberty=$(HOST_BINUTILS_DIR)/libiberty/libiberty.a \
 	--target=$(GNU_TARGET_NAME) \
 	--disable-werror
--- a/package/esp-hosted/0001-esp_hosted_ng-host-fix-build-failure-when-CONFIG_PM-.patch
+++ b/package/esp-hosted/0001-esp_hosted_ng-host-fix-build-failure-when-CONFIG_PM-.patch
@ -0,0 +1,33 @@
+From 56920e3ce04aa2eadb529a6787200789bf1c3925 Mon Sep 17 00:00:00 2001
+From: Giulio Benetti <giulio.benetti@benettiengineering.com>
+Date: Wed, 9 Aug 2023 23:16:52 +0200
+Subject: [PATCH] esp_hosted_ng: host: fix build failure when CONFIG_PM is not
+ defined
+
+wiphy->wowlan is not defined when CONFIG_PM is not enabled so let's
+guard the assignment to wiphy->wowlan according to option CONFIG_PM.
+
+Upstream: https://github.com/espressif/esp-hosted/pull/254
+
+Signed-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com>
+---
+ esp_hosted_ng/host/esp_cfg80211.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/esp_hosted_ng/host/esp_cfg80211.c b/esp_hosted_ng/host/esp_cfg80211.c
+index 70fdbb9773..d3c4108c29 100644
+--- a/esp_hosted_ng/host/esp_cfg80211.c
+++ b/esp_hosted_ng/host/esp_cfg80211.c
+@@ -638,7 +638,9 @@ int esp_cfg80211_register(struct esp_adapter *adapter)
+ 	wiphy->max_scan_ie_len = 1000;
+ 	wiphy->max_sched_scan_ssids = 10;
+ 	wiphy->signal_type = CFG80211_SIGNAL_TYPE_MBM;
+#ifdef CONFIG_PM
+ 	wiphy->wowlan = &esp_wowlan_support;
+#endif
+ 
+ 	/* Advertise SAE support */
+ 	wiphy->features |= NL80211_FEATURE_SAE;
+-- 
+2.34.1
+
--- a/package/flite/flite.mk
+++ b/package/flite/flite.mk
@ -8,6 +8,7 @@ FLITE_VERSION = 2.2
 FLITE_SITE = $(call github,festvox,flite,v$(FLITE_VERSION))
 FLITE_LICENSE = BSD-4-Clause
 FLITE_LICENSE_FILES = COPYING
+FLITE_CPE_ID_VENDOR = cmu

 FLITE_INSTALL_STAGING = YES
 # Patching configure.in
--- a/package/gcc/gcc.mk
+++ b/package/gcc/gcc.mk
@ -154,6 +154,14 @@ ifeq ($(BR2_mips)$(BR2_mipsel):$(BR2_TOOLCHAIN_GCC_AT_LEAST_12),y:y)
 HOST_GCC_COMMON_CONF_OPTS += --disable-libsanitizer
 endif

+# libsanitizer is broken for Thumb1, sanitizer_linux.cc contains unconditional
+# "ldr ip, [sp], #8", which causes:
+# ....s: Assembler messages:
+# ....s:4190: Error: lo register required -- `ldr ip,[sp],#8'
+ifeq ($(BR2_ARM_INSTRUCTIONS_THUMB),y)
+HOST_GCC_COMMON_CONF_OPTS += --disable-libsanitizer
+endif
+
 # The logic in libbacktrace/configure.ac to detect if __sync builtins
 # are available assumes they are as soon as target_subdir is not
 # empty, i.e when cross-compiling. However, some platforms do not have
--- a/package/gdb/gdb.mk
+++ b/package/gdb/gdb.mk
@ -134,7 +134,8 @@ GDB_CONF_OPTS = \
 	--with-system-zlib \
 	--disable-werror \
 	--enable-static \
-	--without-mpfr
+	--without-mpfr \
+	--disable-source-highlight

 ifeq ($(BR2_PACKAGE_GDB_DEBUGGER),y)
 GDB_CONF_OPTS += \
@ -254,6 +255,7 @@ HOST_GDB_CONF_OPTS = \
 	--with-system-zlib \
 	--with-curses \
 	--without-mpfr \
+	--disable-source-highlight \
 	$(GDB_DISABLE_BINUTILS_CONF_OPTS)

 ifeq ($(BR2_PACKAGE_HOST_GDB_TUI),y)
--- a/package/go-bootstrap-stage2/go-bootstrap-stage2.hash
+++ b/package/go-bootstrap-stage2/go-bootstrap-stage2.hash
@ -1,3 +1,3 @@
 # From https://go.dev/dl
-sha256  13755bcce529747d5f2930dee034730c86d02bd3e521ab3e2bbede548d3b953f  go1.19.10.src.tar.gz
+sha256  e25c9ab72d811142b7f41ff6da5165fec2d1be5feec3ef2c66bc0bdecb431489  go1.19.11.src.tar.gz
 sha256  2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067  LICENSE
--- a/package/go-bootstrap-stage2/go-bootstrap-stage2.mk
+++ b/package/go-bootstrap-stage2/go-bootstrap-stage2.mk
@ -6,7 +6,7 @@

 # Use last Go version that go-bootstrap-stage1 can build: v1.19.x
 # See https://golang.org/doc/install/source#bootstrapFromSource
-GO_BOOTSTRAP_STAGE2_VERSION = 1.19.10
+GO_BOOTSTRAP_STAGE2_VERSION = 1.19.11
 GO_BOOTSTRAP_STAGE2_SITE = https://storage.googleapis.com/golang
 GO_BOOTSTRAP_STAGE2_SOURCE = go$(GO_BOOTSTRAP_STAGE2_VERSION).src.tar.gz

--- a/package/intel-microcode/intel-microcode.hash
+++ b/package/intel-microcode/intel-microcode.hash
@ -1,3 +1,3 @@
 # Locally computed
-sha256  58f3321dcf900175d87d5b39455138c2a24e69df4ba997fb44e3e0d19e531ad1  intel-microcode-20230512.tar.gz
+sha256  fe49bb719441f20335ed6004090ab38cdc374134d36d4f5d30be7ed93b820313  intel-microcode-20230808.tar.gz
 sha256  03efb1491c7e899feb2665fa299363e64035e5444c1b8bc1f6ebed30de964e12  license
--- a/package/intel-microcode/intel-microcode.mk
+++ b/package/intel-microcode/intel-microcode.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-INTEL_MICROCODE_VERSION = 20230512
+INTEL_MICROCODE_VERSION = 20230808
 INTEL_MICROCODE_SITE = $(call github,intel,Intel-Linux-Processor-Microcode-Data-Files,microcode-$(INTEL_MICROCODE_VERSION))
 INTEL_MICROCODE_LICENSE = PROPRIETARY
 INTEL_MICROCODE_LICENSE_FILES = license
--- a/package/kodi-imagedecoder-heif/0001-include-missing-cstdint-to-support-gcc-13.patch
+++ b/package/kodi-imagedecoder-heif/0001-include-missing-cstdint-to-support-gcc-13.patch
@ -0,0 +1,31 @@
+From 47dcb3843e02abb69c52d6f0021bd2816b8317a5 Mon Sep 17 00:00:00 2001
+From: Rudi Heitbaum <rudi@heitbaum.com>
+Date: Thu, 27 Apr 2023 02:46:59 +1000
+Subject: [PATCH] include missing <cstdint> to support gcc-13
+
+gcc 13 moved some includes around and as a result <cstdint> is no longer transitively
+included [1]. Explicitly include it for uint{32,64}_t.
+
+[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes
+
+Signed-off-by: Rudi Heitbaum <rudi@heitbaum.com>
+
+Upstream: https://github.com/xbmc/imagedecoder.heif/commit/47dcb3843e02abb69c52d6f0021bd2816b8317a5
+
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+---
+ lib/TinyEXIF/TinyEXIF.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/TinyEXIF/TinyEXIF.h b/lib/TinyEXIF/TinyEXIF.h
+index 56354aa..b03d36b 100644
+--- a/lib/TinyEXIF/TinyEXIF.h
+++ b/lib/TinyEXIF/TinyEXIF.h
+@@ -34,6 +34,7 @@
+ #ifndef __TINYEXIF_H__
+ #define __TINYEXIF_H__
+ 
+#include <cstdint>
+ #include <string>
+ #include <vector>
+ 
--- a/package/kodi-imagedecoder-heif/Config.in
+++ b/package/kodi-imagedecoder-heif/Config.in
@ -2,7 +2,7 @@ config BR2_PACKAGE_KODI_IMAGEDECODER_HEIF
 	bool "kodi-imagedecoder-heif"
 	depends on BR2_INSTALL_LIBSTDCPP # libde265, libheif, tinyxml2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # libde265
-	depends on !BR2_m68k_cf # libheif
+	depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_30730 # libheif
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # libheif
 	select BR2_PACKAGE_LIBDE265
 	select BR2_PACKAGE_LIBHEIF
@ -13,6 +13,6 @@ config BR2_PACKAGE_KODI_IMAGEDECODER_HEIF
 	  https://github.com/xbmc/imagedecoder.heif

 comment "kodi-imagedecoder-heif needs a toolchain w/ C++, threads, gcc >= 4.8"
-	depends on !BR2_m68k_cf # libheif
+	depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_30730 # libheif
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS || \
 		!BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
--- a/package/less/less.mk
+++ b/package/less/less.mk
@ -11,8 +11,4 @@ LESS_LICENSE_FILES = COPYING
 LESS_CPE_ID_VENDOR = gnu
 LESS_DEPENDENCIES = ncurses

-define LESS_INSTALL_TARGET_CMDS
-	$(INSTALL) -m 0755 $(@D)/less $(TARGET_DIR)/usr/bin/less
-endef
-
 $(eval $(autotools-package))
--- a/package/libcoap/libcoap.mk
+++ b/package/libcoap/libcoap.mk
@ -9,6 +9,7 @@ LIBCOAP_SITE = $(call github,obgm,libcoap,v$(LIBCOAP_VERSION))
 LIBCOAP_INSTALL_STAGING = YES
 LIBCOAP_LICENSE = BSD-2-Clause
 LIBCOAP_LICENSE_FILES = COPYING LICENSE
+LIBCOAP_CPE_ID_VENDOR = libcoap
 LIBCOAP_DEPENDENCIES = host-pkgconf
 LIBCOAP_CONF_OPTS = \
 	--disable-examples --disable-examples-source --without-tinydtls
--- a/package/libedit/0002-add-sys-types_h.patch
+++ b/package/libedit/0002-add-sys-types_h.patch
@ -0,0 +1,15 @@
+Signed-off-by: Waldemar Brodkorb <wbx@openadk.org>
+Upstream: N/A only reachable via mail
+
+diff -Nur libedit-20221030-3.1.orig/src/sys.h libedit-20221030-3.1/src/sys.h
+--- libedit-20221030-3.1.orig/src/sys.h	2022-10-30 06:35:40.000000000 +0100
+++ libedit-20221030-3.1/src/sys.h	2023-08-12 09:52:28.137223311 +0200
+@@ -40,7 +40,7 @@
+ #ifndef _h_sys
+ #define	_h_sys
+ 
+-#if defined(HAVE_SYS_TYPES_H) && defined(__sun)
+#if defined(HAVE_SYS_TYPES_H)
+ #include <sys/types.h>
+ #endif
+ 
--- a/package/libglib2/libglib2.mk
+++ b/package/libglib2/libglib2.mk
@ -60,10 +60,6 @@ LIBGLIB2_MESON_EXTRA_PROPERTIES = \
 	have_c99_snprintf=true \
 	have_unix98_printf=true

-ifneq ($(BR2_ENABLE_LOCALE),y)
-LIBGLIB2_DEPENDENCIES += libiconv
-endif
-
 ifeq ($(BR2_PACKAGE_ELFUTILS),y)
 LIBGLIB2_DEPENDENCIES += elfutils
 endif
@ -74,7 +70,6 @@ LIBGLIB2_LDFLAGS += -latomic
 endif

 ifeq ($(BR2_PACKAGE_LIBICONV),y)
-LIBGLIB2_CONF_OPTS += -Diconv=external
 LIBGLIB2_DEPENDENCIES += libiconv
 endif

--- a/package/libheif/Config.in
+++ b/package/libheif/Config.in
@ -1,8 +1,6 @@
 config BR2_PACKAGE_LIBHEIF
 	bool "libheif"
-	# avoid build error
-	# Internal error in emit_expr_encoded at dw2gencfi.c:215
-	depends on !BR2_m68k_cf
+	depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_30730
 	depends on BR2_INSTALL_LIBSTDCPP
 	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
 	help
@ -11,5 +9,5 @@ config BR2_PACKAGE_LIBHEIF
 	  https://github.com/strukturag/libheif

 comment "libheif needs a toolchain w/ C++, gcc >= 4.8"
-	depends on !BR2_m68k_cf
+	depends on !BR2_TOOLCHAIN_HAS_BINUTILS_BUG_30730
 	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8
--- a/package/libksba/libksba.mk
+++ b/package/libksba/libksba.mk
@ -9,7 +9,7 @@ LIBKSBA_SOURCE = libksba-$(LIBKSBA_VERSION).tar.bz2
 LIBKSBA_SITE = https://gnupg.org/ftp/gcrypt/libksba
 LIBKSBA_LICENSE = LGPL-3.0+ or GPL-2.0+ (library, headers), GPL-3.0+ (manual, tests, build system)
 LIBKSBA_LICENSE_FILES = AUTHORS COPYING COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv3
-LIBKSBA_CPE_ID_VENDOR = libksba_project
+LIBKSBA_CPE_ID_VENDOR = gnupg
 LIBKSBA_INSTALL_STAGING = YES
 LIBKSBA_DEPENDENCIES = libgpg-error
 LIBKSBA_CONF_OPTS = --with-gpg-error-prefix=$(STAGING_DIR)/usr
--- a/package/liblo/0001-Fix-use-after-free-warning-in-server.c.patch
+++ b/package/liblo/0001-Fix-use-after-free-warning-in-server.c.patch
@ -0,0 +1,29 @@
+From 8187a8456c14eeb3af08c86ffa1228823c9ef1c5 Mon Sep 17 00:00:00 2001
+From: Guido Aulisi <guido.aulisi@gmail.com>
+Date: Sun, 25 Jun 2023 15:58:30 +0200
+Subject: [PATCH] Fix use-after-free warning in server.c
+
+That assignment is not necessary before returning
+
+Upstream: https://sourceforge.net/p/liblo/git/ci/8187a8456c14eeb3af08c86ffa1228823c9ef1c5/
+
+Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
+---
+ src/server.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/server.c b/src/server.c
+index ba02d8e..35c9ba5 100644
+--- a/src/server.c
+++ b/src/server.c
+@@ -2289,7 +2289,6 @@ int lo_server_del_lo_method(lo_server s, lo_method m)
+             free((void *) it->path);
+             free((void *) it->typespec);
+             free(it);
+-            it = prev;
+             return 0;
+         }
+         prev = it;
+-- 
+2.39.2
+
--- a/package/libserial/0003-Add-missing-cstdint-header-for-uint8_t-type.patch
+++ b/package/libserial/0003-Add-missing-cstdint-header-for-uint8_t-type.patch
@ -0,0 +1,28 @@
+From b4ae3313fb313b6acb7f701d898f834133f5bd53 Mon Sep 17 00:00:00 2001
+From: Jussi <jussi.hietanen@iki.fi>
+Date: Mon, 3 Jul 2023 15:59:07 +0300
+Subject: [PATCH] Add missing cstdint header for uint8_t type
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+Upstream: https://github.com/crayzeewulf/libserial/commit/3b50bc2b7464ed527d1709b5c7ba86688e6aa3ec
+Signed-off-by: Peter Seiderer <ps.report@gmx.net>
+---
+ src/libserial/SerialPortConstants.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/libserial/SerialPortConstants.h b/src/libserial/SerialPortConstants.h
+index 4f05bd5..88dca0b 100644
+--- a/src/libserial/SerialPortConstants.h
+++ b/src/libserial/SerialPortConstants.h
+@@ -33,6 +33,7 @@
+ 
+ #pragma once
+ 
+#include <cstdint>
+ #include <limits>
+ #include <stdexcept>
+ #include <string>
+-- 
+2.41.0
+
--- a/package/linux-headers/Config.in.host
+++ b/package/linux-headers/Config.in.host
@ -400,13 +400,13 @@ endchoice

 config BR2_DEFAULT_KERNEL_HEADERS
 	string
-	default "4.14.320"	if BR2_KERNEL_HEADERS_4_14
-	default "4.19.289"	if BR2_KERNEL_HEADERS_4_19
-	default "5.4.251"	if BR2_KERNEL_HEADERS_5_4
-	default "5.10.188"	if BR2_KERNEL_HEADERS_5_10
-	default "5.15.123"	if BR2_KERNEL_HEADERS_5_15
-	default "6.1.42"	if BR2_KERNEL_HEADERS_6_1
-	default "6.4.7"		if BR2_KERNEL_HEADERS_6_4
+	default "4.14.321"	if BR2_KERNEL_HEADERS_4_14
+	default "4.19.290"	if BR2_KERNEL_HEADERS_4_19
+	default "5.4.252"	if BR2_KERNEL_HEADERS_5_4
+	default "5.10.189"	if BR2_KERNEL_HEADERS_5_10
+	default "5.15.125"	if BR2_KERNEL_HEADERS_5_15
+	default "6.1.44"	if BR2_KERNEL_HEADERS_6_1
+	default "6.4.9"		if BR2_KERNEL_HEADERS_6_4
 	default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION
 	default "custom"	if BR2_KERNEL_HEADERS_CUSTOM_TARBALL
 	default BR2_KERNEL_HEADERS_CUSTOM_REPO_VERSION \
--- a/package/llvm-project/compiler-rt/compiler-rt.mk
+++ b/package/llvm-project/compiler-rt/compiler-rt.mk
@ -11,6 +11,7 @@ COMPILER_RT_LICENSE = NCSA MIT
 COMPILER_RT_LICENSE_FILES = LICENSE.TXT
 COMPILER_RT_CPE_ID_VENDOR = llvm
 COMPILER_RT_DEPENDENCIES = host-clang llvm
+COMPILER_RT_SUPPORTS_IN_SOURCE_BUILD = NO

 COMPILER_RT_INSTALL_STAGING = YES
 COMPILER_RT_INSTALL_TARGET = NO
--- a/package/log4cxx/log4cxx.mk
+++ b/package/log4cxx/log4cxx.mk
@ -10,6 +10,7 @@ LOG4CXX_SOURCE = apache-log4cxx-$(LOG4CXX_VERSION).tar.gz
 LOG4CXX_INSTALL_STAGING = YES
 LOG4CXX_LICENSE = Apache-2.0
 LOG4CXX_LICENSE_FILES = LICENSE
+LOG4CXX_CPE_ID_VENDOR = apache

 LOG4CXX_CONF_OPTS = \
 	-DAPR_CONFIG_EXECUTABLE=$(STAGING_DIR)/usr/bin/apr-1-config \
--- a/package/lsof/lsof.hash
+++ b/package/lsof/lsof.hash
@ -1,3 +1,3 @@
 # Locally calculated
 sha256  80308a614508814ac70eb2ae1ed2c4344dcf6076fa60afc7734d6b1a79e62b16  lsof-4.98.0.tar.gz
-sha256  32a728188b19bf86917659d904ab29d0a294b4506e1c98b8b7f1c70ab4975fe1  dialects/linux/dproto.h
+sha256  225222ff9bf38abc2cef7205e9b05c60935efa9ec28d1fd01e503c9316088718  COPYING
--- a/package/lsof/lsof.mk
+++ b/package/lsof/lsof.mk
@ -7,9 +7,8 @@
 LSOF_VERSION = 4.98.0
 LSOF_SITE = $(call github,lsof-org,lsof,$(LSOF_VERSION))
 LSOF_LICENSE = lsof license
-# License is repeated in each file, this is a relatively small one.
-# It is also defined in 00README, but that contains a lot of other cruft.
-LSOF_LICENSE_FILES = dialects/linux/dproto.h
+LSOF_LICENSE_FILES = COPYING
+LSOF_CPE_ID_VENDOR = lsof_project

 ifeq ($(BR2_PACKAGE_LIBTIRPC),y)
 LSOF_DEPENDENCIES += libtirpc
--- a/package/meson/meson.hash
+++ b/package/meson/meson.hash
@ -1,4 +1,4 @@
 # Locally calculated after checking pgp signature
-# https://github.com/mesonbuild/meson/releases/download/1.2.0/meson-1.2.0.tar.gz.asc
-sha256  1c0b634fe6b6a7072e398647f1bf392048577068a5c92ae44d04085dab0ded6f  meson-1.2.0.tar.gz
+# https://github.com/mesonbuild/meson/releases/download/1.1.1/meson-1.1.1.tar.gz.asc
+sha256  d04b541f97ca439fb82fab7d0d480988be4bd4e62563a5ca35fadb5400727b1c  meson-1.1.1.tar.gz
 sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  COPYING
--- a/package/meson/meson.mk
+++ b/package/meson/meson.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-MESON_VERSION = 1.2.0
+MESON_VERSION = 1.1.1
 MESON_SITE = https://github.com/mesonbuild/meson/releases/download/$(MESON_VERSION)
 MESON_LICENSE = Apache-2.0
 MESON_LICENSE_FILES = COPYING
--- a/package/mosquitto/mosquitto.hash
+++ b/package/mosquitto/mosquitto.hash
@ -1,6 +1,6 @@
 # Locally calculated after checking gpg signature
-# from https://mosquitto.org/files/source/mosquitto-2.0.15.tar.gz.asc
-sha256  4735b1d32e3f91c7a8896741d88a3022e89730a1ee897946decfa0df27039ac6  mosquitto-2.0.15.tar.gz
+# from https://mosquitto.org/files/source/mosquitto-2.0.16.tar.gz.asc
+sha256  638db9e43e89d243ea98d10d66e76ff376131217780decd01abaffacc66d8035  mosquitto-2.0.16.tar.gz

 # License files
 sha256  d3c4ccace4e5d3cc89d34cf2a0bc85b8596bfc0a32b815d0d77f9b7c41b5350c  LICENSE.txt
--- a/package/mosquitto/mosquitto.mk
+++ b/package/mosquitto/mosquitto.mk
@ -4,7 +4,7 @@
 #
 ################################################################################

-MOSQUITTO_VERSION = 2.0.15
+MOSQUITTO_VERSION = 2.0.16
 MOSQUITTO_SITE = https://mosquitto.org/files/source
 MOSQUITTO_LICENSE = EPL-2.0 or EDLv1.0
 MOSQUITTO_LICENSE_FILES = LICENSE.txt epl-v20 edl-v10
--- a/package/mpd/Config.in
+++ b/package/mpd/Config.in
@ -127,7 +127,7 @@ config BR2_PACKAGE_MPD_LIBSNDFILE
 config BR2_PACKAGE_MPD_MAD
 	bool "mad"
 	default y
-	select BR2_PACKAGE_LIBID3TAG
+	select BR2_PACKAGE_MPD_ID3TAG
 	select BR2_PACKAGE_LIBMAD
 	help
 	  Enable mad input support.
@ -141,7 +141,7 @@ config BR2_PACKAGE_MPD_MODPLUG

 config BR2_PACKAGE_MPD_MPG123
 	bool "mpg123"
-	select BR2_PACKAGE_LIBID3TAG
+	select BR2_PACKAGE_MPD_ID3TAG
 	select BR2_PACKAGE_MPG123
 	help
 	  Enable mpg123 input support.
@ -407,6 +407,7 @@ config BR2_PACKAGE_MPD_UPNP_PUPNP

 config BR2_PACKAGE_MPD_UPNP_NPUPNP
 	bool "npupnp"
+	select BR2_PACKAGE_EXPAT
 	select BR2_PACKAGE_LIBNPUPNP
 	select BR2_PACKAGE_MPD_CURL
 	help
--- a/package/mpd/mpd.mk
+++ b/package/mpd/mpd.mk
@ -29,6 +29,13 @@ else
 MPD_CONF_OPTS += -Dzeroconf=disabled
 endif

+ifeq ($(BR2_PACKAGE_EXPAT),y)
+MPD_DEPENDENCIES += expat
+MPD_CONF_OPTS += -Dexpat=enabled
+else
+MPD_CONF_OPTS += -Dexpat=disabled
+endif
+
 # MPD prefers libicu for utf8 collation instead of libglib2.
 ifeq ($(BR2_PACKAGE_ICU),y)
 MPD_DEPENDENCIES += icu
@ -37,6 +44,13 @@ else
 MPD_CONF_OPTS += -Dicu=disabled
 endif

+ifeq ($(BR2_PACKAGE_YAJL),y)
+MPD_DEPENDENCIES += yajl
+MPD_CONF_OPTS += -Dyajl=enabled
+else
+MPD_CONF_OPTS += -Dyajl=disabled
+endif
+
 ifeq ($(BR2_PACKAGE_MPD_ALSA),y)
 MPD_DEPENDENCIES += alsa-lib
 MPD_CONF_OPTS += -Dalsa=enabled
@ -190,7 +204,7 @@ MPD_CONF_OPTS += -Dsoxr=disabled
 endif

 ifeq ($(BR2_PACKAGE_MPD_MAD),y)
-MPD_DEPENDENCIES += libid3tag libmad
+MPD_DEPENDENCIES += libmad
 MPD_CONF_OPTS += -Dmad=enabled
 else
 MPD_CONF_OPTS += -Dmad=disabled
@ -204,7 +218,7 @@ MPD_CONF_OPTS += -Dmodplug=disabled
 endif

 ifeq ($(BR2_PACKAGE_MPD_MPG123),y)
-MPD_DEPENDENCIES += libid3tag mpg123
+MPD_DEPENDENCIES += mpg123
 MPD_CONF_OPTS += -Dmpg123=enabled
 else
 MPD_CONF_OPTS += -Dmpg123=disabled
@ -251,7 +265,7 @@ MPD_CONF_OPTS += -Dpulse=disabled
 endif

 ifeq ($(BR2_PACKAGE_MPD_QOBUZ),y)
-MPD_DEPENDENCIES += libgcrypt yajl
+MPD_DEPENDENCIES += libgcrypt
 MPD_CONF_OPTS += -Dqobuz=enabled
 else
 MPD_CONF_OPTS += -Dqobuz=disabled
@ -272,7 +286,6 @@ MPD_CONF_OPTS += -Dsidplay=disabled
 endif

 ifeq ($(BR2_PACKAGE_MPD_SOUNDCLOUD),y)
-MPD_DEPENDENCIES += yajl
 MPD_CONF_OPTS += -Dsoundcloud=enabled
 else
 MPD_CONF_OPTS += -Dsoundcloud=disabled
@ -285,8 +298,10 @@ else
 MPD_CONF_OPTS += -Dsqlite=disabled
 endif

-ifneq ($(BR2_PACKAGE_MPD_TCP),y)
+ifeq ($(BR2_PACKAGE_MPD_TCP),y)
 MPD_CONF_OPTS += -Dtcp=true
+else
+MPD_CONF_OPTS += -Dtcp=false
 endif

 ifeq ($(BR2_PACKAGE_MPD_TREMOR),y)
@ -305,7 +320,6 @@ endif

 ifeq ($(BR2_PACKAGE_MPD_UPNP_PUPNP),y)
 MPD_DEPENDENCIES += \
-	expat \
 	libupnp
 MPD_CONF_OPTS += -Dupnp=pupnp
 else ifeq ($(BR2_PACKAGE_MPD_UPNP_NPUPNP),y)
--- a/package/mpv/Config.in
+++ b/package/mpv/Config.in
@ -26,6 +26,7 @@ config BR2_PACKAGE_MPV
 	select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7
 	select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7
 	select BR2_PACKAGE_XLIB_LIBXINERAMA if BR2_PACKAGE_XORG7
+	select BR2_PACKAGE_XLIB_LIBXPRESENT if BR2_PACKAGE_XORG7
 	select BR2_PACKAGE_XLIB_LIBXSCRNSAVER if BR2_PACKAGE_XORG7
 	select BR2_PACKAGE_XLIB_LIBXRANDR if BR2_PACKAGE_XORG7
 	help
--- a/package/mpv/mpv.mk
+++ b/package/mpv/mpv.mk
@ -205,7 +205,13 @@ endif
 # xlib_libXrandr, xlib_libXScrnSaver.
 ifeq ($(BR2_PACKAGE_XORG7),y)
 MPV_CONF_OPTS += --enable-x11
-MPV_DEPENDENCIES += xlib_libX11 xlib_libXext xlib_libXinerama xlib_libXrandr xlib_libXScrnSaver
+MPV_DEPENDENCIES += \
+	xlib_libX11 \
+	xlib_libXext \
+	xlib_libXinerama \
+	xlib_libXpresent \
+	xlib_libXrandr \
+	xlib_libXScrnSaver
 # XVideo
 ifeq ($(BR2_PACKAGE_XLIB_LIBXV),y)
 MPV_CONF_OPTS += --enable-xv
--- a/package/nftables/Config.in
+++ b/package/nftables/Config.in
@ -13,5 +13,10 @@ config BR2_PACKAGE_NFTABLES

 	  http://www.netfilter.org/projects/nftables/index.html

+# Legacy: this used to be handled in nftables.mk
+if BR2_PACKAGE_NFTABLES
+source "package/nftables/nftables-python/Config.in"
+endif
+
 comment "nftables needs a toolchain w/ wchar, headers >= 3.12"
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_12
--- a/Show More
+++ b/Show More