diff options
22 files changed, 67 insertions, 45 deletions
diff --git a/mk/linux-ver.mk b/mk/linux-ver.mk index 1df185d77..62b96465b 100644 --- a/mk/linux-ver.mk +++ b/mk/linux-ver.mk @@ -16,22 +16,16 @@ KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(ADK_TARGET_LINUX_KERNEL_GIT_VER)-$(KERNEL_RELEASE) endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_9),y) -KERNEL_FILE_VER:= 6.9.2 +KERNEL_FILE_VER:= 6.9.3 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= d46c5bdf2c5961cc2a4dedefe0434d456865e95e4a7cd9f93fff054f9090e5f9 -endif -ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_8),y) -KERNEL_FILE_VER:= 6.8.11 -KERNEL_RELEASE:= 1 -KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= b78dcd09f6b725872a2c0c87a70a064b0fbbcccfe5ce60aa46c669934a9e28b6 +KERNEL_HASH:= c321c46401368774fc236f57095b205a5da57415f9a6008018902f9fd5eddfae endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_6),y) -KERNEL_FILE_VER:= 6.6.30 +KERNEL_FILE_VER:= 6.6.32 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= b66a5b863b0f8669448b74ca83bd641a856f164b29956e539bbcb5fdeeab9cc6 +KERNEL_HASH:= aaa824eaf07f61911d22b75ff090a403c3dd0bd73e23933e0bba8b5971436ce1 endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_1),y) KERNEL_FILE_VER:= 6.1.90 diff --git a/package/libressl/Makefile b/package/libressl/Makefile index ca08f24df..f5df34fc5 100644 --- a/package/libressl/Makefile +++ b/package/libressl/Makefile @@ -4,9 +4,9 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= libressl -PKG_VERSION:= 3.9.1 +PKG_VERSION:= 3.9.2 PKG_RELEASE:= 1 -PKG_HASH:= 6da0b954695f7ee62b03f64200a8a4f02af93717b60cce04ab6c8df262c07a51 +PKG_HASH:= 7b031dac64a59eb6ee3304f7ffb75dad33ab8c9d279c847f92c89fb846068f97 PKG_DESCR:= ssl/tls library PKG_SECTION:= libs/crypto PKG_URL:= http://www.libressl.org diff --git a/target/arm/Makefile b/target/arm/Makefile index 1e2cc478b..d6dab6af0 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -175,7 +175,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),y) +ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_6)$(ADK_TARGET_LINUX_KERNEL_VERSION_6_9),y) ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB),y) VENDOR:=arm/ endif @@ -191,6 +191,9 @@ endif ifeq ($(ADK_TARGET_SYSTEM_ST_STM32F746G),y) VENDOR:=st/ endif +ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_IMX6),y) +VENDOR:=nxp/imx/ +endif endif dtb-install: @@ -240,8 +243,8 @@ ifeq ($(ADK_TARGET_SYSTEM_BANANA_P2_ZERO),y) ${KERNEL_MAKE} sun8i-h2-plus-bananapi-m2-zero.dtb $(MAKE_TRACE) endif ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_IMX6),y) - ${KERNEL_MAKE} imx6q-cubox-i.dtb imx6dl-cubox-i.dtb \ - imx6dl-hummingboard.dtb imx6q-hummingboard.dtb $(MAKE_TRACE) + ${KERNEL_MAKE} $(VENDOR)imx6q-cubox-i.dtb $(VENDOR)imx6dl-cubox-i.dtb \ + $(VENDOR)imx6dl-hummingboard.dtb $(VENDOR)imx6q-hummingboard.dtb $(MAKE_TRACE) endif ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG),y) ${KERNEL_MAKE} armada-388-clearfog.dtb $(MAKE_TRACE) diff --git a/target/config/Config.in.binutils b/target/config/Config.in.binutils index ef512dc56..7a7d2ff82 100644 --- a/target/config/Config.in.binutils +++ b/target/config/Config.in.binutils @@ -60,7 +60,7 @@ config ADK_TOOLCHAIN_BINUTILS_KVX depends on ADK_TARGET_ARCH_KVX config ADK_TOOLCHAIN_BINUTILS_XTENSA - bool "xtensa-fdpic-abi-spec-1.3" + bool "xtensa-fdpic-abi-spec-1.4" depends on ADK_TARGET_ARCH_XTENSA endchoice diff --git a/target/config/Config.in.cmdline b/target/config/Config.in.cmdline index e575f52d0..782f51efe 100644 --- a/target/config/Config.in.cmdline +++ b/target/config/Config.in.cmdline @@ -7,7 +7,6 @@ config ADK_TARGET_CMDLINE default "geodewdt.nowayout=1" if ADK_TARGET_MODEL_PCENGINES_ALIX1C default "kinetis_platform=k70-som" if ADK_TARGET_SYSTEM_KINETIS_K70 default "metag_da.console_poll=1" if ADK_TARGET_SYSTEM_QEMU_METAG - default "earlycon=uart8250,mmio32,0x9d050020,115200n8 memmap=256M@0x60000000" if ADK_TARGET_CPU_XTENSA_DE212 default "earlyprintk=uart8250-32bit,0x99600000" if ADK_TARGET_SYSTEM_ANDES_AG101P default "earlycon noiotrap" if ADK_TARGET_SYSTEM_NUMATO_MIMASV2 default "" diff --git a/target/config/Config.in.compiler b/target/config/Config.in.compiler index 243cda958..2b2303c14 100644 --- a/target/config/Config.in.compiler +++ b/target/config/Config.in.compiler @@ -123,7 +123,7 @@ config ADK_TOOLCHAIN_GCC_KVX depends on ADK_TARGET_ARCH_KVX config ADK_TOOLCHAIN_GCC_XTENSA - bool "xtensa-fdpic-abi-spec-1.3" + bool "xtensa-fdpic-abi-spec-1.4" depends on ADK_TARGET_ARCH_XTENSA endchoice diff --git a/target/config/Config.in.cpu b/target/config/Config.in.cpu index d7984a44e..4c9cd3b1b 100644 --- a/target/config/Config.in.cpu +++ b/target/config/Config.in.cpu @@ -114,6 +114,14 @@ config ADK_TARGET_CPU_ARC_ARC64 depends on ADK_TARGET_ARCH_ARC # arm +config ADK_TARGET_CPU_ARM_ARM920T + bool "arm920t" + select ADK_TARGET_SUPPORTS_THREADS + select ADK_TARGET_SUPPORTS_NPTL + select ADK_TARGET_SUPPORTS_LT + select ADK_TARGET_CPU_WITH_THUMB + depends on ADK_TARGET_ARCH_ARM + config ADK_TARGET_CPU_ARM_ARM1176JZF_S bool "arm1176jzf-s" select ADK_TARGET_SUPPORTS_THREADS @@ -783,6 +791,15 @@ config ADK_TARGET_CPU_CF_5475 select ADK_TARGET_WITH_MMU depends on ADK_TARGET_ARCH_M68K +config ADK_TARGET_CPU_CF_54418 + bool "coldfire 54418" + select ADK_TARGET_SUPPORTS_THREADS + select ADK_TARGET_SUPPORTS_NPTL + select ADK_TARGET_SUPPORTS_LT + select ADK_TARGET_CPU_CF + select ADK_TARGET_WITH_MMU + depends on ADK_TARGET_ARCH_M68K + # m32c config ADK_TARGET_CPU_M32C bool "m32c" @@ -796,6 +813,12 @@ config ADK_TARGET_CPU_M32R depends on ADK_TARGET_ARCH_M32R # m68k +config ADK_TARGET_CPU_M68K_68000 + bool "68000" + select ADK_TARGET_SUPPORTS_THREADS + select ADK_TARGET_SUPPORTS_LT + depends on ADK_TARGET_ARCH_M68K + config ADK_TARGET_CPU_M68K_68020 bool "68020" select ADK_TARGET_SUPPORTS_THREADS @@ -1984,6 +2007,8 @@ config ADK_TARGET_GCC_CPU default "5373" if ADK_TARGET_CPU_CF_5373 default "5407" if ADK_TARGET_CPU_CF_5407 default "5475" if ADK_TARGET_CPU_CF_5475 + default "54418" if ADK_TARGET_CPU_CF_54418 + default "68000" if ADK_TARGET_CPU_M68K_68000 default "68020" if ADK_TARGET_CPU_M68K_68020 default "68030" if ADK_TARGET_CPU_M68K_68030 default "68040" if ADK_TARGET_CPU_M68K_68040 @@ -1991,6 +2016,7 @@ config ADK_TARGET_GCC_CPU default "arc700" if ADK_TARGET_CPU_ARC_ARC700 default "archs" if ADK_TARGET_CPU_ARC_ARCHS default "hs5x" if ADK_TARGET_CPU_ARC_ARC32 + default "arm920t" if ADK_TARGET_CPU_ARM_ARM920T default "arm1176jzf-s" if ADK_TARGET_CPU_ARM_ARM1176JZF_S default "arm926ej-s" if ADK_TARGET_CPU_ARM_ARM926EJ_S default "cortex-a5" if ADK_TARGET_CPU_ARM_CORTEX_A5 @@ -2212,6 +2238,8 @@ config ADK_TARGET_CPU_TYPE default "cf5373" if ADK_TARGET_CPU_CF_5373 default "cf5407" if ADK_TARGET_CPU_CF_5407 default "cf5475" if ADK_TARGET_CPU_CF_5475 + default "cf54418" if ADK_TARGET_CPU_CF_54418 + default "68000" if ADK_TARGET_CPU_M68K_68000 default "68020" if ADK_TARGET_CPU_M68K_68020 default "68030" if ADK_TARGET_CPU_M68K_68030 default "68040" if ADK_TARGET_CPU_M68K_68040 @@ -2225,6 +2253,7 @@ config ADK_TARGET_CPU_TYPE default "cortex_m3" if ADK_TARGET_CPU_ARM_CORTEX_M3 default "cortex_m4" if ADK_TARGET_CPU_ARM_CORTEX_M4 default "cortex_m7" if ADK_TARGET_CPU_ARM_CORTEX_M7 + default "arm920t" if ADK_TARGET_CPU_ARM_ARM920T default "arm1176jzf_s" if ADK_TARGET_CPU_ARM_ARM1176JZF_S default "arm926ej_s" if ADK_TARGET_CPU_ARM_ARM926EJ_S default "mpcore" if ADK_TARGET_CPU_ARM_ARM11MPCORE diff --git a/target/config/Config.in.libc b/target/config/Config.in.libc index c4b287072..cc954b875 100644 --- a/target/config/Config.in.libc +++ b/target/config/Config.in.libc @@ -150,8 +150,8 @@ choice prompt "Target C library version" depends on !ADK_TARGET_CHOOSE_ARCH -config ADK_TARGET_LIB_UCLIBC_NG_1_0_48 - bool "1.0.48" +config ADK_TARGET_LIB_UCLIBC_NG_1_0_49 + bool "1.0.49" depends on ADK_TARGET_LIB_UCLIBC_NG config ADK_TARGET_LIB_UCLIBC_NG_GIT @@ -200,7 +200,7 @@ config ADK_TARGET_LIBC config ADK_LIBC_VERSION string - default "1.0.48" if ADK_TARGET_LIB_UCLIBC_NG_1_0_48 + default "1.0.49" if ADK_TARGET_LIB_UCLIBC_NG_1_0_49 default "1.2.5" if ADK_TARGET_LIB_MUSL_1_2_5 default "2.39" if ADK_TARGET_LIB_GLIBC_2_39 default "4.4.0" if ADK_TARGET_LIB_NEWLIB_4_4_0 diff --git a/target/config/Config.in.mmu b/target/config/Config.in.mmu index 209101e48..6685230c8 100644 --- a/target/config/Config.in.mmu +++ b/target/config/Config.in.mmu @@ -3,7 +3,7 @@ config ADK_TARGET_WITH_MMU bool "MMU" - depends on !ADK_APPLIANCE_TOOLCHAIN && !ADK_TARGET_CHOOSE_ARCH + depends on !ADK_TARGET_CHOOSE_ARCH depends on !ADK_TARGET_ARCH_BFIN \ && !ADK_TARGET_ARCH_C6X \ && !ADK_TARGET_ARCH_FRV \ diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion index 477aba87b..1c7097780 100644 --- a/target/linux/Config.in.kernelversion +++ b/target/linux/Config.in.kernelversion @@ -23,7 +23,6 @@ default ADK_TARGET_LINUX_KERNEL_VERSION_4_9 if ADK_TARGET_ARCH_FRV default ADK_TARGET_LINUX_KERNEL_VERSION_4_9 if ADK_TARGET_SYSTEM_ST_STM32F429 default ADK_TARGET_LINUX_KERNEL_VERSION_4_9 if ADK_TARGET_SYSTEM_ST_STM32F769 default ADK_TARGET_LINUX_KERNEL_VERSION_5_4 if ADK_TARGET_ARCH_C6X -default ADK_TARGET_LINUX_KERNEL_VERSION_5_10 if ADK_TARGET_SYSTEM_NUMATO_MIMASV2 default ADK_TARGET_LINUX_KERNEL_VERSION_5_15 if ADK_TARGET_ARCH_NDS32 default ADK_TARGET_LINUX_KERNEL_VERSION_6_6 @@ -41,18 +40,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_GIT select ADK_TARGET_LINUX_KERNEL_IMAGE if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK config ADK_TARGET_LINUX_KERNEL_VERSION_6_9 - bool "6.9.2" - depends on !ADK_TARGET_ARCH_AVR32 - depends on !ADK_TARGET_ARCH_BFIN - depends on !ADK_TARGET_ARCH_C6X - depends on !ADK_TARGET_ARCH_CRIS - depends on !ADK_TARGET_ARCH_FRV - depends on !ADK_TARGET_ARCH_H8300 - depends on !ADK_TARGET_ARCH_METAG - depends on !ADK_TARGET_ARCH_NDS32 - -config ADK_TARGET_LINUX_KERNEL_VERSION_6_8 - bool "6.8.11" + bool "6.9.3" depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_BFIN depends on !ADK_TARGET_ARCH_C6X @@ -63,7 +51,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_6_8 depends on !ADK_TARGET_ARCH_NDS32 config ADK_TARGET_LINUX_KERNEL_VERSION_6_6 - bool "6.6.30" + bool "6.6.32" 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.xtensa b/target/linux/config/Config.in.xtensa index 5fc9847c6..45e601644 100644 --- a/target/linux/config/Config.in.xtensa +++ b/target/linux/config/Config.in.xtensa @@ -46,3 +46,9 @@ config ADK_LINUX_KERNEL_DEFAULT_MEM_START default "0x00000000" if ADK_TARGET_CPU_XTENSA_DC233C default "0x60000000" if ADK_TARGET_CPU_XTENSA_DE212 depends on !ADK_TARGET_WITH_MMU + +config ADK_LINUX_KERNEL_CMDLINE + string + default "earlycon=uart8250,mmio32,0xfd050020,115200n8 console=ttyS0,115200n8 memmap=0x08000000@0" if ADK_TARGET_CPU_XTENSA_DC233C + default "earlycon=uart8250,mmio32,0x9d050020,115200n8 memmap=256M@0x60000000" if ADK_TARGET_CPU_XTENSA_DE212 + depends on ADK_TARGET_LINUX_ARCH_XTENSA diff --git a/target/linux/patches/6.6.30/armnommu-fix-thread-registers.patch b/target/linux/patches/6.6.32/armnommu-fix-thread-registers.patch index 8ab2196dc..8ab2196dc 100644 --- a/target/linux/patches/6.6.30/armnommu-fix-thread-registers.patch +++ b/target/linux/patches/6.6.32/armnommu-fix-thread-registers.patch diff --git a/target/linux/patches/6.6.30/armnommu-versatile.patch b/target/linux/patches/6.6.32/armnommu-versatile.patch index f8f10f50b..f8f10f50b 100644 --- a/target/linux/patches/6.6.30/armnommu-versatile.patch +++ b/target/linux/patches/6.6.32/armnommu-versatile.patch diff --git a/target/linux/patches/6.6.30/hppa-cross-compile.patch b/target/linux/patches/6.6.32/hppa-cross-compile.patch index 51c24fff2..51c24fff2 100644 --- a/target/linux/patches/6.6.30/hppa-cross-compile.patch +++ b/target/linux/patches/6.6.32/hppa-cross-compile.patch diff --git a/target/linux/patches/6.6.30/macsonic.patch b/target/linux/patches/6.6.32/macsonic.patch index 51e76113b..51e76113b 100644 --- a/target/linux/patches/6.6.30/macsonic.patch +++ b/target/linux/patches/6.6.32/macsonic.patch diff --git a/target/linux/patches/6.6.30/riscv-flat.patch b/target/linux/patches/6.6.32/riscv-flat.patch index 6d26c638f..6d26c638f 100644 --- a/target/linux/patches/6.6.30/riscv-flat.patch +++ b/target/linux/patches/6.6.32/riscv-flat.patch diff --git a/toolchain/binutils/Makefile.inc b/toolchain/binutils/Makefile.inc index 033c8b7ce..4e31a01e7 100644 --- a/toolchain/binutils/Makefile.inc +++ b/toolchain/binutils/Makefile.inc @@ -73,7 +73,7 @@ PKG_SITES:= ${MASTER_SITE_GNU:=binutils/} DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.bz2 endif ifeq ($(ADK_TOOLCHAIN_BINUTILS_XTENSA),y) -PKG_VERSION:= xtensa-fdpic-abi-spec-1.3 +PKG_VERSION:= xtensa-fdpic-abi-spec-1.4 PKG_GIT:= tag PKG_RELEASE:= 1 PKG_SITES:= https://github.com/jcmvbkbc/binutils-gdb-xtensa.git diff --git a/toolchain/gcc/Makefile.inc b/toolchain/gcc/Makefile.inc index e98fd0f6e..523396b0b 100644 --- a/toolchain/gcc/Makefile.inc +++ b/toolchain/gcc/Makefile.inc @@ -114,7 +114,7 @@ PKG_RELEASE:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz endif ifeq ($(ADK_TOOLCHAIN_GCC_XTENSA),y) -PKG_VERSION:= xtensa-fdpic-abi-spec-1.3 +PKG_VERSION:= xtensa-fdpic-abi-spec-1.4 PKG_GIT:= tag PKG_SITES:= https://github.com/jcmvbkbc/gcc-xtensa.git PKG_RELEASE:= 1 diff --git a/toolchain/gcc/patches/13.2.0/csky.patch b/toolchain/gcc/patches/13.3.0/csky.patch index ee352951b..ee352951b 100644 --- a/toolchain/gcc/patches/13.2.0/csky.patch +++ b/toolchain/gcc/patches/13.3.0/csky.patch diff --git a/toolchain/gcc/patches/13.2.0/nios2-softfp.patch b/toolchain/gcc/patches/13.3.0/nios2-softfp.patch index c677c6c2f..c677c6c2f 100644 --- a/toolchain/gcc/patches/13.2.0/nios2-softfp.patch +++ b/toolchain/gcc/patches/13.3.0/nios2-softfp.patch diff --git a/toolchain/glibc/Makefile b/toolchain/glibc/Makefile index 5389b8416..4d87f5789 100644 --- a/toolchain/glibc/Makefile +++ b/toolchain/glibc/Makefile @@ -19,14 +19,17 @@ TARGET_CXXFLAGS:= $(filter-out -ffast-math,$(TARGET_CXXFLAGS)) GLIBC_CONFOPTS:= --build=$(GNU_HOST_NAME) \ --host=$(GNU_TARGET_NAME) \ --with-headers=$(STAGING_TARGET_DIR)/usr/include \ - --enable-stackguard-randomization \ --disable-sanity-checks \ - --disable-nls \ --disable-werror \ --disable-nscd \ - --disable-default-pie \ --enable-shared +ifeq ($(ADK_TARGET_LINUX_ARCH_SPARC64),y) +GLIBC_CONFOPTS+= --disable-default-pie +else +GLIBC_CONFOPTS+= --enable-default-pie +endif + ifeq ($(ADK_TARGET_USE_STATIC_LIBS_ONLY),y) GLIBC_CONFOPTS+= --enable-static-nss endif diff --git a/toolchain/uclibc-ng/Makefile.inc b/toolchain/uclibc-ng/Makefile.inc index 5c8cfbc68..d3b46e126 100644 --- a/toolchain/uclibc-ng/Makefile.inc +++ b/toolchain/uclibc-ng/Makefile.inc @@ -7,10 +7,10 @@ PKG_VERSION:= git PKG_RELEASE:= 1 PKG_SITES:= https://git.uclibc-ng.org/git/uclibc-ng.git endif -ifeq ($(ADK_TARGET_LIB_UCLIBC_NG_1_0_48),y) -PKG_VERSION:= 1.0.48 +ifeq ($(ADK_TARGET_LIB_UCLIBC_NG_1_0_49),y) +PKG_VERSION:= 1.0.49 PKG_RELEASE:= 1 -PKG_SITES:= http://downloads.uclibc-ng.org/releases/1.0.48/ -PKG_HASH:= c8ac74fb6c53f96cf9ecde05c3e37a4e03a67aee013b2f3c388a3c43d20b311d +PKG_SITES:= http://downloads.uclibc-ng.org/releases/1.0.49/ +PKG_HASH:= 4cb65c53b3724ca526fb228c72e29924432294868157ade8fa2667e0622ebd49 endif DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.gz |