From b0084ead533f4c8f8da4ff58feb69499dca965e2 Mon Sep 17 00:00:00 2001 From: lgs2007m <116912542@qq.com> Date: Mon, 9 Oct 2023 22:52:43 +0800 Subject: [PATCH 1/5] Update Redmi-AX6000-SPI-NAND-512MB-BL2_FIP-lgs2007m.yml --- .../Redmi-AX6000-SPI-NAND-512MB-BL2_FIP-lgs2007m.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Redmi-AX6000-SPI-NAND-512MB-BL2_FIP-lgs2007m.yml b/.github/workflows/Redmi-AX6000-SPI-NAND-512MB-BL2_FIP-lgs2007m.yml index b01343b..fa5aaf8 100644 --- a/.github/workflows/Redmi-AX6000-SPI-NAND-512MB-BL2_FIP-lgs2007m.yml +++ b/.github/workflows/Redmi-AX6000-SPI-NAND-512MB-BL2_FIP-lgs2007m.yml @@ -25,7 +25,7 @@ on: # - cron: 0 16 * * * env: - REPO_URL: https://github.com/hanwckf/bl-mt798x + REPO_URL: https://github.com/lgs2007m/bl-mt798x REPO_BRANCH: master DIY_SH: atf_uboot_build/diy-part.sh SSH_ACTIONS: false @@ -89,7 +89,8 @@ jobs: run: | cd openwrt echo -e "$(nproc) thread compile" - SOC=mt7986 BOARD=redmi_ax6000 ./build.sh + sudo apt install gcc-aarch64-linux-gnu build-essential flex bison libssl-dev + SOC=mt7986 BOARD=redmi_ax6000 MULTI_LAYOUT=1 ./build.sh echo "FILE_DATE=$(date +"%Y.%m.%d-%H%M")" >> $GITHUB_ENV echo "status=success" >> $GITHUB_OUTPUT From c003717fc6b9dedcf680ac24ebc3bb1fd3faabe1 Mon Sep 17 00:00:00 2001 From: lgs2007m <116912542@qq.com> Date: Mon, 9 Oct 2023 22:54:31 +0800 Subject: [PATCH 2/5] Update diy-part.sh --- atf_uboot_build/diy-part.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/atf_uboot_build/diy-part.sh b/atf_uboot_build/diy-part.sh index 8d440f4..c4fa2a3 100644 --- a/atf_uboot_build/diy-part.sh +++ b/atf_uboot_build/diy-part.sh @@ -6,8 +6,8 @@ echo 'CONFIG_SPIM_NAND_TYPE="spim:4k+256"' >> atf-20220606-637ba581b/configs/mt7 ## --------------uboot config---------------- ## 在CONFIG_ENABLE_NAND_NMBM后面增加CONFIG_NMBM_MAX_BLOCKS=64，修改默认mtdparts的ubi为490MB即501760k(ubi) -sed -i -e '/CONFIG_ENABLE_NAND_NMBM=y/ a\CONFIG_NMBM_MAX_BLOCKS=64' uboot-mtk-20220606/configs/mt7986_redmi_ax6000_defconfig -sed -i 's/112640k(ubi)/501760k(ubi)/' uboot-mtk-20220606/configs/mt7986_redmi_ax6000_defconfig +sed -i -e '/CONFIG_ENABLE_NAND_NMBM=y/ a\CONFIG_NMBM_MAX_BLOCKS=64' uboot-mtk-20220606/configs/mt7986_redmi_ax6000_multi_layout_defconfig +#sed -i 's/112640k(ubi)/501760k(ubi)/' uboot-mtk-20220606/configs/mt7986_redmi_ax6000_defconfig ## ---------------------------------------- ## 修改nandinfo为4k+256，这个可有可无，不影响 From 552fcf567998ad21e9ffd948cc53273892fdfdb7 Mon Sep 17 00:00:00 2001 From: lgs2007m <116912542@qq.com> Date: Wed, 18 Oct 2023 09:04:52 +0800 Subject: [PATCH 3/5] Update diy-part.sh --- atf_uboot_build/diy-part.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/atf_uboot_build/diy-part.sh b/atf_uboot_build/diy-part.sh index c4fa2a3..8d440f4 100644 --- a/atf_uboot_build/diy-part.sh +++ b/atf_uboot_build/diy-part.sh @@ -6,8 +6,8 @@ echo 'CONFIG_SPIM_NAND_TYPE="spim:4k+256"' >> atf-20220606-637ba581b/configs/mt7 ## --------------uboot config---------------- ## 在CONFIG_ENABLE_NAND_NMBM后面增加CONFIG_NMBM_MAX_BLOCKS=64，修改默认mtdparts的ubi为490MB即501760k(ubi) -sed -i -e '/CONFIG_ENABLE_NAND_NMBM=y/ a\CONFIG_NMBM_MAX_BLOCKS=64' uboot-mtk-20220606/configs/mt7986_redmi_ax6000_multi_layout_defconfig -#sed -i 's/112640k(ubi)/501760k(ubi)/' uboot-mtk-20220606/configs/mt7986_redmi_ax6000_defconfig +sed -i -e '/CONFIG_ENABLE_NAND_NMBM=y/ a\CONFIG_NMBM_MAX_BLOCKS=64' uboot-mtk-20220606/configs/mt7986_redmi_ax6000_defconfig +sed -i 's/112640k(ubi)/501760k(ubi)/' uboot-mtk-20220606/configs/mt7986_redmi_ax6000_defconfig ## ---------------------------------------- ## 修改nandinfo为4k+256，这个可有可无，不影响 From 207278a168a738f7b2f513960641f805f35a4c48 Mon Sep 17 00:00:00 2001 From: lgs2007m <116912542@qq.com> Date: Wed, 18 Oct 2023 09:05:41 +0800 Subject: [PATCH 4/5] Update Redmi-AX6000-SPI-NAND-512MB-BL2_FIP-lgs2007m.yml --- .../Redmi-AX6000-SPI-NAND-512MB-BL2_FIP-lgs2007m.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/Redmi-AX6000-SPI-NAND-512MB-BL2_FIP-lgs2007m.yml b/.github/workflows/Redmi-AX6000-SPI-NAND-512MB-BL2_FIP-lgs2007m.yml index fa5aaf8..af70137 100644 --- a/.github/workflows/Redmi-AX6000-SPI-NAND-512MB-BL2_FIP-lgs2007m.yml +++ b/.github/workflows/Redmi-AX6000-SPI-NAND-512MB-BL2_FIP-lgs2007m.yml @@ -90,7 +90,7 @@ jobs: cd openwrt echo -e "$(nproc) thread compile" sudo apt install gcc-aarch64-linux-gnu build-essential flex bison libssl-dev - SOC=mt7986 BOARD=redmi_ax6000 MULTI_LAYOUT=1 ./build.sh + SOC=mt7986 BOARD=redmi_ax6000 MULTI_LAYOUT=0 ./build.sh echo "FILE_DATE=$(date +"%Y.%m.%d-%H%M")" >> $GITHUB_ENV echo "status=success" >> $GITHUB_OUTPUT @@ -126,7 +126,7 @@ jobs: echo "release_tag=${{ env.FILE_DATE }}-${{ env.DEVICE_NAME }}" >> $GITHUB_OUTPUT touch release.txt echo "由衷感谢所有为openwrt无私奉献的大佬们" >> release.txt - echo "📥 uboot下载" >> release.txt + echo " uboot下载" >> release.txt echo "status=success" >> $GITHUB_OUTPUT - name: 发布至release From 250c76cd72d4c26252b15fb37bde04bfb404b803 Mon Sep 17 00:00:00 2001 From: lgs2007m <116912542@qq.com> Date: Wed, 18 Oct 2023 09:06:31 +0800 Subject: [PATCH 5/5] Update Redmi-AX6000-SPI-NAND-512MB-BL2_FIP-lgs2007m.yml --- .../workflows/Redmi-AX6000-SPI-NAND-512MB-BL2_FIP-lgs2007m.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Redmi-AX6000-SPI-NAND-512MB-BL2_FIP-lgs2007m.yml b/.github/workflows/Redmi-AX6000-SPI-NAND-512MB-BL2_FIP-lgs2007m.yml index af70137..1542bb8 100644 --- a/.github/workflows/Redmi-AX6000-SPI-NAND-512MB-BL2_FIP-lgs2007m.yml +++ b/.github/workflows/Redmi-AX6000-SPI-NAND-512MB-BL2_FIP-lgs2007m.yml @@ -25,7 +25,7 @@ on: # - cron: 0 16 * * * env: - REPO_URL: https://github.com/lgs2007m/bl-mt798x + REPO_URL: https://github.com/hanwckf/bl-mt798x REPO_BRANCH: master DIY_SH: atf_uboot_build/diy-part.sh SSH_ACTIONS: false