Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'openwrt:master' into master

Browse source
This commit is contained in:
Hayzam Sherif 2023-03-11 22:37:54 +05:30 committed by GitHub
commit 6b7b7bd960
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 37 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
package/devel/binutils/Makefile
View file

@ -90,6 +90,7 @@ CONFIGURE_ARGS += \
--enable-install-libctf \
--with-system-zlib \
--without-zstd \
--without-msgpack \
--disable-gprofng
define Build/Install

4
package/devel/strace/Makefile
View file

@ -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 <nbd@nbd.name>
PKG_LICENSE:=LGPL-2.1-or-later

2
package/kernel/linux/modules/netdevices.mk
View file

@ -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)

29
target/linux/ath79/image/generic.mk
View file

@ -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

4
target/linux/bmips/dts/bcm6318-comtrend-ar-5315u.dts
View file

@ -23,14 +23,14 @@
wps {
label = "wps";
gpios = <&pinctrl 3 GPIO_ACTIVE_LOW>;
gpios = <&gpio 3 GPIO_ACTIVE_LOW>;
linux,code = <KEY_WPS_BUTTON>;
debounce-interval = <60>;
};
reset {
label = "reset";
gpios = <&pinctrl 33 GPIO_ACTIVE_LOW>;
gpios = <&gpio 33 GPIO_ACTIVE_LOW>;
linux,code = <KEY_RESTART>;
debounce-interval = <60>;
};

3
target/linux/bmips/dts/bcm6318.dtsi
View file

@ -103,6 +103,7 @@
interrupt-controller;
#interrupt-cells = <2>;
interrupt-parent = <&periph_intc>;
interrupts = <BCM6318_IRQ_EXT0>,
<BCM6318_IRQ_EXT1>,
<BCM6318_IRQ_EXT2>,
@ -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>;

3
target/linux/bmips/dts/bcm63268.dtsi
View file

@ -118,6 +118,7 @@
interrupt-controller;
#interrupt-cells = <2>;
interrupt-parent = <&periph_intc>;
interrupts = <BCM63268_IRQ_EXT0>,
<BCM63268_IRQ_EXT1>,
<BCM63268_IRQ_EXT2>,
@ -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>;

3
target/linux/bmips/dts/bcm6328.dtsi
View file

@ -105,6 +105,7 @@
interrupt-controller;
#interrupt-cells = <2>;
interrupt-parent = <&periph_intc>;
interrupts = <BCM6328_IRQ_EXTO>,
<BCM6328_IRQ_EXT1>,
<BCM6328_IRQ_EXT2>,
@ -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>;

4
target/linux/bmips/dts/bcm6358.dtsi
View file

@ -124,6 +124,7 @@
interrupt-controller;
#interrupt-cells = <2>;
interrupt-parent = <&periph_intc>;
interrupts = <BCM6358_IRQ_EXT0>,
<BCM6358_IRQ_EXT1>,
<BCM6358_IRQ_EXT2>,
@ -138,6 +139,7 @@
interrupt-controller;
#interrupt-cells = <2>;
interrupt-parent = <&periph_intc>;
interrupts = <BCM6358_IRQ_EXT4>,
<BCM6358_IRQ_EXT5>;
};
@ -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>;

3
target/linux/bmips/dts/bcm6362.dtsi
View file

@ -118,6 +118,7 @@
interrupt-controller;
#interrupt-cells = <2>;
interrupt-parent = <&periph_intc>;
interrupts = <BCM6362_IRQ_EXT0>,
<BCM6362_IRQ_EXT1>,
<BCM6362_IRQ_EXT2>,
@ -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>;

4
target/linux/bmips/dts/bcm6368.dtsi
View file

@ -108,6 +108,7 @@
interrupt-controller;
#interrupt-cells = <2>;
interrupt-parent = <&periph_intc>;
interrupts = <BCM6368_IRQ_EXT0>,
<BCM6368_IRQ_EXT1>,
<BCM6368_IRQ_EXT2>,
@ -122,6 +123,7 @@
interrupt-controller;
#interrupt-cells = <2>;
interrupt-parent = <&periph_intc>;
interrupts = <BCM6368_IRQ_EXT4>,
<BCM6368_IRQ_EXT5>;
};
@ -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>;