From 5a8f5eed609e43352e5b57a10ef12015c45f57d8 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb <wbx@openadk.org> Date: Wed, 29 Jan 2025 04:39:12 +0100 Subject: linux: update to 6.12.11 --- mk/linux-ver.mk | 6 +++--- target/arm/Makefile | 2 +- target/linux/Config.in.kernelversion | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mk/linux-ver.mk b/mk/linux-ver.mk index 89a055e69..fa1c36fa2 100644 --- a/mk/linux-ver.mk +++ b/mk/linux-ver.mk @@ -15,11 +15,11 @@ KERNEL_FILE_VER:= $(ADK_TARGET_LINUX_KERNEL_GIT) KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(ADK_TARGET_LINUX_KERNEL_GIT_VER)-$(KERNEL_RELEASE) endif -ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_11),y) -KERNEL_FILE_VER:= 6.11.3 +ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_12),y) +KERNEL_FILE_VER:= 6.12.11 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= 057263d0afc17d5253794afd3d239ba4da4aa734b22fa36c1665f41b95449b73 +KERNEL_HASH:= 475172fdbd87a153f123a57952672e773bdb6daf5b58a417d1a5e419fcfeec49 endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_6),y) KERNEL_FILE_VER:= 6.6.74 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 -- cgit v1.2.3