Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'openwrt:master' into master

Browse source
This commit is contained in:
Hayzam Sherif 2022-12-01 17:09:39 +04:00 committed by GitHub
commit 083dacb94f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
.github/workflows/labeler.yml vendored
View file

@ -17,3 +17,17 @@ jobs:
- uses: actions/labeler@v4 - uses: actions/labeler@v4
with: with:
repo-token: '${{ secrets.GITHUB_TOKEN }}' repo-token: '${{ secrets.GITHUB_TOKEN }}'
- name: Check Branch
id: check-branch
run: |
if echo "${{ github.base_ref }}" | grep -q -E 'openwrt-[0-9][0-9]\.[0-9][0-9]'; then
echo "release-tag=$(echo ${{ github.base_ref }} | sed 's/openwrt-/release\//')" >> $GITHUB_OUTPUT
fi
- uses: buildsville/add-remove-label@v2.0.0
if: ${{ steps.check-branch.outputs.release-tag }}
with:
token: ${{secrets.GITHUB_TOKEN}}
labels: ${{ steps.check-branch.outputs.release-tag }}
type: add

14
package/boot/uboot-mediatek/patches/430-add-bpi-r3.patch
View file

@ -11,7 +11,7 @@
mt7986a-sd-rfb.dtb \ mt7986a-sd-rfb.dtb \
--- /dev/null --- /dev/null
+++ b/configs/mt7986a_bpi-r3-emmc_defconfig +++ b/configs/mt7986a_bpi-r3-emmc_defconfig
@@ -0,0 +1,192 @@ @@ -0,0 +1,193 @@
+CONFIG_ARM=y +CONFIG_ARM=y
+CONFIG_POSITION_INDEPENDENT=y +CONFIG_POSITION_INDEPENDENT=y
+CONFIG_ARCH_MEDIATEK=y +CONFIG_ARCH_MEDIATEK=y
@ -204,9 +204,10 @@
+CONFIG_CMD_SF=y +CONFIG_CMD_SF=y
+CONFIG_CMD_NAND=y +CONFIG_CMD_NAND=y
+CONFIG_CMD_NAND_TRIMFFS=y +CONFIG_CMD_NAND_TRIMFFS=y
+CONFIG_LMB_MAX_REGIONS=64
--- /dev/null --- /dev/null
+++ b/configs/mt7986a_bpi-r3-nor_defconfig +++ b/configs/mt7986a_bpi-r3-nor_defconfig
@@ -0,0 +1,193 @@ @@ -0,0 +1,192 @@
+CONFIG_ARM=y +CONFIG_ARM=y
+CONFIG_POSITION_INDEPENDENT=y +CONFIG_POSITION_INDEPENDENT=y
+CONFIG_ARCH_MEDIATEK=y +CONFIG_ARCH_MEDIATEK=y
@ -398,11 +399,10 @@
+# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set +# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
+CONFIG_CMD_MTD=y +CONFIG_CMD_MTD=y
+CONFIG_CMD_SF=y +CONFIG_CMD_SF=y
+#CONFIG_CMD_NAND=y +CONFIG_LMB_MAX_REGIONS=64
+#CONFIG_CMD_NAND_TRIMFFS=y
--- /dev/null --- /dev/null
+++ b/configs/mt7986a_bpi-r3-sd_defconfig +++ b/configs/mt7986a_bpi-r3-sd_defconfig
@@ -0,0 +1,192 @@ @@ -0,0 +1,193 @@
+CONFIG_ARM=y +CONFIG_ARM=y
+CONFIG_POSITION_INDEPENDENT=y +CONFIG_POSITION_INDEPENDENT=y
+CONFIG_ARCH_MEDIATEK=y +CONFIG_ARCH_MEDIATEK=y
@ -595,9 +595,10 @@
+CONFIG_CMD_SF=y +CONFIG_CMD_SF=y
+CONFIG_CMD_NAND=y +CONFIG_CMD_NAND=y
+CONFIG_CMD_NAND_TRIMFFS=y +CONFIG_CMD_NAND_TRIMFFS=y
+CONFIG_LMB_MAX_REGIONS=64
--- /dev/null --- /dev/null
+++ b/configs/mt7986a_bpi-r3-snand_defconfig +++ b/configs/mt7986a_bpi-r3-snand_defconfig
@@ -0,0 +1,193 @@ @@ -0,0 +1,194 @@
+CONFIG_ARM=y +CONFIG_ARM=y
+CONFIG_POSITION_INDEPENDENT=y +CONFIG_POSITION_INDEPENDENT=y
+CONFIG_ARCH_MEDIATEK=y +CONFIG_ARCH_MEDIATEK=y
@ -791,6 +792,7 @@
+#CONFIG_CMD_SF=y +#CONFIG_CMD_SF=y
+CONFIG_CMD_NAND=y +CONFIG_CMD_NAND=y
+CONFIG_CMD_NAND_TRIMFFS=y +CONFIG_CMD_NAND_TRIMFFS=y
+CONFIG_LMB_MAX_REGIONS=64
--- /dev/null --- /dev/null
+++ b/arch/arm/dts/mt7986a-bpi-r3-emmc.dts +++ b/arch/arm/dts/mt7986a-bpi-r3-emmc.dts
@@ -0,0 +1,33 @@ @@ -0,0 +1,33 @@