diff options
| -rw-r--r-- | mk/linux-ver.mk | 4 | ||||
| -rw-r--r-- | package/bcm28xx-bootloader/Makefile | 2 | ||||
| -rw-r--r-- | target/config/Config.in.binutils | 2 | ||||
| -rw-r--r-- | target/linux/Config.in.kernelversion | 2 | ||||
| -rw-r--r-- | target/linux/patches/6.12.58/armnommu-versatile.patch (renamed from target/linux/patches/6.12.52/armnommu-versatile.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/6.12.58/hppa-cross-compile.patch (renamed from target/linux/patches/6.12.52/hppa-cross-compile.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/6.12.58/macsonic.patch (renamed from target/linux/patches/6.12.52/macsonic.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/6.12.58/mips-vdso-gcc15.patch (renamed from target/linux/patches/6.12.52/mips-vdso-gcc15.patch) | 0 | ||||
| -rw-r--r-- | toolchain/binutils/Makefile.inc | 4 | ||||
| -rw-r--r-- | toolchain/elf2flt/Makefile | 2 |
10 files changed, 8 insertions, 8 deletions
diff --git a/mk/linux-ver.mk b/mk/linux-ver.mk index e375752a4..3bf2333c7 100644 --- a/mk/linux-ver.mk +++ b/mk/linux-ver.mk @@ -22,10 +22,10 @@ KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) KERNEL_HASH:= fdebcb065065f5c1b8dc68a6fb59cda50cdddbf9103d207c2196d55ea764f57f endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_12),y) -KERNEL_FILE_VER:= 6.12.52 +KERNEL_FILE_VER:= 6.12.58 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= b4850cf670a032c70f38b713a27d62046c5f747caf028c5f50b18f98606a9eb1 +KERNEL_HASH:= 5f1c4c546660a6a81046fdfa6195306bad2c8d17c0d69876dc100a85ad4613ac endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_6),y) KERNEL_FILE_VER:= 6.6.88 diff --git a/package/bcm28xx-bootloader/Makefile b/package/bcm28xx-bootloader/Makefile index 58ae843dc..a2d4a724f 100644 --- a/package/bcm28xx-bootloader/Makefile +++ b/package/bcm28xx-bootloader/Makefile @@ -41,7 +41,7 @@ ifeq ($(ADK_RUNTIME_VERBOSE_KERNEL_VGA_ONLY),y) $(IDIR_BCM28XX_BOOTLOADER)/boot/cmdline.txt endif printf "kernel=kernel\n" > $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt - printf "dtparam=audio,i2s,spi,i2c\n" >> \ + printf "dtparam=audio=on,spi=on,i2c_arm=on\n" >> \ $(IDIR_BCM28XX_BOOTLOADER)/boot/config.txt ifeq ($(ADK_PACKAGE_BCM28XX_BOOTLOADER_DEFAULT),y) ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI4)$(ADK_TARGET_SYSTEM_RASPBERRY_PI4_64),y) diff --git a/target/config/Config.in.binutils b/target/config/Config.in.binutils index c78550b03..a31911999 100644 --- a/target/config/Config.in.binutils +++ b/target/config/Config.in.binutils @@ -18,7 +18,7 @@ config ADK_TOOLCHAIN_BINUTILS_GIT depends on !ADK_TARGET_ARCH_AVR32 config ADK_TOOLCHAIN_BINUTILS_2_45 - bool "2.45" + bool "2.45.1" depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_NIOS2 diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion index b9f80eefb..794ddcaf2 100644 --- a/target/linux/Config.in.kernelversion +++ b/target/linux/Config.in.kernelversion @@ -51,7 +51,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_6_17 depends on !ADK_TARGET_ARCH_NDS32 config ADK_TARGET_LINUX_KERNEL_VERSION_6_12 - bool "6.12.52" + bool "6.12.58" 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.52/armnommu-versatile.patch b/target/linux/patches/6.12.58/armnommu-versatile.patch index f8f10f50b..f8f10f50b 100644 --- a/target/linux/patches/6.12.52/armnommu-versatile.patch +++ b/target/linux/patches/6.12.58/armnommu-versatile.patch diff --git a/target/linux/patches/6.12.52/hppa-cross-compile.patch b/target/linux/patches/6.12.58/hppa-cross-compile.patch index 51c24fff2..51c24fff2 100644 --- a/target/linux/patches/6.12.52/hppa-cross-compile.patch +++ b/target/linux/patches/6.12.58/hppa-cross-compile.patch diff --git a/target/linux/patches/6.12.52/macsonic.patch b/target/linux/patches/6.12.58/macsonic.patch index 51e76113b..51e76113b 100644 --- a/target/linux/patches/6.12.52/macsonic.patch +++ b/target/linux/patches/6.12.58/macsonic.patch diff --git a/target/linux/patches/6.12.52/mips-vdso-gcc15.patch b/target/linux/patches/6.12.58/mips-vdso-gcc15.patch index c18bc6c92..c18bc6c92 100644 --- a/target/linux/patches/6.12.52/mips-vdso-gcc15.patch +++ b/target/linux/patches/6.12.58/mips-vdso-gcc15.patch diff --git a/toolchain/binutils/Makefile.inc b/toolchain/binutils/Makefile.inc index 1ce4bd821..abc8362b3 100644 --- a/toolchain/binutils/Makefile.inc +++ b/toolchain/binutils/Makefile.inc @@ -3,9 +3,9 @@ PKG_NAME:= binutils ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_45),y) -PKG_VERSION:= 2.45 +PKG_VERSION:= 2.45.1 PKG_RELEASE:= 1 -PKG_HASH:= 8a3eb4b10e7053312790f21ee1a38f7e2bbd6f4096abb590d3429e5119592d96 +PKG_HASH:= 2b63ae0ad015eb2755294f127bfd179c1849979dd87b6e8e1a7376964a4323dc PKG_SITES:= ${MASTER_SITE_GNU:=binutils/} DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz endif diff --git a/toolchain/elf2flt/Makefile b/toolchain/elf2flt/Makefile index 30c42b2b9..b8e74da75 100644 --- a/toolchain/elf2flt/Makefile +++ b/toolchain/elf2flt/Makefile @@ -11,7 +11,7 @@ BINUTILS_VERSION:= git BFDLIB:= .libs/libbfd.a endif ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_45),y) -BINUTILS_VERSION:= 2.45 +BINUTILS_VERSION:= 2.45.1 BFDLIB:= .libs/libbfd.a endif ifeq ($(ADK_TOOLCHAIN_BINUTILS_2_44),y) |