summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mk/linux-ver.mk10
-rw-r--r--package/dnsmasq/Makefile4
-rw-r--r--package/expat/Makefile3
-rw-r--r--package/weston/Makefile1
-rw-r--r--target/arc/kernel/synopsys-hsdk6
-rw-r--r--target/linux/Config.in.kernelversion6
-rw-r--r--target/linux/config/Config.in.arc7
-rw-r--r--target/linux/config/Config.in.block3
-rw-r--r--target/linux/config/Config.in.dma8
-rw-r--r--target/linux/patches/6.12.23/armnommu-versatile.patch (renamed from target/linux/patches/6.12.18/armnommu-versatile.patch)0
-rw-r--r--target/linux/patches/6.12.23/hppa-cross-compile.patch (renamed from target/linux/patches/6.12.18/hppa-cross-compile.patch)0
-rw-r--r--target/linux/patches/6.12.23/macsonic.patch (renamed from target/linux/patches/6.12.18/macsonic.patch)0
-rw-r--r--toolchain/expat/Makefile1
-rw-r--r--toolchain/gcc/Makefile2
14 files changed, 39 insertions, 12 deletions
diff --git a/mk/linux-ver.mk b/mk/linux-ver.mk
index c750a9fb0..91707f848 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_13),y)
-KERNEL_FILE_VER:= 6.13.9
+ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_14),y)
+KERNEL_FILE_VER:= 6.14.2
KERNEL_RELEASE:= 1
KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
-KERNEL_HASH:= 53e7a3f028b6119ba499245bde0fa10275752817408a4a36b5a34ad74a4727b2
+KERNEL_HASH:= c5c682a354ea3190139357a57d34a79e5c37221ace823a938e10116b577a2e1b
endif
ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_12),y)
-KERNEL_FILE_VER:= 6.12.18
+KERNEL_FILE_VER:= 6.12.23
KERNEL_RELEASE:= 1
KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE)
-KERNEL_HASH:= beb902a5f69d9e57710112203db38111dad6d30556ea8ce389284c8077fe944d
+KERNEL_HASH:= d8d95404f8deeb7ff6992c0df855025062e9e8182bca6daa27ef2e9275d27749
endif
ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_6),y)
KERNEL_FILE_VER:= 6.6.82
diff --git a/package/dnsmasq/Makefile b/package/dnsmasq/Makefile
index d204305b0..d036235a1 100644
--- a/package/dnsmasq/Makefile
+++ b/package/dnsmasq/Makefile
@@ -4,9 +4,9 @@
include ${ADK_TOPDIR}/rules.mk
PKG_NAME:= dnsmasq
-PKG_VERSION:= 2.90
+PKG_VERSION:= 2.91
PKG_RELEASE:= 1
-PKG_HASH:= 8e50309bd837bfec9649a812e066c09b6988b73d749b7d293c06c57d46a109e4
+PKG_HASH:= f622682848b33677adb2b6ad08264618a2ae0a01da486a93fd8cd91186b3d153
PKG_DESCR:= lightweight dns, dhcp and tftp server
PKG_SECTION:= net/dns
PKG_KDEPENDS:= inotify-user
diff --git a/package/expat/Makefile b/package/expat/Makefile
index 6b58ee822..b178c115f 100644
--- a/package/expat/Makefile
+++ b/package/expat/Makefile
@@ -25,7 +25,8 @@ TARGET_CFLAGS:= $(filter-out -static,$(TARGET_CFLAGS))
TARGET_LDFLAGS:=$(filter-out -static,$(TARGET_LDFLAGS))
endif
-CONFIGURE_ARGS+= --without-docbook
+CONFIGURE_ARGS+= --without-docbook \
+ --without-tests
libexpat-install:
${INSTALL_DIR} ${IDIR_LIBEXPAT}/usr/lib
diff --git a/package/weston/Makefile b/package/weston/Makefile
index 205104b99..3355dd394 100644
--- a/package/weston/Makefile
+++ b/package/weston/Makefile
@@ -11,6 +11,7 @@ PKG_DESCR:= wayland compositor
PKG_SECTION:= x11/drivers
PKG_DEPENDS:= wayland libxkbcommon libinput libpng libjpeg-turbo libseat mesa libexpat
PKG_DEPENDS+= libwebp pam libxcursor libudev xkeyboard-config cairo libffi libdrm seatd
+PKG_DEPENDS+= libdisplay-info
PKG_BUILDDEP:= wayland wayland-protocols libxkbcommon libinput libpng libjpeg-turbo expat
PKG_BUILDDEP+= libwebp pam libXcursor eudev cairo libseat libffi libdrm libdisplay-info mesa
PKG_SITES:= https://gitlab.freedesktop.org/wayland/weston/-/releases/$(PKG_VERSION)/downloads/
diff --git a/target/arc/kernel/synopsys-hsdk b/target/arc/kernel/synopsys-hsdk
index 55ae3ccb6..a4e93f109 100644
--- a/target/arc/kernel/synopsys-hsdk
+++ b/target/arc/kernel/synopsys-hsdk
@@ -9,3 +9,9 @@ CONFIG_ARC_USE_UNALIGNED_MEM_ACCESS=y
CONFIG_ARC_HAS_LL64=y
CONFIG_ARC_HAS_DIV_REM=y
CONFIG_ARC_HAS_ACCL_REGS=y
+CONFIG_ARC_CACHE=y
+CONFIG_ARC_CACHE_LINE_SHIFT=6
+CONFIG_ARC_HAS_ICACHE=y
+CONFIG_ARC_HAS_DCACHE=y
+CONFIG_ARC_CACHE_PAGES=y
+
diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion
index 83677fc69..1d1e262a8 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_13
- bool "6.13.9"
+config ADK_TARGET_LINUX_KERNEL_VERSION_6_14
+ bool "6.14.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_13
depends on !ADK_TARGET_ARCH_NDS32
config ADK_TARGET_LINUX_KERNEL_VERSION_6_12
- bool "6.12.18"
+ bool "6.12.23"
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.arc b/target/linux/config/Config.in.arc
index 461d1b7cd..f2da2a7ea 100644
--- a/target/linux/config/Config.in.arc
+++ b/target/linux/config/Config.in.arc
@@ -24,4 +24,11 @@ config ADK_LINUX_KERNEL_ARC_BUILTIN_DTB_NAME
default "haps_hs" if ADK_TARGET_CPU_ARC_ARCHS && ADK_TARGET_SYSTEM_QEMU_ARC
default "nsim_700" if ADK_TARGET_CPU_ARC_ARC700
+config ADK_LINUX_KERNEL_BUILTIN_DTB_NAME
+ string
+ depends on ADK_TARGET_ARCH_ARC
+ default "hsdk" if ADK_TARGET_CPU_ARC_ARCHS && ADK_TARGET_SYSTEM_SYNOPSYS_HSDK
+ default "haps_hs" if ADK_TARGET_CPU_ARC_ARCHS && ADK_TARGET_SYSTEM_SYNOPSYS_NSIM
+ default "haps_hs" if ADK_TARGET_CPU_ARC_ARCHS && ADK_TARGET_SYSTEM_QEMU_ARC
+ default "nsim_700" if ADK_TARGET_CPU_ARC_ARC700
diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block
index 2da563549..8ccb10e72 100644
--- a/target/linux/config/Config.in.block
+++ b/target/linux/config/Config.in.block
@@ -497,10 +497,13 @@ config ADK_LINUX_KERNEL_MMC_DW
select ADK_LINUX_KERNEL_MMC
select ADK_LINUX_KERNEL_MMC_SPI
select ADK_LINUX_KERNEL_MMC_BLOCK
+ select ADK_LINUX_KERNEL_MMC_DW_PLTFM
select ADK_LINUX_KERNEL_BLK_DEV
select ADK_LINUX_KERNEL_BLK_DEV_SD
select ADK_LINUX_KERNEL_MMC_SDHCI
select ADK_LINUX_KERNEL_MMC_SDHCI_PLTFM
+ select ADK_LINUX_KERNEL_PWRSEQ_EMMC
+ select ADK_LINUX_KERNEL_PWRSEQ_SIMPLE
depends on ADK_TARGET_SYSTEM_SYNOPSYS_HSDK
default y if ADK_TARGET_SYSTEM_SYNOPSYS_HSDK
default n
diff --git a/target/linux/config/Config.in.dma b/target/linux/config/Config.in.dma
index c570b546e..11094514b 100644
--- a/target/linux/config/Config.in.dma
+++ b/target/linux/config/Config.in.dma
@@ -58,6 +58,14 @@ config ADK_LINUX_KERNEL_DMA_BCM2708
default y if ADK_TARGET_BOARD_BCM28XX
default n
+config ADK_LINUX_KERNEL_DW_AXI_DMAC
+ bool
+ select ADK_LINUX_KERNEL_DMADEVICES
+ select ADK_LINUX_KERNEL_DMA_SHARED_BUFFER
+ depends on ADK_TARGET_SYSTEM_SYNOPSYS_HSDK
+ default y if ADK_TARGET_SYSTEM_SYNOPSYS_HSDK
+ default n
+
config ADK_LINUX_KERNEL_IMX_SDMA
bool
select ADK_LINUX_KERNEL_MXS_DMA
diff --git a/target/linux/patches/6.12.18/armnommu-versatile.patch b/target/linux/patches/6.12.23/armnommu-versatile.patch
index f8f10f50b..f8f10f50b 100644
--- a/target/linux/patches/6.12.18/armnommu-versatile.patch
+++ b/target/linux/patches/6.12.23/armnommu-versatile.patch
diff --git a/target/linux/patches/6.12.18/hppa-cross-compile.patch b/target/linux/patches/6.12.23/hppa-cross-compile.patch
index 51c24fff2..51c24fff2 100644
--- a/target/linux/patches/6.12.18/hppa-cross-compile.patch
+++ b/target/linux/patches/6.12.23/hppa-cross-compile.patch
diff --git a/target/linux/patches/6.12.18/macsonic.patch b/target/linux/patches/6.12.23/macsonic.patch
index 51e76113b..51e76113b 100644
--- a/target/linux/patches/6.12.18/macsonic.patch
+++ b/target/linux/patches/6.12.23/macsonic.patch
diff --git a/toolchain/expat/Makefile b/toolchain/expat/Makefile
index 6d1c6215b..1affc7b28 100644
--- a/toolchain/expat/Makefile
+++ b/toolchain/expat/Makefile
@@ -17,6 +17,7 @@ $(WRKBUILD)/.configured:
--enable-static \
--disable-shared \
--without-docbook \
+ --without-tests \
);
touch $@
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index fb03e9633..af036de1a 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -399,7 +399,7 @@ $(WRKBUILD)/.installed: $(WRKBUILD)/.compiled
# remove duplicate tools, convert hardlinks to symlinks
set -e; \
cd $(TOOLCHAIN_DIR)/usr/$(GNU_TARGET_NAME)/bin; \
- for app in ar as c++ g++ gcc ld ld.gold ld.bfd nm objcopy objdump ranlib strip; do \
+ for app in ar as c++ g++ gcc ld ld.bfd nm objcopy objdump ranlib strip; do \
ln -sf ../../bin/$(GNU_TARGET_NAME)-$${app} $${app}; \
done;
(cd $(TOOLCHAIN_DIR)/usr/bin && \
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-16 20:58:09 +0000