5 files changed, 66 insertions, 18 deletions
diff --git a/target/config/Config.in.binutils b/target/config/Config.in.binutils
index 75b43639a..79c1f5dfb 100644
--- a/target/config/Config.in.binutils
+++ b/target/config/Config.in.binutils
@@ -8,12 +8,18 @@ default ADK_TOOLCHAIN_BINUTILS_ARC if ADK_TARGET_CPU_ARC_ARC64
 default ADK_TOOLCHAIN_BINUTILS_AVR32 if ADK_TARGET_ARCH_AVR32
 default ADK_TOOLCHAIN_BINUTILS_KVX if ADK_TARGET_ARCH_KVX
 default ADK_TOOLCHAIN_BINUTILS_NDS32 if ADK_TARGET_ARCH_NDS32
-default ADK_TOOLCHAIN_BINUTILS_2_43_1
+default ADK_TOOLCHAIN_BINUTILS_2_43_1 if ADK_TARGET_ARCH_NIOS2
+default ADK_TOOLCHAIN_BINUTILS_2_44
 
 config ADK_TOOLCHAIN_BINUTILS_GIT
 	bool "git"
 	depends on !ADK_TARGET_ARCH_AVR32
 
+config ADK_TOOLCHAIN_BINUTILS_2_44
+	bool "2.44"
+	depends on !ADK_TARGET_ARCH_AVR32
+	depends on !ADK_TARGET_ARCH_NIOS2
+
 config ADK_TOOLCHAIN_BINUTILS_2_43_1
 	bool "2.43.1"
 	depends on !ADK_TARGET_ARCH_AVR32
diff --git a/target/config/Config.in.compiler b/target/config/Config.in.compiler
index d744915dc..4c07e594e 100644
--- a/target/config/Config.in.compiler
+++ b/target/config/Config.in.compiler
@@ -98,6 +98,39 @@ config ADK_TOOLCHAIN_GCC_7
 	depends on !ADK_TARGET_ARCH_OR1K
 	depends on !ADK_TARGET_ARCH_LOONGARCH
 
+config ADK_TOOLCHAIN_GCC_6
+	bool "6.5.0"
+	depends on !ADK_TARGET_ARCH_ARC
+	depends on !ADK_TARGET_ARCH_AVR32
+	depends on !ADK_TARGET_ARCH_CSKY
+	depends on !ADK_TARGET_ARCH_HPPA
+	depends on !ADK_TARGET_ARCH_METAG
+	depends on !ADK_TARGET_ARCH_NDS32
+	depends on !ADK_TARGET_ARCH_OR1K
+	depends on !ADK_TARGET_ARCH_LOONGARCH
+
+config ADK_TOOLCHAIN_GCC_5
+	bool "5.5.0"
+	depends on !ADK_TARGET_ARCH_ARC
+	depends on !ADK_TARGET_ARCH_AVR32
+	depends on !ADK_TARGET_ARCH_CSKY
+	depends on !ADK_TARGET_ARCH_HPPA
+	depends on !ADK_TARGET_ARCH_METAG
+	depends on !ADK_TARGET_ARCH_NDS32
+	depends on !ADK_TARGET_ARCH_OR1K
+	depends on !ADK_TARGET_ARCH_LOONGARCH
+
+config ADK_TOOLCHAIN_GCC_4
+	bool "4.9.4"
+	depends on !ADK_TARGET_ARCH_ARC
+	depends on !ADK_TARGET_ARCH_AVR32
+	depends on !ADK_TARGET_ARCH_CSKY
+	depends on !ADK_TARGET_ARCH_HPPA
+	depends on !ADK_TARGET_ARCH_METAG
+	depends on !ADK_TARGET_ARCH_NDS32
+	depends on !ADK_TARGET_ARCH_OR1K
+	depends on !ADK_TARGET_ARCH_LOONGARCH
+
 config ADK_TOOLCHAIN_GCC_ARC
 	bool "arc-2023.09"
 	depends on ADK_TARGET_ARCH_ARC
diff --git a/target/config/Config.in.kernelfmt b/target/config/Config.in.kernelfmt
index 2a1fb1e9f..b80853385 100644
--- a/target/config/Config.in.kernelfmt
+++ b/target/config/Config.in.kernelfmt
@@ -84,6 +84,25 @@ config ADK_TARGET_KERNEL_LOADADDR
 	default 0x40008000 if ADK_TARGET_SYSTEM_ORANGE_PI0
 	default 0xc0008000 if ADK_TARGET_SYSTEM_ST_STM32F746G
 
