domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

uboot-mediatek: remove duplicate config in mt7986

Browse Source 
Some config was written twice by mistake, fix it.

Signed-off-by: Chukun Pan <amadeus@jmu.edu.cn>
This commit is contained in:
Chukun Pan
2023-04-18 23:05:21 +08:00
committed by Daniel Golle
parent e38de40f8d
commit 5b0b464e49
2 changed files with 5 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
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,198 @@ @@ -0,0 +1,196 @@
+CONFIG_ARM=y +CONFIG_ARM=y
+CONFIG_POSITION_INDEPENDENT=y +CONFIG_POSITION_INDEPENDENT=y
+CONFIG_ARCH_MEDIATEK=y +CONFIG_ARCH_MEDIATEK=y
@@ -28,7 +28,6 @@
+CONFIG_DEBUG_UART_CLOCK=40000000 +CONFIG_DEBUG_UART_CLOCK=40000000
+CONFIG_DEBUG_UART=y +CONFIG_DEBUG_UART=y
+CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_SYS_LOAD_ADDR=0x46000000
+CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_SMBIOS_PRODUCT_NAME="" +CONFIG_SMBIOS_PRODUCT_NAME=""
+CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_KEYED=y
+CONFIG_BOOTDELAY=30 +CONFIG_BOOTDELAY=30
@@ -201,7 +200,6 @@
+CONFIG_SPI_FLASH_MTD=y +CONFIG_SPI_FLASH_MTD=y
+CONFIG_SPI_FLASH_WINBOND=y +CONFIG_SPI_FLASH_WINBOND=y
+# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set +# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
+CONFIG_CMD_MTD=y
+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
@@ -212,7 +210,7 @@
+CONFIG_SERVERIP="192.168.1.254" +CONFIG_SERVERIP="192.168.1.254"
--- /dev/null --- /dev/null
+++ b/configs/mt7986a_bpi-r3-nor_defconfig +++ b/configs/mt7986a_bpi-r3-nor_defconfig
@@ -0,0 +1,197 @@ @@ -0,0 +1,195 @@
+CONFIG_ARM=y +CONFIG_ARM=y
+CONFIG_POSITION_INDEPENDENT=y +CONFIG_POSITION_INDEPENDENT=y
+CONFIG_ARCH_MEDIATEK=y +CONFIG_ARCH_MEDIATEK=y
@@ -229,7 +227,6 @@
+CONFIG_DEBUG_UART_CLOCK=40000000 +CONFIG_DEBUG_UART_CLOCK=40000000
+CONFIG_DEBUG_UART=y +CONFIG_DEBUG_UART=y
+CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_SYS_LOAD_ADDR=0x46000000
+CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_SMBIOS_PRODUCT_NAME="" +CONFIG_SMBIOS_PRODUCT_NAME=""
+CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_KEYED=y
+CONFIG_BOOTDELAY=30 +CONFIG_BOOTDELAY=30
@@ -403,7 +400,6 @@
+CONFIG_SPI_FLASH_MTD=y +CONFIG_SPI_FLASH_MTD=y
+CONFIG_SPI_FLASH_WINBOND=y +CONFIG_SPI_FLASH_WINBOND=y
+# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set +# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
+CONFIG_CMD_MTD=y
+CONFIG_CMD_SF=y +CONFIG_CMD_SF=y
+CONFIG_LMB_MAX_REGIONS=64 +CONFIG_LMB_MAX_REGIONS=64
+CONFIG_USE_IPADDR=y +CONFIG_USE_IPADDR=y
@@ -412,7 +408,7 @@
+CONFIG_SERVERIP="192.168.1.254" +CONFIG_SERVERIP="192.168.1.254"
--- /dev/null --- /dev/null
+++ b/configs/mt7986a_bpi-r3-sd_defconfig +++ b/configs/mt7986a_bpi-r3-sd_defconfig
@@ -0,0 +1,198 @@ @@ -0,0 +1,196 @@
+CONFIG_ARM=y +CONFIG_ARM=y
+CONFIG_POSITION_INDEPENDENT=y +CONFIG_POSITION_INDEPENDENT=y
+CONFIG_ARCH_MEDIATEK=y +CONFIG_ARCH_MEDIATEK=y
@@ -429,7 +425,6 @@
+CONFIG_DEBUG_UART_CLOCK=40000000 +CONFIG_DEBUG_UART_CLOCK=40000000
+CONFIG_DEBUG_UART=y +CONFIG_DEBUG_UART=y
+CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_SYS_LOAD_ADDR=0x46000000
+CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_SMBIOS_PRODUCT_NAME="" +CONFIG_SMBIOS_PRODUCT_NAME=""
+CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_KEYED=y
+CONFIG_BOOTDELAY=30 +CONFIG_BOOTDELAY=30
@@ -602,7 +597,6 @@
+CONFIG_SPI_FLASH_MTD=y +CONFIG_SPI_FLASH_MTD=y
+CONFIG_SPI_FLASH_WINBOND=y +CONFIG_SPI_FLASH_WINBOND=y
+# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set +# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
+CONFIG_CMD_MTD=y
+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
@@ -613,7 +607,7 @@
+CONFIG_SERVERIP="192.168.1.254" +CONFIG_SERVERIP="192.168.1.254"
--- /dev/null --- /dev/null
+++ b/configs/mt7986a_bpi-r3-snand_defconfig +++ b/configs/mt7986a_bpi-r3-snand_defconfig
@@ -0,0 +1,199 @@ @@ -0,0 +1,197 @@
+CONFIG_ARM=y +CONFIG_ARM=y
+CONFIG_POSITION_INDEPENDENT=y +CONFIG_POSITION_INDEPENDENT=y
+CONFIG_ARCH_MEDIATEK=y +CONFIG_ARCH_MEDIATEK=y
@@ -630,7 +624,6 @@
+CONFIG_DEBUG_UART_CLOCK=40000000 +CONFIG_DEBUG_UART_CLOCK=40000000
+CONFIG_DEBUG_UART=y +CONFIG_DEBUG_UART=y
+CONFIG_SYS_LOAD_ADDR=0x46000000 +CONFIG_SYS_LOAD_ADDR=0x46000000
+CONFIG_NET_RANDOM_ETHADDR=y
+CONFIG_SMBIOS_PRODUCT_NAME="" +CONFIG_SMBIOS_PRODUCT_NAME=""
+CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_KEYED=y
+CONFIG_BOOTDELAY=30 +CONFIG_BOOTDELAY=30
@@ -804,7 +797,6 @@
+#CONFIG_SPI_FLASH_MTD=y +#CONFIG_SPI_FLASH_MTD=y
+#CONFIG_SPI_FLASH_WINBOND=y +#CONFIG_SPI_FLASH_WINBOND=y
+# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set +# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
+CONFIG_CMD_MTD=y
+#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

