8 files changed, 42 insertions, 77 deletions
diff --git a/target/arm/kernel/linksys-nslu2 b/target/arm/kernel/linksys-nslu2
index 39eb3e89f..924970b7c 100644
--- a/target/arm/kernel/linksys-nslu2
+++ b/target/arm/kernel/linksys-nslu2
@@ -45,76 +45,3 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y
 CONFIG_MTD_PHYSMAP=y
 CONFIG_MTD_PHYSMAP_OF=y
 CONFIG_MTD_PHYSMAP_IXP4XX=y
-CONFIG_NET_VENDOR_XSCALE=y
-CONFIG_IXP4XX_ETH=y
-CONFIG_PHYLIB=y
-CONFIG_SWPHY=y
-CONFIG_PHYLIB_LEDS=y
-CONFIG_FIXED_PHY=y
-CONFIG_AMD_PHY=y
-CONFIG_REALTEK_PHY=y
-CONFIG_REALTEK_PHY_HWMON=y
-CONFIG_MDIO_DEVICE=y
-CONFIG_MDIO_BUS=y
-CONFIG_FWNODE_MDIO=y
-CONFIG_OF_MDIO=y
-CONFIG_MDIO_DEVRES=y
-CONFIG_IXP4XX_HSS=y
-CONFIG_SERIAL_EARLYCON=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_8250_16550A_VARIANTS=y
-CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_NR_UARTS=2
-CONFIG_SERIAL_8250_RUNTIME_UARTS=2
-CONFIG_SERIAL_8250_FSL=y
-CONFIG_SERIAL_OF_PLATFORM=y
-CONFIG_SERIAL_CORE=y
-CONFIG_SERIAL_CORE_CONSOLE=y
-CONFIG_SERIAL_MCTRL_GPIO=y
-CONFIG_HW_RANDOM=y
-CONFIG_HW_RANDOM_IXP4XX=y
-CONFIG_DEVPORT=y
-CONFIG_I2C=y
-CONFIG_I2C_BOARDINFO=y
-CONFIG_I2C_CHARDEV=y
-CONFIG_I2C_ALGOBIT=y
-CONFIG_I2C_GPIO=y
-CONFIG_I2C_IOP3XX=y
-CONFIG_PTP_1588_CLOCK_OPTIONAL=y
-CONFIG_GPIOLIB=y
-CONFIG_GPIOLIB_FASTPATH_LIMIT=512
-CONFIG_OF_GPIO=y
-CONFIG_GPIOLIB_IRQCHIP=y
-CONFIG_GPIO_SYSFS=y
-CONFIG_GPIO_CDEV=y
-CONFIG_GPIO_GENERIC=y
-CONFIG_GPIO_IXP4XX=y
-CONFIG_GPIO_GW_PLD=y
-CONFIG_POWER_RESET=y
-CONFIG_POWER_RESET_GPIO=y
-CONFIG_HWMON=y
-CONFIG_RTC_LIB=y
-CONFIG_RTC_MC146818_LIB=y
-CONFIG_RTC_CLASS=y
-CONFIG_RTC_HCTOSYS=y
-CONFIG_RTC_HCTOSYS_DEVICE="rtc0"
-CONFIG_RTC_SYSTOHC=y
-CONFIG_RTC_SYSTOHC_DEVICE="rtc0"
-CONFIG_RTC_INTF_SYSFS=y
-CONFIG_RTC_INTF_PROC=y
-CONFIG_RTC_INTF_DEV=y
-CONFIG_RTC_DRV_X1205=m
-CONFIG_RTC_I2C_AND_SPI=y
-CONFIG_RTC_DRV_CMOS=y
-CONFIG_STAGING=y
-CONFIG_HAVE_CLK=y
-CONFIG_HAVE_CLK_PREPARE=y
-CONFIG_COMMON_CLK=y
-CONFIG_TIMER_OF=y
-CONFIG_TIMER_PROBE=y
-CONFIG_CLKSRC_MMIO=y
-CONFIG_IXP4XX_TIMER=y
-CONFIG_IXP4XX_QMGR=y
-CONFIG_IXP4XX_NPE=y
-CONFIG_IRQCHIP=y
-CONFIG_IXP4XX_IRQ=y
diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion
index cb1d110fe..1d1e262a8 100644
--- a/target/linux/Config.in.kernelversion
+++ b/target/linux/Config.in.kernelversion
@@ -51,7 +51,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_6_14
 	depends on !ADK_TARGET_ARCH_NDS32
 
 config ADK_TARGET_LINUX_KERNEL_VERSION_6_12
-	bool "6.12.18"
+	bool "6.12.23"
 	depends on !ADK_TARGET_ARCH_AVR32
 	depends on !ADK_TARGET_ARCH_BFIN
 	depends on !ADK_TARGET_ARCH_C6X
diff --git a/target/linux/config/Config.in.network b/target/linux/config/Config.in.network
index db330f0f1..8d1906caf 100644
--- a/target/linux/config/Config.in.network
+++ b/target/linux/config/Config.in.network
@@ -31,8 +31,6 @@ config ADK_LINUX_KERNEL_INET
 	select ADK_LINUX_KERNEL_NET_CORE
 	select ADK_LINUX_KERNEL_NETDEVICES
 	select ADK_LINUX_KERNEL_ETHERNET
