summaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2025-01-29 04:39:12 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2025-01-29 04:39:12 +0100
commit5a8f5eed609e43352e5b57a10ef12015c45f57d8 (patch)
treec2b497e643e7cd4bf378c0381e6212e3c2c16b7f /target
parentc39d6baf626482c2511b17e8b318f38cfb00d248 (diff)
linux: update to 6.12.11
Diffstat (limited to 'target')
-rw-r--r--target/arm/Makefile2
-rw-r--r--target/linux/Config.in.kernelversion4
2 files changed, 3 insertions, 3 deletions
diff --git a/target/arm/Makefile b/target/arm/Makefile
index 280e954b7..9ce20ef4f 100644
--- a/target/arm/Makefile
+++ b/target/arm/Makefile
@@ -180,7 +180,7 @@ ifeq ($(ADK_TARGET_FS),squashfs)
dd conv=notrunc if=$(BUILD_DIR)/root.squashfs of=$(FW_DIR)/$(ROOTFSSQUASHFS)
endif
-ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_6)$(ADK_TARGET_LINUX_KERNEL_VERSION_6_9)$(ADK_TARGET_LINUX_KERNEL_VERSION_GIT),y)
+ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_6)$(ADK_TARGET_LINUX_KERNEL_VERSION_6_12)$(ADK_TARGET_LINUX_KERNEL_VERSION_GIT),y)
ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB),y)
VENDOR:=arm/
endif
diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion
index 73c7d73da..2efbfc4c2 100644
--- a/target/linux/Config.in.kernelversion
+++ b/target/linux/Config.in.kernelversion
@@ -39,8 +39,8 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_GIT
select ADK_TARGET_LINUX_KERNEL_IMAGE if ADK_TARGET_SYSTEM_SOLIDRUN_IMX6
select ADK_TARGET_LINUX_KERNEL_IMAGE if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK
-config ADK_TARGET_LINUX_KERNEL_VERSION_6_11
- bool "6.11.3"
+config ADK_TARGET_LINUX_KERNEL_VERSION_6_12
+ bool "6.12.11"
depends on !ADK_TARGET_ARCH_AVR32
depends on !ADK_TARGET_ARCH_BFIN
depends on !ADK_TARGET_ARCH_C6X