From 5b0b464e496a17304aa51fa44d7cb863a827a9d3 Mon Sep 17 00:00:00 2001 From: Chukun Pan Date: Tue, 18 Apr 2023 23:05:21 +0800 Subject: [PATCH] uboot-mediatek: remove duplicate config in mt7986 Some config was written twice by mistake, fix it. Signed-off-by: Chukun Pan --- .../uboot-mediatek/patches/430-add-bpi-r3.patch | 16 ++++------------ .../patches/431-add-xiaomi_redmi-ax6000.patch | 3 +-- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/package/boot/uboot-mediatek/patches/430-add-bpi-r3.patch b/package/boot/uboot-mediatek/patches/430-add-bpi-r3.patch index 855f39ed97..53369feaf2 100644 --- a/package/boot/uboot-mediatek/patches/430-add-bpi-r3.patch +++ b/package/boot/uboot-mediatek/patches/430-add-bpi-r3.patch @@ -11,7 +11,7 @@ mt7986a-sd-rfb.dtb \ --- /dev/null +++ b/configs/mt7986a_bpi-r3-emmc_defconfig -@@ -0,0 +1,198 @@ +@@ -0,0 +1,196 @@ +CONFIG_ARM=y +CONFIG_POSITION_INDEPENDENT=y +CONFIG_ARCH_MEDIATEK=y @@ -28,7 +28,6 @@ +CONFIG_DEBUG_UART_CLOCK=40000000 +CONFIG_DEBUG_UART=y +CONFIG_SYS_LOAD_ADDR=0x46000000 -+CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_SMBIOS_PRODUCT_NAME="" +CONFIG_AUTOBOOT_KEYED=y +CONFIG_BOOTDELAY=30 @@ -201,7 +200,6 @@ +CONFIG_SPI_FLASH_MTD=y +CONFIG_SPI_FLASH_WINBOND=y +# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set -+CONFIG_CMD_MTD=y +CONFIG_CMD_SF=y +CONFIG_CMD_NAND=y +CONFIG_CMD_NAND_TRIMFFS=y @@ -212,7 +210,7 @@ +CONFIG_SERVERIP="192.168.1.254" --- /dev/null +++ b/configs/mt7986a_bpi-r3-nor_defconfig -@@ -0,0 +1,197 @@ +@@ -0,0 +1,195 @@ +CONFIG_ARM=y +CONFIG_POSITION_INDEPENDENT=y +CONFIG_ARCH_MEDIATEK=y @@ -229,7 +227,6 @@ +CONFIG_DEBUG_UART_CLOCK=40000000 +CONFIG_DEBUG_UART=y +CONFIG_SYS_LOAD_ADDR=0x46000000 -+CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_SMBIOS_PRODUCT_NAME="" +CONFIG_AUTOBOOT_KEYED=y +CONFIG_BOOTDELAY=30 @@ -403,7 +400,6 @@ +CONFIG_SPI_FLASH_MTD=y +CONFIG_SPI_FLASH_WINBOND=y +# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set -+CONFIG_CMD_MTD=y +CONFIG_CMD_SF=y +CONFIG_LMB_MAX_REGIONS=64 +CONFIG_USE_IPADDR=y @@ -412,7 +408,7 @@ +CONFIG_SERVERIP="192.168.1.254" --- /dev/null +++ b/configs/mt7986a_bpi-r3-sd_defconfig -@@ -0,0 +1,198 @@ +@@ -0,0 +1,196 @@ +CONFIG_ARM=y +CONFIG_POSITION_INDEPENDENT=y +CONFIG_ARCH_MEDIATEK=y @@ -429,7 +425,6 @@ +CONFIG_DEBUG_UART_CLOCK=40000000 +CONFIG_DEBUG_UART=y +CONFIG_SYS_LOAD_ADDR=0x46000000 -+CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_SMBIOS_PRODUCT_NAME="" +CONFIG_AUTOBOOT_KEYED=y +CONFIG_BOOTDELAY=30 @@ -602,7 +597,6 @@ +CONFIG_SPI_FLASH_MTD=y +CONFIG_SPI_FLASH_WINBOND=y +# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set -+CONFIG_CMD_MTD=y +CONFIG_CMD_SF=y +CONFIG_CMD_NAND=y +CONFIG_CMD_NAND_TRIMFFS=y @@ -613,7 +607,7 @@ +CONFIG_SERVERIP="192.168.1.254" --- /dev/null +++ b/configs/mt7986a_bpi-r3-snand_defconfig -@@ -0,0 +1,199 @@ +@@ -0,0 +1,197 @@ +CONFIG_ARM=y +CONFIG_POSITION_INDEPENDENT=y +CONFIG_ARCH_MEDIATEK=y @@ -630,7 +624,6 @@ +CONFIG_DEBUG_UART_CLOCK=40000000 +CONFIG_DEBUG_UART=y +CONFIG_SYS_LOAD_ADDR=0x46000000 -+CONFIG_NET_RANDOM_ETHADDR=y +CONFIG_SMBIOS_PRODUCT_NAME="" +CONFIG_AUTOBOOT_KEYED=y +CONFIG_BOOTDELAY=30 @@ -804,7 +797,6 @@ +#CONFIG_SPI_FLASH_MTD=y +#CONFIG_SPI_FLASH_WINBOND=y +# CONFIG_SPI_FLASH_USE_4K_SECTORS is not set -+CONFIG_CMD_MTD=y +#CONFIG_CMD_SF=y +CONFIG_CMD_NAND=y +CONFIG_CMD_NAND_TRIMFFS=y diff --git a/package/boot/uboot-mediatek/patches/431-add-xiaomi_redmi-ax6000.patch b/package/boot/uboot-mediatek/patches/431-add-xiaomi_redmi-ax6000.patch index 2d3f1aabea..098fc4e5e8 100644 --- a/package/boot/uboot-mediatek/patches/431-add-xiaomi_redmi-ax6000.patch +++ b/package/boot/uboot-mediatek/patches/431-add-xiaomi_redmi-ax6000.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/configs/mt7986_xiaomi_redmi-ax6000_defconfig -@@ -0,0 +1,180 @@ +@@ -0,0 +1,179 @@ +CONFIG_ARM=y +CONFIG_POSITION_INDEPENDENT=y +CONFIG_ARCH_MEDIATEK=y @@ -173,7 +173,6 @@ +CONFIG_USE_DEFAULT_ENV_FILE=y +CONFIG_MTD_SPI_NAND=y +CONFIG_MTK_SPIM=y -+CONFIG_CMD_MTD=y +CONFIG_CMD_NAND=y +CONFIG_CMD_NAND_TRIMFFS=y +CONFIG_LMB_MAX_REGIONS=64 -- 2.30.2