diff --git a/package/devel/binutils/Makefile b/package/devel/binutils/Makefile index 95939f2dcd9..5166f267347 100644 --- a/package/devel/binutils/Makefile +++ b/package/devel/binutils/Makefile @@ -90,6 +90,7 @@ CONFIGURE_ARGS += \ --enable-install-libctf \ --with-system-zlib \ --without-zstd \ + --without-msgpack \ --disable-gprofng define Build/Install diff --git a/package/devel/strace/Makefile b/package/devel/strace/Makefile index 2a4516f4bd3..ce9122cc8a3 100644 --- a/package/devel/strace/Makefile +++ b/package/devel/strace/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=strace -PKG_VERSION:=6.1 +PKG_VERSION:=6.2 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://strace.io/files/$(PKG_VERSION) -PKG_HASH:=2579e9cec37dbb786f6ea0bebd15f40dd561ef2bde2a2a2ecdce5963b01859fd +PKG_HASH:=0c7d38a449416268d3004029a220a15a77c2206a03cc88120f37f46e949177e8 PKG_MAINTAINER:=Felix Fietkau PKG_LICENSE:=LGPL-2.1-or-later diff --git a/package/kernel/linux/modules/netdevices.mk b/package/kernel/linux/modules/netdevices.mk index acab054b0b8..2af84be6382 100644 --- a/package/kernel/linux/modules/netdevices.mk +++ b/package/kernel/linux/modules/netdevices.mk @@ -1527,7 +1527,7 @@ $(eval $(call KernelPackage,atlantic)) define KernelPackage/lan743x SUBMENU:=$(NETWORK_DEVICES_MENU) TITLE:=Microchip LAN743x PCI Express Gigabit Ethernet NIC - DEPENDS:=@PCI_SUPPORT + DEPENDS:=@PCI_SUPPORT +kmod-ptp +kmod-mdio-devres KCONFIG:=CONFIG_LAN743X FILES:=$(LINUX_DIR)/drivers/net/ethernet/microchip/lan743x.ko AUTOLOAD:=$(call AutoProbe,lan743x) diff --git a/target/linux/ath79/image/generic.mk b/target/linux/ath79/image/generic.mk index be7481a3842..7072dc131ee 100644 --- a/target/linux/ath79/image/generic.mk +++ b/target/linux/ath79/image/generic.mk @@ -814,48 +814,41 @@ define Device/devolo_dlan-pro-1200plus-ac endef TARGET_DEVICES += devolo_dlan-pro-1200plus-ac -define Device/devolo_dvl1200e +define Device/devolo_wifi-pro SOC := qca9558 DEVICE_VENDOR := devolo - DEVICE_MODEL := WiFi pro 1200e DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct IMAGE_SIZE := 15936k endef + +define Device/devolo_dvl1200e + $(Device/devolo_wifi-pro) + DEVICE_MODEL := WiFi pro 1200e +endef TARGET_DEVICES += devolo_dvl1200e define Device/devolo_dvl1200i - SOC := qca9558 - DEVICE_VENDOR := devolo + $(Device/devolo_wifi-pro) DEVICE_MODEL := WiFi pro 1200i - DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct - IMAGE_SIZE := 15936k endef TARGET_DEVICES += devolo_dvl1200i define Device/devolo_dvl1750c - SOC := qca9558 - DEVICE_VENDOR := devolo + $(Device/devolo_wifi-pro) DEVICE_MODEL := WiFi pro 1750c - DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct - IMAGE_SIZE := 15936k endef TARGET_DEVICES += devolo_dvl1750c define Device/devolo_dvl1750e - SOC := qca9558 - DEVICE_VENDOR := devolo + $(Device/devolo_wifi-pro) DEVICE_MODEL := WiFi pro 1750e - DEVICE_PACKAGES := kmod-usb2 kmod-ath10k-ct ath10k-firmware-qca988x-ct - IMAGE_SIZE := 15936k + DEVICE_PACKAGES += kmod-usb2 endef TARGET_DEVICES += devolo_dvl1750e define Device/devolo_dvl1750i - SOC := qca9558 - DEVICE_VENDOR := devolo + $(Device/devolo_wifi-pro) DEVICE_MODEL := WiFi pro 1750i - DEVICE_PACKAGES := kmod-ath10k-ct ath10k-firmware-qca988x-ct - IMAGE_SIZE := 15936k endef TARGET_DEVICES += devolo_dvl1750i diff --git a/target/linux/bmips/dts/bcm6318-comtrend-ar-5315u.dts b/target/linux/bmips/dts/bcm6318-comtrend-ar-5315u.dts index a54d6327705..ec50c3e07df 100644 --- a/target/linux/bmips/dts/bcm6318-comtrend-ar-5315u.dts +++ b/target/linux/bmips/dts/bcm6318-comtrend-ar-5315u.dts @@ -23,14 +23,14 @@ wps { label = "wps"; - gpios = <&pinctrl 3 GPIO_ACTIVE_LOW>; + gpios = <&gpio 3 GPIO_ACTIVE_LOW>; linux,code = ; debounce-interval = <60>; }; reset { label = "reset"; - gpios = <&pinctrl 33 GPIO_ACTIVE_LOW>; + gpios = <&gpio 33 GPIO_ACTIVE_LOW>; linux,code = ; debounce-interval = <60>; }; diff --git a/target/linux/bmips/dts/bcm6318.dtsi b/target/linux/bmips/dts/bcm6318.dtsi index 13e1bf11441..eb012fe243b 100644 --- a/target/linux/bmips/dts/bcm6318.dtsi +++ b/target/linux/bmips/dts/bcm6318.dtsi @@ -103,6 +103,7 @@ interrupt-controller; #interrupt-cells = <2>; + interrupt-parent = <&periph_intc>; interrupts = , , , @@ -143,6 +144,8 @@ }; gpio_cntl: syscon@10000080 { + #address-cells = <1>; + #size-cells = <1>; compatible = "brcm,bcm6318-gpio-sysctl", "syscon", "simple-mfd"; reg = <0x10000080 0x80>; diff --git a/target/linux/bmips/dts/bcm63268.dtsi b/target/linux/bmips/dts/bcm63268.dtsi index 2bc86d26f97..248e1afc79b 100644 --- a/target/linux/bmips/dts/bcm63268.dtsi +++ b/target/linux/bmips/dts/bcm63268.dtsi @@ -118,6 +118,7 @@ interrupt-controller; #interrupt-cells = <2>; + interrupt-parent = <&periph_intc>; interrupts = , , , @@ -154,6 +155,8 @@ }; gpio_cntl: syscon@100000c0 { + #address-cells = <1>; + #size-cells = <1>; compatible = "brcm,bcm63268-gpio-sysctl", "syscon", "simple-mfd"; reg = <0x100000c0 0x80>; diff --git a/target/linux/bmips/dts/bcm6328.dtsi b/target/linux/bmips/dts/bcm6328.dtsi index dfd603b7c6e..d61903e1548 100644 --- a/target/linux/bmips/dts/bcm6328.dtsi +++ b/target/linux/bmips/dts/bcm6328.dtsi @@ -105,6 +105,7 @@ interrupt-controller; #interrupt-cells = <2>; + interrupt-parent = <&periph_intc>; interrupts = , , , @@ -146,6 +147,8 @@ }; gpio_cntl: syscon@10000080 { + #address-cells = <1>; + #size-cells = <1>; compatible = "brcm,bcm6328-gpio-sysctl", "syscon", "simple-mfd"; reg = <0x10000080 0x80>; diff --git a/target/linux/bmips/dts/bcm6358.dtsi b/target/linux/bmips/dts/bcm6358.dtsi index 34334df9ba1..e08ead0623f 100644 --- a/target/linux/bmips/dts/bcm6358.dtsi +++ b/target/linux/bmips/dts/bcm6358.dtsi @@ -124,6 +124,7 @@ interrupt-controller; #interrupt-cells = <2>; + interrupt-parent = <&periph_intc>; interrupts = , , , @@ -138,6 +139,7 @@ interrupt-controller; #interrupt-cells = <2>; + interrupt-parent = <&periph_intc>; interrupts = , ; }; @@ -158,6 +160,8 @@ }; gpio_cntl: syscon@fffe0080 { + #address-cells = <1>; + #size-cells = <1>; compatible = "brcm,bcm6358-gpio-sysctl", "syscon", "simple-mfd"; reg = <0xfffe0080 0x50>; diff --git a/target/linux/bmips/dts/bcm6362.dtsi b/target/linux/bmips/dts/bcm6362.dtsi index d66a602df7a..720afde7cf7 100644 --- a/target/linux/bmips/dts/bcm6362.dtsi +++ b/target/linux/bmips/dts/bcm6362.dtsi @@ -118,6 +118,7 @@ interrupt-controller; #interrupt-cells = <2>; + interrupt-parent = <&periph_intc>; interrupts = , , , @@ -147,6 +148,8 @@ }; gpio_cntl: syscon@10000080 { + #address-cells = <1>; + #size-cells = <1>; compatible = "brcm,bcm6362-gpio-sysctl", "syscon", "simple-mfd"; reg = <0x10000080 0x80>; diff --git a/target/linux/bmips/dts/bcm6368.dtsi b/target/linux/bmips/dts/bcm6368.dtsi index 5ba90921936..2eafa027cda 100644 --- a/target/linux/bmips/dts/bcm6368.dtsi +++ b/target/linux/bmips/dts/bcm6368.dtsi @@ -108,6 +108,7 @@ interrupt-controller; #interrupt-cells = <2>; + interrupt-parent = <&periph_intc>; interrupts = , , , @@ -122,6 +123,7 @@ interrupt-controller; #interrupt-cells = <2>; + interrupt-parent = <&periph_intc>; interrupts = , ; }; @@ -149,6 +151,8 @@ }; gpio_cntl: syscon@10000080 { + #address-cells = <1>; + #size-cells = <1>; compatible = "brcm,bcm6368-gpio-sysctl", "syscon", "simple-mfd"; reg = <0x10000080 0x80>;