-	select ADK_LINUX_KERNEL_CRYPTO
-	select ADK_LINUX_KERNEL_CRYPTO_AES
 	default y
 
 config ADK_LINUX_KERNEL_IP_FIB_HASH
diff --git a/target/linux/config/Config.in.serial b/target/linux/config/Config.in.serial
index db4c1d999..eb891d86b 100644
--- a/target/linux/config/Config.in.serial
+++ b/target/linux/config/Config.in.serial
@@ -120,7 +120,8 @@ config ADK_LINUX_KERNEL_SERIAL_8250
 						|| ADK_TARGET_SYSTEM_SOM_C6745 \
 						|| ADK_TARGET_SYSTEM_ROCKPI4_PLUS \
 						|| ADK_TARGET_SYSTEM_STARFIVE_VISIONFIVE2 \
-						|| ADK_TARGET_SYSTEM_PCDUINO_3B
+						|| ADK_TARGET_SYSTEM_PCDUINO_3B \
+						|| ADK_TARGET_SYSTEM_LINKSYS_NSLU2
 	select ADK_LINUX_KERNEL_SERIAL_8250_PNP if ADK_TARGET_SYSTEM_PCENGINES_APU
 	select ADK_LINUX_KERNEL_SERIAL_8250_DW if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG
 	select ADK_LINUX_KERNEL_SERIAL_8250_DW if ADK_TARGET_SYSTEM_ORANGE_PI0
diff --git a/target/linux/patches/6.12.18/armnommu-versatile.patch b/target/linux/patches/6.12.23/armnommu-versatile.patch
index f8f10f50b..f8f10f50b 100644
--- a/target/linux/patches/6.12.18/armnommu-versatile.patch
+++ b/target/linux/patches/6.12.23/armnommu-versatile.patch
diff --git a/target/linux/patches/6.12.18/hppa-cross-compile.patch b/target/linux/patches/6.12.23/hppa-cross-compile.patch
index 51c24fff2..51c24fff2 100644
--- a/target/linux/patches/6.12.18/hppa-cross-compile.patch
+++ b/target/linux/patches/6.12.23/hppa-cross-compile.patch
diff --git a/target/linux/patches/6.12.18/macsonic.patch b/target/linux/patches/6.12.23/macsonic.patch
index 51e76113b..51e76113b 100644
--- a/target/linux/patches/6.12.18/macsonic.patch
+++ b/target/linux/patches/6.12.23/macsonic.patch
diff --git a/target/linux/patches/6a2f2e4198eaff63ee75f6085ce9f966c47b4441/flat-fix-debug-output.patch b/target/linux/patches/6a2f2e4198eaff63ee75f6085ce9f966c47b4441/flat-fix-debug-output.patch
new file mode 100644
index 000000000..8ca77b3c7
--- /dev/null
+++ b/target/linux/patches/6a2f2e4198eaff63ee75f6085ce9f966c47b4441/flat-fix-debug-output.patch
@@ -0,0 +1,39 @@
+--- /home/mirabilos/q/linux-6a2f2e4198eaff63ee75f6085ce9f966c47b4441/arch/lm32/kernel/flat.c	2025-04-13 20:33:20.000000000 +0000
++++ linux-6a2f2e4198eaff63ee75f6085ce9f966c47b4441/arch/lm32/kernel/flat.c	2025-04-14 02:40:22.277112693 +0000
+@@ -23,13 +20,13 @@ unsigned long lm32_get_addr_from_rp(unsi
+ 
+ 	switch (type) {
+ 	case FLAT_LM32_RELOC_TYPE_32_BIT:
+-		pr_debug("*ptr = %lx", get_unaligned(ptr));
++		pr_debug("*ptr = %lx at %p\n", get_unaligned(ptr), ptr);
+ 		val = get_unaligned(ptr);
+ 		break;
+ 
+ 	case FLAT_LM32_RELOC_TYPE_LO16_BIT:
+ 	case FLAT_LM32_RELOC_TYPE_HI16_BIT:
+-		pr_debug("*usptr = %x", get_unaligned(usptr));
++		pr_debug("*usptr = %x at %p\n", get_unaligned(usptr), usptr);
+ 		val = get_unaligned(usptr) & 0xffff;
+ 		val += *persistent;
+ 		break;
+@@ -56,17 +53,17 @@ void lm32_put_addr_at_rp(unsigned long *
+ 	switch (type) {
+ 	case FLAT_LM32_RELOC_TYPE_32_BIT:
+ 		put_unaligned(addr, ptr);
+-		pr_debug("new ptr =%lx", get_unaligned(ptr));
++		pr_debug("new value %lx at %p\n", get_unaligned(ptr), ptr);
+ 		break;
+ 
+ 	case FLAT_LM32_RELOC_TYPE_LO16_BIT:
+ 		put_unaligned(addr, usptr);
+-		pr_debug("new value %x at %p", get_unaligned(usptr), usptr);
++		pr_debug("new value %x (lo) at %p\n", get_unaligned(usptr), usptr);
+ 		break;
+ 
+ 	case FLAT_LM32_RELOC_TYPE_HI16_BIT:
+ 		put_unaligned(addr >> 16, usptr);
+-		pr_debug("new value %x at %p", get_unaligned(usptr), usptr);
++		pr_debug("new value %x (hi) at %p\n", get_unaligned(usptr), usptr);
+ 		break;
+ 
+ 	}