+config ADK_TARGET_KERNEL_VENDORED_DTB
+	bool
+	default y
+	default n if ADK_TARGET_LINUX_KERNEL_VERSION_6_1
+	default n if ADK_TARGET_LINUX_KERNEL_VERSION_5_15
+	default n if ADK_TARGET_LINUX_KERNEL_VERSION_5_10
+	default n if ADK_TARGET_LINUX_KERNEL_VERSION_5_4
+	default n if ADK_TARGET_LINUX_KERNEL_VERSION_4_19
+	default n if ADK_TARGET_LINUX_KERNEL_VERSION_4_14
+	default n if ADK_TARGET_LINUX_KERNEL_VERSION_4_9
+	default n if ADK_TARGET_LINUX_KERNEL_VERSION_4_4
+	default n if ADK_TARGET_LINUX_KERNEL_VERSION_3_16
+	default n if ADK_TARGET_LINUX_KERNEL_VERSION_3_4
+	default n if ADK_TARGET_LINUX_KERNEL_VERSION_2_6_32
+	help
+	  Starting with linux-6.5, DTB files sit in vendor-specific
+	  sub-directories.
+
 config ADK_TARGET_KERNEL_APPEND_DTB
 	string
-	default "armada-xp-synology-ds414" if ADK_TARGET_SYSTEM_SYNOLOGY_DS414
+	default "armada-xp-synology-ds414" if ADK_TARGET_SYSTEM_SYNOLOGY_DS414 && !ADK_TARGET_KERNEL_VENDORED_DTB
+	default "marvell/armada-xp-synology-ds414" if ADK_TARGET_SYSTEM_SYNOLOGY_DS414 && ADK_TARGET_KERNEL_VENDORED_DTB
diff --git a/target/config/Config.in.libc b/target/config/Config.in.libc
index aff202edf..2cb1fccec 100644
--- a/target/config/Config.in.libc
+++ b/target/config/Config.in.libc
@@ -79,13 +79,11 @@ config ADK_TARGET_LIB_GLIBC
 		ADK_TARGET_ARCH_ARM || \
 		ADK_TARGET_ARCH_CSKY || \
 		ADK_TARGET_ARCH_HPPA || \
-		ADK_TARGET_ARCH_IA64 || \
 		ADK_TARGET_ARCH_LOONGARCH || \
 		ADK_TARGET_ARCH_M68K || \
 		ADK_TARGET_ARCH_MICROBLAZE || \
 		ADK_TARGET_ARCH_MIPS || \
 		ADK_TARGET_ARCH_MIPS64 || \
-		ADK_TARGET_ARCH_NIOS2 || \
 		ADK_TARGET_ARCH_OR1K || \
 		ADK_TARGET_ARCH_PPC || \
 		ADK_TARGET_ARCH_PPC64 || \
@@ -150,16 +148,16 @@ choice
 prompt "Target C library version"
 depends on !ADK_TARGET_CHOOSE_ARCH
 
-config ADK_TARGET_LIB_UCLIBC_NG_1_0_50
-	bool "1.0.50"
+config ADK_TARGET_LIB_UCLIBC_NG_1_0_51
+	bool "1.0.51"
 	depends on ADK_TARGET_LIB_UCLIBC_NG
 
 config ADK_TARGET_LIB_UCLIBC_NG_GIT
 	bool "git"
 	depends on ADK_TARGET_LIB_UCLIBC_NG && ADK_EXPERIMENTAL
 
-config ADK_TARGET_LIB_GLIBC_2_40
-	bool "2.40"
+config ADK_TARGET_LIB_GLIBC_2_41
+	bool "2.41"
 	depends on ADK_TARGET_LIB_GLIBC
 
 config ADK_TARGET_LIB_GLIBC_GIT
@@ -200,9 +198,9 @@ config ADK_TARGET_LIBC
 
 config ADK_LIBC_VERSION
 	string
-	default "1.0.50" if ADK_TARGET_LIB_UCLIBC_NG_1_0_50
+	default "1.0.51" if ADK_TARGET_LIB_UCLIBC_NG_1_0_51
 	default "1.2.5" if ADK_TARGET_LIB_MUSL_1_2_5
-	default "2.40" if ADK_TARGET_LIB_GLIBC_2_40
+	default "2.41" if ADK_TARGET_LIB_GLIBC_2_40
 	default "4.4.0" if ADK_TARGET_LIB_NEWLIB_4_4_0
 	default "git" if ADK_TARGET_LIB_UCLIBC_NG_GIT || \
 		         ADK_TARGET_LIB_MUSL_GIT || \
diff --git a/target/config/Config.in.toolchain b/target/config/Config.in.toolchain
index 144f92a9b..7b5bc2d5b 100644
--- a/target/config/Config.in.toolchain
+++ b/target/config/Config.in.toolchain
@@ -85,14 +85,6 @@ config ADK_TARGET_USE_LD_BIND_NOW
 config ADK_TARGET_USE_LD_GC
 	bool "Use LD garbage collection for all packages"
 
-config ADK_TOOLCHAIN_WITH_GOLD
-	bool "Enable building of GOLD linker"
-
-config ADK_TARGET_USE_GOLD
-	bool "Use GOLD as default linker"
-	depends on ADK_TOOLCHAIN_WITH_GOLD
-	depends on ADK_TARGET_LIB_GLIBC # can not be build with GOLD (glibc 2.24 checked)
-
 config ADK_TARGET_USE_GNU_HASHSTYLE
 	bool "Use GNU hashstyle for all packages"
 	depends on !ADK_TARGET_ARCH_MIPS