Skip to content

Commit

Permalink
[bot] AutoMerging: merge all upstream's changes:
Browse files Browse the repository at this point in the history
* https://github.com/coolsnowwolf/lede:
  mbedtls: update to version 2.28.2
  libbsd: fix libpath to not use host path
  rockchip: fix hinlink_common target
  fullconenat: Make use of KERNEL_MAKE
  rockchip: add support for HINLINK OPC-H66K
  treewide: move some patches into generic 5.15
  linux-firmware: disable stripping
  bcm27xx: fix BCMGENET kernel config
  linux-firmware: ath11k: add symlink for WCN6855 hw2.1
  linux-firmware: update to 20221214
  ath10k-ct: add linux kernel v6.1 api update
  uhttpd: update to latest Git HEAD (coolsnowwolf#10685)
  mt76: refresh patches (coolsnowwolf#10689)
  mt76: update to the latest version
  dnsmasq: bump to v2.88 (coolsnowwolf#10683)
  Revert "mediatek: add support for Netgear WAX206"
  ramips: Fix drivers/pwm/pwm-mediatek-ramips.c compile
  kernel: Move CONFIG_PWM_IMG and CONFIG_PWM_MEDIATEK to generic configuration
  kernel: Move CONFIG_DRM_XEN_FRONTEND to generic configuration
  • Loading branch information
github-actions[bot] committed Dec 31, 2022
2 parents 7a51922 + 2ec379d commit 31a47d4
Show file tree
Hide file tree
Showing 42 changed files with 1,087 additions and 1,553 deletions.
1 change: 1 addition & 0 deletions package/boot/uboot-rockchip/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ define U-Boot/opc-h68k-rk3568
BUILD_SUBTARGET:=armv8
NAME:=OPC-H68K Board
BUILD_DEVICES:= \
hinlink_opc-h66k \
hinlink_opc-h68k
DEPENDS:=+PACKAGE_u-boot-opc-h68k-rk3568:arm-trusted-firmware-rk3568
PKG_BUILD_DEPENDS:=arm-trusted-firmware-rockchip-vendor
Expand Down
9 changes: 6 additions & 3 deletions package/firmware/linux-firmware/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,22 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=linux-firmware
PKG_VERSION:=20221109
PKG_RELEASE:=2
PKG_VERSION:=20221214
PKG_RELEASE:=3

PKG_SOURCE_URL:=@KERNEL/linux/kernel/firmware
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
PKG_HASH:=c0ddffbbcf30f2e015bddd5c6d3ce1f13976b906aceabda4a57e3c41a3190701
PKG_HASH:=e793783e92acbde549965521462d1d1327827360664cf242dbda08f075654331

PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>

SCAN_DEPS = *.mk

include $(INCLUDE_DIR)/package.mk

RSTRIP:=:
STRIP:=:

define Package/firmware-default
SECTION:=firmware
CATEGORY:=Firmware
Expand Down
1 change: 1 addition & 0 deletions package/firmware/linux-firmware/qca_ath11k.mk
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,6 @@ define Package/ath11k-firmware-wcn6855/install
$(INSTALL_DIR) $(1)/lib/firmware/ath11k/WCN6855/hw2.0
$(INSTALL_DATA) \
$(PKG_BUILD_DIR)/ath11k/WCN6855/hw2.0/* $(1)/lib/firmware/ath11k/WCN6855/hw2.0/
$(LN) ./hw2.0 $(1)/lib/firmware/ath11k/WCN6855/hw2.1
endef
$(eval $(call BuildPackage,ath11k-firmware-wcn6855))
29 changes: 29 additions & 0 deletions package/kernel/ath10k-ct/patches/100-api_update.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
--- a/ath10k-5.15/core.c
+++ b/ath10k-5.15/core.c
@@ -4151,7 +4151,11 @@
ath10k_debug_print_board_info(ar);
}

+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0)
device_get_mac_address(ar->dev, ar->mac_addr, sizeof(ar->mac_addr));
+#else
+ device_get_mac_address(ar->dev, ar->mac_addr);
+#endif

/* Try to get mac address from device node (from nvmem cell) */
of_get_mac_address(ar->dev->of_node, ar->mac_addr);
--- a/ath10k-5.15/pci.c
+++ b/ath10k-5.15/pci.c
@@ -3563,8 +3563,12 @@

void ath10k_pci_init_napi(struct ath10k *ar)
{
+#if LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0)
netif_napi_add(&ar->napi_dev, &ar->napi, ath10k_pci_napi_poll,
ATH10K_NAPI_BUDGET);
+#else
+ netif_napi_add(&ar->napi_dev, &ar->napi, ath10k_pci_napi_poll);
+#endif
}

static int ath10k_pci_init_irq(struct ath10k *ar)
8 changes: 4 additions & 4 deletions package/kernel/mt76/Makefile
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
include $(TOPDIR)/rules.mk

PKG_NAME:=mt76
PKG_RELEASE=7
PKG_RELEASE=5

PKG_LICENSE:=GPLv2
PKG_LICENSE_FILES:=

PKG_SOURCE_URL:=https://github.com/openwrt/mt76
PKG_SOURCE_PROTO:=git
PKG_SOURCE_DATE:=2022-12-10
PKG_SOURCE_VERSION:=7fae1de12ae7832a6095fd2df198f41fabd5223d
PKG_MIRROR_HASH:=c01388f8029b007efdfb4327ef54aa373a91bbbff423caaa2ab4ab22befb9635
PKG_SOURCE_DATE:=2022-12-22
PKG_SOURCE_VERSION:=5b509e80384ab019ac11aa90c81ec0dbb5b0d7f2
PKG_MIRROR_HASH:=6fc25df4d28becd010ff4971b23731c08b53e69381a9e4c868091899712f78a9

PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
PKG_USE_NINJA:=0
Expand Down
Loading

0 comments on commit 31a47d4

Please sign in to comment.