[][openwrt-24][Mac80211][2024-10-10 Update]
[Description]
Update the Readme and default hnat/wed on.
[Release-log]
N/A
Change-Id: I8b2b01ab6f654434d5a96c034a1c689f08d202e8
Reviewed-on: https://gerrit.mediatek.inc/c/openwrt/feeds/mtk_openwrt_feeds/+/9733806
diff --git a/autobuild/unified/Readme.md b/autobuild/unified/Readme.md
index b28af33..9dd2b9f 100644
--- a/autobuild/unified/Readme.md
+++ b/autobuild/unified/Readme.md
@@ -1,104 +1,124 @@
-# Mediatek Upstream SoftMAC WiFi Driver - MT76 Release Note (OpenWRT main/Kernel 6.6)
-
-## Compile Environment Requirement
-
-- Minumum requirement: Ubuntu 22.04
-
-##### Toolchain
-
-- Installs essential development tools and libraries, including compilers, build tools. Please refer to https://openwrt.org/docs/guide-developer/toolchain/install-buildsystem for more detail
-```
-sudo apt update
-sudo apt install build-essential clang flex bison g++ gawk \
-gcc-multilib g++-multilib gettext git libncurses-dev libssl-dev \
-python3-distutils python3-setuptools rsync swig unzip zlib1g-dev file wget
-```
----
-
-## Uboot & ATF
-The OpenWrt/24.10 or trunk image type is ITB, which cannot be loaded if the original U-Boot is too old. Please update to a newer U-Boot that supports both OpenWrt 21.0x and OpenWrt 24.xx image types. The minimum required version is 2024-08-07.
-
-- Since U-Boot is still released as a tarball, please log in to the DCC or contact the corresponding window to obtain the latest U-Boot and ATF source code.
-
-##### SPIM-NAND
-Note: Please follow the SOP below to upgrade the bl2 and fip on your board.
-
-1. Upgrade the bl2.img file according to the DRAM type, and program this file using the "3. Upgrade ATF BL2" option in the U-Boot menu.
-
-2. Upgrade the flp.bin file, and program this file using the "4. Upgrade ATF FIP" option in the U-Boot menu.
-
-3. Reboot the board. You can now upgrade the ITB image using "2. Upgrade firmware"
-
-##### EMMC
-Note: Please follow the SOP below to upgrade the U-Boot image and GPT partition on your board.
-
-1. Upgrade u-boot_1g.bin, and program this file using the "6. Upgrade bootloader only" option in the U-Boot menu.
-
-2. Program GPT_EMMC_mt798x_itb using the "7. Upgrade partition table" option in the U-Boot menu.
-
-3. Reboot the board. You can now upgrade the ITB image using "2. Upgrade firmware"
----
-
-### Supported Chipsets
-- Filogic880/MT7996 802.11a/b/g/n/ac/ax/be BE19000/BE14000 2.4/5G/6GHz PCIe Chip
----
-
-## Wi-Fi 7 Latest Release Version
-
-- **Date**: 2024-09-03
-- **Modified By**: Evelyn Tsai
-- **Summary of Changes**:
- - Platform
- - Support RTL8261N 10G PHY
- - Support MTK Prpl Reference Board
- - Support BananaPi Boards (BPI-R4)
-
- - WiFi - Basic WiFi7 EHT SU (not support MLO)
- - 320 MHz bandwidth
- - 4096-QAM MCS12, MCS13
- - WPA3 key management (AKM24)
-
-
-#### Filogic 880 WiFi7 Pre-porting Release
-
-##### External Release
-
-```
-#Get Openwrt master source code from Git Server
-git clone --branch master https://git.openwrt.org/openwrt/openwrt.git openwrt
-
-#Get mtk-openwrt-feeds source code
-git clone --branch master https://git01.mediatek.com/openwrt/feeds/mtk-openwrt-feeds
-
-#Choose one SKU to build (1st Build)
-cd openwrt
-## 1. Filogic 880 (MT7988+MT7996) MTK Reference Board (RFB)
-bash ../mtk-openwrt-feeds/autobuild/unified/autobuild.sh filogic-mac80211-BE19000 log_file=make
-## 2. MTK Prpl Reference Board (Mozart)
-bash ../mtk-openwrt-feeds/autobuild/unified/autobuild.sh filogic-mac80211-mozart log_file=make
-## 2. BananaPi Boards (BPI-R4)
-bash ../mtk-openwrt-feeds/autobuild/unified/autobuild.sh filogic-mac80211-bpi log_file=make
-
-#Further Build (After 1st full build)
-bash ../mtk-openwrt-feeds/autobuild/unified/autobuild.sh build
-
-#Clean OpenWrt source tree
-bash ../mtk-openwrt-feeds/autobuild/unified/autobuild.sh clean
-```
-
-##### WiFi Package Version
-
-| Platform | OpenWrt/main | git01.mediatek.com |
-|--------------------------|-------------------------------|-----------------------------------------------------------------------------------|
-| Kernel | 6.6.48 | ./feeds/mtk_openwrt_feed/master/patches-base |
-| **WiFi Package** | **OpenWrt/master** | **MTK Internal Patches** |
-| Hostapd | PKG_SOURCE_DATE:=2024-03-09 | ./feeds/mtk_openwrt_feed/autobuild/unified/filogic/mac80211/master/files/package/nerwork/services/hostapd/patches |
-| libnl-tiny | PKG_SOURCE_DATE:=2023-12-05 | N/A |
-| iw | PKG_VERSION:=6.9 | |
-| iwinfo | PKG_SOURCE_DATE:=2024-07-06 | N/A |
-| wireless-regdb | PKG_VERSION:=2024-07-04 | ./feeds/mtk_openwrt_feed/autobuild/unified/filogic/mac80211/master/files/package/firmware/wireless-regdb/patches |
-| ucode | PKG_VERSION:=2024-07-11 | |
-| wifi-scripts | PKG_VERSION:=1.0 | |
-| netifd | PKG_VERSION:=2024-09-03 | |
-| MAC80211 | PKG_VERSION:=6.9.9 | ./feeds/mtk_openwrt_feed/autobuild/unified/filogic/mac80211/master/files/package/kernel/mac80211/patches |
-| MT76 | PKG_SOURCE_DATE:=2024-08-25 | **Patches**: ./feeds/mtk_openwrt_feed/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/patches **Firmware** ./feeds/mtk_openwrt_feed/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996 |
+# Mediatek Upstream SoftMAC WiFi Driver - MT76 Release Note (OpenWRT main/Kernel 6.6)
+
+## Compile Environment Requirement
+
+- Minumum requirement: Ubuntu 22.04
+
+##### Toolchain
+
+- Installs essential development tools and libraries, including compilers, build tools. Please refer to https://openwrt.org/docs/guide-developer/toolchain/install-buildsystem for more detail
+```
+sudo apt update
+sudo apt install build-essential clang flex bison g++ gawk \
+gcc-multilib g++-multilib gettext git libncurses-dev libssl-dev \
+python3-distutils python3-setuptools rsync swig unzip zlib1g-dev file wget
+```
+---
+
+## Uboot & ATF
+The OpenWrt/24.10 or trunk image type is ITB, which cannot be loaded if the original U-Boot is too old. Please update to a newer U-Boot that supports both OpenWrt 21.0x and OpenWrt 24.xx image types. The minimum required version is 2024-08-07.
+
+- Since U-Boot is still released as a tarball, please log in to the DCC or contact the corresponding window to obtain the latest U-Boot and ATF source code.
+
+##### SPIM-NAND
+Note: Please follow the SOP below to upgrade the bl2 and fip on your board.
+
+1. Upgrade the bl2.img file according to the DRAM type, and program this file using the "3. Upgrade ATF BL2" option in the U-Boot menu.
+
+2. Upgrade the flp.bin file, and program this file using the "4. Upgrade ATF FIP" option in the U-Boot menu.
+
+3. Reboot the board. You can now upgrade the ITB image using "2. Upgrade firmware"
+
+##### EMMC
+Note: Please follow the SOP below to upgrade the U-Boot image and GPT partition on your board.
+
+1. Upgrade u-boot_1g.bin, and program this file using the "6. Upgrade bootloader only" option in the U-Boot menu.
+
+2. Program GPT_EMMC_mt798x_itb using the "7. Upgrade partition table" option in the U-Boot menu.
+
+3. Reboot the board. You can now upgrade the ITB image using "2. Upgrade firmware"
+---
+
+### Supported Chipsets
+- Filogic880/MT7996 802.11a/b/g/n/ac/ax/be BE19000/BE14000 2.4/5G/6GHz PCIe Chip
+- *NEW* Filogic860/MT7992 802.11a/b/g/n/ac/ax/be BE7200/BE5000 2.4/5G PCIe Chip
+---
+
+### Default EEPROM Bin
+- Filogic880/BE19000 (4-4-4)
+ - eFEM: mt7996_eeprom.bin
+ - iFEM: mt7996_eeprom_2i5i6i.bin
+
+- Filogic880/BE14000 (2-3-3)
+ - eFEM: mt7996_eeprom_233.bin
+ - iFEM: mt7996_eeprom_233_2i5i6i.bin
+
+- Filogic860/BE7200 (4-4)
+ - eFEM: mt7992_eeprom.bin
+ - iFEM: mt7992_eeprom_2i5i.bin
+ - 2i5e: mt7992_eeprom_2i5e.bin
+
+- Filogic860/BE5000 (2-3)
+ - eFEM: mt7992_eeprom_23.bin
+ - iFEM: mt7992_eeprom_23_2i5i.bin
+
+## Wi-Fi 7 Latest Release Version
+
+- **Date**: 2024-10-10
+- **Modified By**: Evelyn Tsai (evelyn.tsai@mediatek.com)
+- **Summary of Changes**:
+ - Platform
+ - Support RTL8261N 10G PHY
+ - Support MTK Prpl Reference Board, BE19000
+ - Support BananaPi Boards (BPI-R4), BE14000
+
+ - WiFi - Basic WiFi7 EHT SU (not support MLO)
+ - 320 MHz bandwidth
+ - 4096-QAM MCS12, MCS13
+ - WPA3 key management (AKM24)
+ - *NEW* Flowblock HNAT and WED over Bridger
+
+
+#### Filogic 880 WiFi7 Pre-porting Release
+
+##### External Release (Snapshot from OpenWrt.git^c3251f)
+
+```
+#Get Openwrt master source code from Git Server
+git clone --branch master https://git.openwrt.org/openwrt/openwrt.git openwrt
+
+#Get mtk-openwrt-feeds source code
+git clone --branch master https://git01.mediatek.com/openwrt/feeds/mtk-openwrt-feeds
+
+#Choose one SKU to build (1st Build)
+cd openwrt
+## 1. Filogic 880 (MT7988+MT7996) MTK Reference Board (RFB)
+bash ../mtk-openwrt-feeds/autobuild/unified/autobuild.sh filogic-mac80211-BE19000 log_file=make
+## 2. MTK Prpl Reference Board (Mozart)
+bash ../mtk-openwrt-feeds/autobuild/unified/autobuild.sh filogic-mac80211-mozart log_file=make
+## 2. BananaPi Boards (BPI-R4)
+bash ../mtk-openwrt-feeds/autobuild/unified/autobuild.sh filogic-mac80211-bpi log_file=make
+
+#Further Build (After 1st full build)
+bash ../mtk-openwrt-feeds/autobuild/unified/autobuild.sh build
+
+#Clean OpenWrt source tree
+bash ../mtk-openwrt-feeds/autobuild/unified/autobuild.sh clean
+```
+
+##### WiFi Package Version
+
+| Platform | OpenWrt/main | git01.mediatek.com |
+|--------------------------|-------------------------------|-----------------------------------------------------------------------------------|
+| Kernel | 6.6.48 | ./feeds/mtk_openwrt_feed/master/patches-base |
+| **WiFi Package** | **OpenWrt/master** | **MTK Internal Patches** |
+| Hostapd | PKG_SOURCE_DATE:=2024-09-15 | ./feeds/mtk_openwrt_feed/autobuild/unified/filogic/mac80211/master/files/package/nerwork/services/hostapd/patches |
+| libnl-tiny | PKG_SOURCE_DATE:=2023-12-05 | N/A |
+| iw | PKG_VERSION:=6.9 | |
+| iwinfo | PKG_SOURCE_DATE:=2024-10-01 | N/A |
+| wireless-regdb | PKG_VERSION:=2024-07-04 | ./feeds/mtk_openwrt_feed/autobuild/unified/filogic/mac80211/master/files/package/firmware/wireless-regdb/patches |
+| ucode | PKG_VERSION:=2024-07-22 | |
+| wifi-scripts | PKG_VERSION:=1.0 | |
+| netifd | PKG_VERSION:=2024-09-03 | |
+| MAC80211 | PKG_VERSION:=6.11.2 | ./feeds/mtk_openwrt_feed/autobuild/unified/filogic/mac80211/master/files/package/kernel/mac80211/patches |
+| MT76 | PKG_SOURCE_DATE:=2024-09-29 | **Patches**: ./feeds/mtk_openwrt_feed/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/patches **Firmware** ./feeds/mtk_openwrt_feed/autobuild/unified/filogic/mac80211/master/files/package/kernel/mt76/src/firmware/mt7996 |
diff --git a/autobuild/unified/filogic/mac80211/bpi/master/defconfig b/autobuild/unified/filogic/mac80211/bpi/master/defconfig
index bd38319..6146ea3 100644
--- a/autobuild/unified/filogic/mac80211/bpi/master/defconfig
+++ b/autobuild/unified/filogic/mac80211/bpi/master/defconfig
@@ -16,6 +16,8 @@
CONFIG_PACKAGE_trusted-firmware-a-mt7988-ram-comb=y
CONFIG_PACKAGE_perf=y
# CONFIG_PACKAGE_mt7981-wo-firmware is not set
+# CONFIG_PACKAGE_kmod-mt7992-23-firmware is not set
+# CONFIG_PACKAGE_kmod-mt7992-firmware is not set
CONFIG_PACKAGE_CFG80211_TESTMODE=y
# CONFIG_PACKAGE_kmod-mt7981-firmware is not set
CONFIG_WPA_MSG_MIN_PRIORITY=3
diff --git a/autobuild/unified/filogic/mac80211/master/patches-base/0001-mt76-package-makefile.patch b/autobuild/unified/filogic/mac80211/master/patches-base/0001-mt76-package-makefile.patch
index d4bee4e..869002a 100644
--- a/autobuild/unified/filogic/mac80211/master/patches-base/0001-mt76-package-makefile.patch
+++ b/autobuild/unified/filogic/mac80211/master/patches-base/0001-mt76-package-makefile.patch
@@ -1,8 +1,16 @@
diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile
-index 070d0f3..0d4ccdd 100644
+index 75a77a1..19caf16 100644
--- a/package/kernel/mt76/Makefile
+++ b/package/kernel/mt76/Makefile
-@@ -665,6 +665,7 @@ define KernelPackage/mt7992-firmware/install
+@@ -322,6 +322,7 @@ define KernelPackage/mt7996e
+ +@KERNEL_RELAY +@DRIVER_11BE_SUPPORT
+ FILES:= $(PKG_BUILD_DIR)/mt7996/mt7996e.ko
+ AUTOLOAD:=$(call AutoProbe,mt7996e)
++ MODPARAMS.mt7996e:=wed_enable=1
+ endef
+
+ define KernelPackage/mt7992-firmware
+@@ -664,6 +665,7 @@ define KernelPackage/mt7992-firmware/install
$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_rom_patch.bin \
$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_wa.bin \
$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_wm.bin \
@@ -10,7 +18,7 @@
$(1)/lib/firmware/mediatek/mt7996
endef
-@@ -677,6 +678,7 @@ define KernelPackage/mt7992-23-firmware/install
+@@ -676,6 +678,7 @@ define KernelPackage/mt7992-23-firmware/install
$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_rom_patch_23.bin \
$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_wa_23.bin \
$(PKG_BUILD_DIR)/firmware/mt7996/mt7992_wm_23.bin \
@@ -18,7 +26,7 @@
$(1)/lib/firmware/mediatek/mt7996
endef
-@@ -695,6 +697,7 @@ define KernelPackage/mt7996-firmware/install
+@@ -694,6 +697,7 @@ define KernelPackage/mt7996-firmware/install
$(PKG_BUILD_DIR)/firmware/mt7996/mt7996_rom_patch.bin \
$(PKG_BUILD_DIR)/firmware/mt7996/mt7996_wa.bin \
$(PKG_BUILD_DIR)/firmware/mt7996/mt7996_wm.bin \
@@ -26,10 +34,12 @@
$(1)/lib/firmware/mediatek/mt7996
endef
-@@ -706,6 +709,7 @@ define KernelPackage/mt7996-233-firmware/install
+@@ -705,6 +709,7 @@ define KernelPackage/mt7996-233-firmware/install
$(PKG_BUILD_DIR)/firmware/mt7996/mt7996_rom_patch_233.bin \
$(PKG_BUILD_DIR)/firmware/mt7996/mt7996_wa_233.bin \
$(PKG_BUILD_DIR)/firmware/mt7996/mt7996_wm_233.bin \
+ $(PKG_BUILD_DIR)/firmware/mt7996/mt7996_wm_tm_233.bin \
$(1)/lib/firmware/mediatek/mt7996
endef
+
+
diff --git a/autobuild/unified/filogic/mac80211/mozart/master/defconfig b/autobuild/unified/filogic/mac80211/mozart/master/defconfig
index 15e2f55..3a04004 100644
--- a/autobuild/unified/filogic/mac80211/mozart/master/defconfig
+++ b/autobuild/unified/filogic/mac80211/mozart/master/defconfig
@@ -19,7 +19,8 @@
CONFIG_PACKAGE_pptpd=y
CONFIG_PACKAGE_xl2tpd=y
CONFIG_WPA_ENABLE_WEP=y
-CONFIG_PACKAGE_wpad-openssl=m
+# CONFIG_PACKAGE_wpad-basic-openssl is not set
+CONFIG_PACKAGE_wpad-openssl=y
CONFIG_PACKAGE_omcproxy=y
CONFIG_PACKAGE_ppp-mod-pptp=y
CONFIG_PACKAGE_e2fsprogs=y