diff options
| -rw-r--r-- | mk/linux-ver.mk | 10 | ||||
| -rw-r--r-- | target/linux/Config.in.kernelversion | 6 | ||||
| -rw-r--r-- | target/linux/patches/6.12.52/armnommu-versatile.patch (renamed from target/linux/patches/6.12.41/armnommu-versatile.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/6.12.52/hppa-cross-compile.patch (renamed from target/linux/patches/6.12.41/hppa-cross-compile.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/6.12.52/macsonic.patch (renamed from target/linux/patches/6.12.41/macsonic.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/6.12.52/mips-vdso-gcc15.patch (renamed from target/linux/patches/6.12.41/mips-vdso-gcc15.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/6.17.2/0001-pcmcia-Add-Hitachi-HD6446x-PCMCIA-socket-support.patch (renamed from target/linux/patches/6.16.7/0001-pcmcia-Add-Hitachi-HD6446x-PCMCIA-socket-support.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/6.17.2/orinoco.patch (renamed from target/linux/patches/6.16.7/orinoco.patch) | 0 | ||||
| -rw-r--r-- | toolchain/uclibc-ng/Makefile | 5 |
9 files changed, 13 insertions, 8 deletions
diff --git a/mk/linux-ver.mk b/mk/linux-ver.mk index 2c4edffb5..e375752a4 100644 --- a/mk/linux-ver.mk +++ b/mk/linux-ver.mk @@ -15,17 +15,17 @@ 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_16),y) -KERNEL_FILE_VER:= 6.16.7 +ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_17),y) +KERNEL_FILE_VER:= 6.17.2 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= 5be3daa1f9427b1bdb34c4894d9c1adfac38cff674376fe0611a3065729a1a81 +KERNEL_HASH:= fdebcb065065f5c1b8dc68a6fb59cda50cdddbf9103d207c2196d55ea764f57f endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_12),y) -KERNEL_FILE_VER:= 6.12.41 +KERNEL_FILE_VER:= 6.12.52 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= 6b19a3ae99423de2416964d67251d745910277af258b4c4c63e88fd87dbf0e27 +KERNEL_HASH:= b4850cf670a032c70f38b713a27d62046c5f747caf028c5f50b18f98606a9eb1 endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_6),y) KERNEL_FILE_VER:= 6.6.88 diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion index 36bce6867..b9f80eefb 100644 --- a/target/linux/Config.in.kernelversion +++ b/target/linux/Config.in.kernelversion @@ -39,8 +39,8 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_GIT depends on !ADK_TARGET_ARCH_NDS32 select ADK_HOST_NEED_LZ4 if ADK_TARGET_SYSTEM_PHYTEC_WEGA && ADK_TARGET_LINUX_KERNEL_VERSION_GIT -config ADK_TARGET_LINUX_KERNEL_VERSION_6_16 - bool "6.16.7" +config ADK_TARGET_LINUX_KERNEL_VERSION_6_17 + bool "6.17.2" depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_BFIN depends on !ADK_TARGET_ARCH_C6X @@ -51,7 +51,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_6_16 depends on !ADK_TARGET_ARCH_NDS32 config ADK_TARGET_LINUX_KERNEL_VERSION_6_12 - bool "6.12.41" + bool "6.12.52" depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_BFIN depends on !ADK_TARGET_ARCH_C6X diff --git a/target/linux/patches/6.12.41/armnommu-versatile.patch b/target/linux/patches/6.12.52/armnommu-versatile.patch index f8f10f50b..f8f10f50b 100644 --- a/target/linux/patches/6.12.41/armnommu-versatile.patch +++ b/target/linux/patches/6.12.52/armnommu-versatile.patch diff --git a/target/linux/patches/6.12.41/hppa-cross-compile.patch b/target/linux/patches/6.12.52/hppa-cross-compile.patch index 51c24fff2..51c24fff2 100644 --- a/target/linux/patches/6.12.41/hppa-cross-compile.patch +++ b/target/linux/patches/6.12.52/hppa-cross-compile.patch diff --git a/target/linux/patches/6.12.41/macsonic.patch b/target/linux/patches/6.12.52/macsonic.patch index 51e76113b..51e76113b 100644 --- a/target/linux/patches/6.12.41/macsonic.patch +++ b/target/linux/patches/6.12.52/macsonic.patch diff --git a/target/linux/patches/6.12.41/mips-vdso-gcc15.patch b/target/linux/patches/6.12.52/mips-vdso-gcc15.patch index c18bc6c92..c18bc6c92 100644 --- a/target/linux/patches/6.12.41/mips-vdso-gcc15.patch +++ b/target/linux/patches/6.12.52/mips-vdso-gcc15.patch diff --git a/target/linux/patches/6.16.7/0001-pcmcia-Add-Hitachi-HD6446x-PCMCIA-socket-support.patch b/target/linux/patches/6.17.2/0001-pcmcia-Add-Hitachi-HD6446x-PCMCIA-socket-support.patch index 5c46fe5e4..5c46fe5e4 100644 --- a/target/linux/patches/6.16.7/0001-pcmcia-Add-Hitachi-HD6446x-PCMCIA-socket-support.patch +++ b/target/linux/patches/6.17.2/0001-pcmcia-Add-Hitachi-HD6446x-PCMCIA-socket-support.patch diff --git a/target/linux/patches/6.16.7/orinoco.patch b/target/linux/patches/6.17.2/orinoco.patch index 6401013fd..6401013fd 100644 --- a/target/linux/patches/6.16.7/orinoco.patch +++ b/target/linux/patches/6.17.2/orinoco.patch diff --git a/toolchain/uclibc-ng/Makefile b/toolchain/uclibc-ng/Makefile index 05ecb61bf..52e86c60e 100644 --- a/toolchain/uclibc-ng/Makefile +++ b/toolchain/uclibc-ng/Makefile @@ -74,6 +74,11 @@ ifeq ($(ADK_TARGET_SOFT_FLOAT),y) $(SED) 's/.*\(UCLIBC_HAS_FENV\).*/# \1 is not set/' ${WRKBUILD}/.config $(SED) 's/.*\(UCLIBC_HAS_SOFT_FLOAT\).*/#\1=y/' ${WRKBUILD}/.config endif +ifeq ($(ADK_TARGET_SOFTFP_FLOAT),y) + $(SED) 's/.*\(UCLIBC_HAS_FPU\).*/# \1 is not set/' ${WRKBUILD}/.config + $(SED) 's/.*\(UCLIBC_HAS_FENV\).*/# \1 is not set/' ${WRKBUILD}/.config + $(SED) 's/.*\(UCLIBC_HAS_SOFT_FLOAT\).*/#\1=y/' ${WRKBUILD}/.config +endif ifeq ($(ADK_TARGET_HARD_FLOAT),y) $(SED) 's/.*\(UCLIBC_HAS_FPU\).*/\1=y/' ${WRKBUILD}/.config $(SED) 's/.*\(UCLIBC_HAS_SOFT_FLOAT\).*/# \1 is not set/' ${WRKBUILD}/.config |