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:
  mt76: enable wed wireless acc for filogic target by default
  Version bumpt to R23.7.7
  mediatek: add CETRON CT3003 support
  r8101: update to version 1.038.02
  rtw88-usb: bump to latest git HEAD
  add missing ssb and bcma (coolsnowwolf#11343)
  add python3-setuptools (coolsnowwolf#11345)
  bcm53xx: 5.4: add missing kconfig (coolsnowwolf#11341)
  bcm53xx: add missing kconfig (coolsnowwolf#11340)
  • Loading branch information
github-actions[bot] committed Jul 7, 2023
2 parents a37957d + bafee3f commit 9b77714
Show file tree
Hide file tree
Showing 18 changed files with 2,044 additions and 48 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
libmpc-dev libmpfr-dev libncurses5-dev libncursesw5-dev libreadline-dev libssl-dev libtool lrzsz \
mkisofs msmtp nano ninja-build p7zip p7zip-full patch pkgconf python2.7 python3 python3-pyelftools \
libpython3-dev qemu-utils rsync scons squashfs-tools subversion swig texinfo uglifyjs upx-ucl unzip \
vim wget xmlto xxd zlib1g-dev
vim wget xmlto xxd zlib1g-dev python3-setuptools
```

3. 下载源代码,更新 feeds 并选择配置
Expand Down
3 changes: 3 additions & 0 deletions package/kernel/mt76/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,9 @@ define KernelPackage/mt7915e
DEPENDS+=@PCI_SUPPORT +kmod-mt76-connac +kmod-hwmon-core +kmod-thermal +@DRIVER_11AX_SUPPORT +@KERNEL_RELAY
FILES:= $(PKG_BUILD_DIR)/mt7915/mt7915e.ko
AUTOLOAD:=$(call AutoProbe,mt7915e)
ifdef CONFIG_TARGET_mediatek_filogic
MODPARAMS.mt7915e:=wed_enable=Y
endif
endef

define KernelPackage/mt7916-firmware
Expand Down
24 changes: 12 additions & 12 deletions package/kernel/rtw88-usb/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ PKG_NAME:=rtw88-usb
PKG_RELEASE:=1

PKG_SOURCE_PROTO:=git
PKG_SOURCE_DATE:=2023-02-11
PKG_SOURCE_DATE:=2023-06-28
PKG_SOURCE_URL:=https://github.com/lwfinger/rtw88.git
PKG_SOURCE_VERSION:=3af004dd40588e86280f0c58a483de6f53b9803f
PKG_MIRROR_HASH:=13a476c6e46702dee0a3ea2cd743587ab889414be2dce979e652f3bbfa106d76
PKG_SOURCE_VERSION:=7ca1ec0e768f083e4a2116d6978021814b83bb74
PKG_MIRROR_HASH:=101e4769c8c25a0b1c186c2b65a1f03b4c600b36fdb20948ef3c82e75e2f6582

PKG_BUILD_PARALLEL:=1

Expand All @@ -35,7 +35,7 @@ define KernelPackage/rtw88-usb
HIDDEN:=1
FILES:= \
$(PKG_BUILD_DIR)/rtw_core.ko \
$(PKG_BUILD_DIR)/rtw88_usb.ko
$(PKG_BUILD_DIR)/rtw_usb.ko
endef

define KernelPackage/rtl8723du
Expand All @@ -44,8 +44,8 @@ define KernelPackage/rtl8723du
DEPENDS+=+kmod-rtw88-usb +rtl8723du-firmware
FILES:= \
$(PKG_BUILD_DIR)/rtw_8723d.ko \
$(PKG_BUILD_DIR)/rtw88_8723du.ko
AUTOLOAD:=$(call AutoProbe,rtw88_8723du)
$(PKG_BUILD_DIR)/rtw_8723du.ko
AUTOLOAD:=$(call AutoProbe,rtw_8723du)
endef

define KernelPackage/rtl8821cu
Expand All @@ -54,8 +54,8 @@ define KernelPackage/rtl8821cu
DEPENDS+=+kmod-rtw88-usb +rtl8821ce-firmware
FILES:= \
$(PKG_BUILD_DIR)/rtw_8821c.ko \
$(PKG_BUILD_DIR)/rtw88_8821cu.ko
AUTOLOAD:=$(call AutoProbe,rtw88_8821cu)
$(PKG_BUILD_DIR)/rtw_8821cu.ko
AUTOLOAD:=$(call AutoProbe,rtw_8821cu)
endef

define KernelPackage/rtl8822bu
Expand All @@ -64,8 +64,8 @@ define KernelPackage/rtl8822bu
DEPENDS+=+kmod-rtw88-usb +rtl8822be-firmware
FILES:= \
$(PKG_BUILD_DIR)/rtw_8822b.ko \
$(PKG_BUILD_DIR)/rtw88_8822bu.ko
AUTOLOAD:=$(call AutoProbe,rtw88_8822bu)
$(PKG_BUILD_DIR)/rtw_8822bu.ko
AUTOLOAD:=$(call AutoProbe,rtw_8822bu)
endef

define KernelPackage/rtl8822cu
Expand All @@ -74,8 +74,8 @@ define KernelPackage/rtl8822cu
DEPENDS+=+kmod-rtw88-usb +rtl8822ce-firmware
FILES:= \
$(PKG_BUILD_DIR)/rtw_8822c.ko \
$(PKG_BUILD_DIR)/rtw88_8822cu.ko
AUTOLOAD:=$(call AutoProbe,rtw88_8822cu)
$(PKG_BUILD_DIR)/rtw_8822cu.ko
AUTOLOAD:=$(call AutoProbe,rtw_8822cu)
endef

NOSTDINC_FLAGS := \
Expand Down
11 changes: 0 additions & 11 deletions package/kernel/rtw88-usb/patches/101-wireless-5.14.patch

This file was deleted.

Loading

0 comments on commit 9b77714

Please sign in to comment.