3
package/boot/uboot-mediatek/patches/431-add-xiaomi_redmi-ax6000.patch
View File

@@ -1,6 +1,6 @@
--- /dev/null --- /dev/null
+++ b/configs/mt7986_xiaomi_redmi-ax6000_defconfig +++ b/configs/mt7986_xiaomi_redmi-ax6000_defconfig
@@ -0,0 +1,180 @@ @@ -0,0 +1,179 @@
+CONFIG_ARM=y +CONFIG_ARM=y
+CONFIG_POSITION_INDEPENDENT=y +CONFIG_POSITION_INDEPENDENT=y
+CONFIG_ARCH_MEDIATEK=y +CONFIG_ARCH_MEDIATEK=y
@@ -173,7 +173,6 @@
+CONFIG_USE_DEFAULT_ENV_FILE=y +CONFIG_USE_DEFAULT_ENV_FILE=y
+CONFIG_MTD_SPI_NAND=y +CONFIG_MTD_SPI_NAND=y
+CONFIG_MTK_SPIM=y +CONFIG_MTK_SPIM=y
+CONFIG_CMD_MTD=y
+CONFIG_CMD_NAND=y +CONFIG_CMD_NAND=y
+CONFIG_CMD_NAND_TRIMFFS=y +CONFIG_CMD_NAND_TRIMFFS=y
+CONFIG_LMB_MAX_REGIONS=64 +CONFIG_LMB_MAX_REGIONS=64