From df302bd006af610a271c01f9b455fba3f254c8fc Mon Sep 17 00:00:00 2001 From: Daniel Pawlik Date: Wed, 23 Jul 2025 14:29:35 +0200 Subject: [PATCH] Update mtk feed github actions Signed-off-by: Daniel Pawlik --- .github/workflows/bpi-r4-main_router.yaml | 2 +- .github/workflows/bpi-r4-mediatek_feed.yaml | 46 ++++++++++++++------- 2 files changed, 31 insertions(+), 17 deletions(-) diff --git a/.github/workflows/bpi-r4-main_router.yaml b/.github/workflows/bpi-r4-main_router.yaml index 257f5dd..4f524f0 100644 --- a/.github/workflows/bpi-r4-main_router.yaml +++ b/.github/workflows/bpi-r4-main_router.yaml @@ -1,5 +1,5 @@ --- -name: BPI-R4 + mtk-feed-firmware + EEPROM fix + main_router packages +name: BPI-R4 + EEPROM fix + main_router packages on: workflow_dispatch: diff --git a/.github/workflows/bpi-r4-mediatek_feed.yaml b/.github/workflows/bpi-r4-mediatek_feed.yaml index b17651c..596b984 100644 --- a/.github/workflows/bpi-r4-mediatek_feed.yaml +++ b/.github/workflows/bpi-r4-mediatek_feed.yaml @@ -20,7 +20,7 @@ env: REMOTE_BRANCH: openwrt-24.10 RELEASE_PREFIX: Mediatek_mt7988a_bpi-r4_mediatek DEVICE_CONFIG: ${{ inputs.DEVICE_CONFIG == 'poe' && 'configs/mediatek/mt7988a/bpi-r4-poe' || 'configs/mediatek/mt7988a/bpi-r4' }} - ROLE_CONFIG: configs/common/community + ROLE_CONFIG: configs/common/main-router jobs: check_commits: @@ -70,12 +70,6 @@ jobs: run: | sed -i 's/apply_autobuild_script_patch modify_feeds_conf update_feeds/apply_autobuild_script_patch update_feeds/g' mtk-openwrt-feeds/autobuild/unified/rules - - name: Add missing kernel config - run: | - echo '# CONFIG_IXGBEVF_IPSEC is not set' >> target/linux/generic/config-6.6 - echo '# CONFIG_IXGBE_IPSEC is not set' >> target/linux/generic/config-6.6 - echo '# CONFIG_RTL8261N_PHY is not set' >> target/linux/generic/config-6.6 - - name: Run Mediatek prepare run: | bash ./mtk-openwrt-feeds/autobuild/unified/autobuild.sh filogic-mac80211-mt7988_rfb-mt7996 prepare log_file=make @@ -83,24 +77,44 @@ jobs: - name: Configure firmware image run: | curl -SL "https://raw.githubusercontent.com/${{ github.repository_owner }}/openwrt-builder/master/${{ env.DEVICE_CONFIG }}" > .config - curl -SL "https://raw.githubusercontent.com/${{ github.repository_owner }}/openwrt-builder/master/configs/common/luci" >> .config - curl -SL "https://raw.githubusercontent.com/${{ github.repository_owner }}/openwrt-builder/master/configs/common/snapshot-short" >> .config - curl -SL "https://raw.githubusercontent.com/${{ github.repository_owner }}/openwrt-builder/master/configs/common/lte-5g-modem" >> .config curl -SL "https://raw.githubusercontent.com/${{ github.repository_owner }}/openwrt-builder/master/${{ env.ROLE_CONFIG }}" >> .config + curl -SL "https://raw.githubusercontent.com/${{ github.repository_owner }}/openwrt-builder/master/configs/common/snapshot" >> .config + curl -SL "https://raw.githubusercontent.com/${{ github.repository_owner }}/openwrt-builder/master/configs/common/snapshot-mtk-feed" >> .config - - name: Enable openssl + - name: Add missing kernel config or remove problematic and not needed for bpi-r4 run: | - sed -i '/CONFIG_PACKAGE_wpad-mbedtls=y/d' .config - curl -SL https://raw.githubusercontent.com/danpawlik/openwrt-builder/master/configs/common/openssl >> .config + echo 'CONFIG_PINCTRL_MT7987=y' >> target/linux/mediatek/filogic/config-6.6 + echo 'CONFIG_COMMON_CLK_MT7987=y' >> target/linux/mediatek/filogic/config-6.6 + echo 'CONFIG_VIRTIO_BLK=n' >> target/linux/mediatek/filogic/config-6.6 + echo 'CONFIG_VIRTIO_NET=n' >> target/linux/mediatek/filogic/config-6.6 + echo 'CONFIG_REMOTEPROC_CDEV=n' >> target/linux/mediatek/filogic/config-6.6 + echo 'CONFIG_MTK_SCP=n' >> target/linux/mediatek/filogic/config-6.6 + echo 'CONFIG_MEDIATEK_NETSYS_V2=y' >> target/linux/mediatek/filogic/config-6.6 + echo 'CONFIG_MEDIATEK_NETSYS_V3=y' >> target/linux/mediatek/filogic/config-6.6 + sed -i '/CONFIG_EXTRA_FIRMWARE/d' target/linux/mediatek/filogic/config-6.6 + sed -i '/CONFIG_EXTRA_FIRMWARE_DIR/d' target/linux/mediatek/filogic/config-6.6 + sed -i 's/# CONFIG_PACKAGE_kmod-phy-airoha-en8811h is not set/CONFIG_PACKAGE_kmod-phy-airoha-en8811h=y/g' .config - name: Run defconfig run: | make defconfig +# +### EEPROM FIX ### +# - # Full diff list is here: https://github.com/danpawlik/openwrt-builder/commit/13e8e751e28e9a9bd852e427b89ed4f3bc0cf15d#diff-c5c79fcc9dff2632be242ed35cef9527aab61e542217f71cd2d396155c976ec4R49 - - name: Set configs, that were set in Mediatek Feed prepare step + # https://github.com/openwrt/mt76/pull/954 + - name: Use patch from Yukariin run: | - echo "CONFIG_PACKAGE_mt7988-wo-firmware=y" >> .config + mkdir -p package/kernel/mt76/patches + curl -SL https://github.com/openwrt/mt76/commit/8088940ffd047a6d282a95af829562e8038f5b2d.patch > package/kernel/mt76/patches/001-Add-tx_power-check-Yukariin.patch + + # https://github.com/openwrt/mt76/pull/968 + - name: Use patch from im-0 + run: | + mkdir -p package/kernel/mt76/patches + curl -SL https://github.com/openwrt/mt76/commit/aaf90b24fde77a38ee9f0a60d7097ded6a94ad1f.patch > package/kernel/mt76/patches/001-use-tx_power-from-default-fw-if-EEPROM-contains-0s-im-0.patch + +################# - name: Print config file run: cat .config