[openwrt/openwrt] uboot-mediatek: fix build error on mt7981-rfb and openwrt-one

[LEDE Commits]

nbd pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/978aa43e5590e82535924521f4e3abbf555a4ed1

commit 978aa43e5590e82535924521f4e3abbf555a4ed1
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Mon Sep 2 10:40:05 2024 +0200

    uboot-mediatek: fix build error on mt7981-rfb and openwrt-one
    
    Remove an unnecessary config option that was breaking the build
    
    Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
 .../patches/107-configs-add-useful-options-to-mt7981-rfb.patch | 10 ++++------
 .../uboot-mediatek/patches/314-mt7981-select-rootdisk.patch    |  4 ++--
 package/boot/uboot-mediatek/patches/453-add-openwrt-one.patch  |  6 ++----
 3 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/package/boot/uboot-mediatek/patches/107-configs-add-useful-options-to-mt7981-rfb.patch b/package/boot/uboot-mediatek/patches/107-configs-add-useful-options-to-mt7981-rfb.patch
index b33ba4bdee..4f5ef91d35 100644
--- a/package/boot/uboot-mediatek/patches/107-configs-add-useful-options-to-mt7981-rfb.patch
+++ b/package/boot/uboot-mediatek/patches/107-configs-add-useful-options-to-mt7981-rfb.patch
@@ -87,7 +87,7 @@
  CONFIG_CLK=y
 --- a/configs/mt7981_rfb_defconfig
 +++ b/configs/mt7981_rfb_defconfig
-@@ -11,7 +11,23 @@ CONFIG_DEBUG_UART_BASE=0x11002000
+@@ -11,7 +11,22 @@ CONFIG_DEBUG_UART_BASE=0x11002000
  CONFIG_DEBUG_UART_CLOCK=40000000
  CONFIG_SYS_LOAD_ADDR=0x46000000
  CONFIG_DEBUG_UART=y
@@ -106,13 +106,12 @@
 +CONFIG_LED_BLINK=y
 +CONFIG_LED_GPIO=y
 +CONFIG_SPI_BOOT=y
-+CONFIG_NAND_BOOT=y
 +CONFIG_BOOTSTD_DEFAULTS=y
 +CONFIG_BOOTSTD_FULL=y
  CONFIG_DEFAULT_FDT_FILE="mt7981-rfb"
  CONFIG_SYS_CBSIZE=512
  CONFIG_SYS_PBSIZE=1049
-@@ -22,23 +38,74 @@ CONFIG_SYS_PROMPT="MT7981> "
+@@ -22,23 +37,74 @@ CONFIG_SYS_PROMPT="MT7981> "
  # CONFIG_BOOTM_PLAN9 is not set
  # CONFIG_BOOTM_RTEMS is not set
  # CONFIG_BOOTM_VXWORKS is not set
@@ -278,7 +277,7 @@
  CONFIG_CLK=y
 --- a/configs/mt7981_snfi_nand_rfb_defconfig
 +++ b/configs/mt7981_snfi_nand_rfb_defconfig
-@@ -12,7 +12,23 @@ CONFIG_DEBUG_UART_BASE=0x11002000
+@@ -12,7 +12,22 @@ CONFIG_DEBUG_UART_BASE=0x11002000
  CONFIG_DEBUG_UART_CLOCK=40000000
  CONFIG_SYS_LOAD_ADDR=0x46000000
  CONFIG_DEBUG_UART=y
@@ -297,13 +296,12 @@
 +CONFIG_LED_BLINK=y
 +CONFIG_LED_GPIO=y
 +CONFIG_SPI_BOOT=y
-+CONFIG_NAND_BOOT=y
 +CONFIG_BOOTSTD_DEFAULTS=y
 +CONFIG_BOOTSTD_FULL=y
  CONFIG_DEFAULT_FDT_FILE="mt7981-snfi-nand-rfb"
  CONFIG_LOGLEVEL=7
  CONFIG_LOG=y
-@@ -22,22 +38,73 @@ CONFIG_SYS_PBSIZE=1049
+@@ -22,22 +37,73 @@ CONFIG_SYS_PBSIZE=1049
  # CONFIG_BOOTM_PLAN9 is not set
  # CONFIG_BOOTM_RTEMS is not set
  # CONFIG_BOOTM_VXWORKS is not set
diff --git a/package/boot/uboot-mediatek/patches/314-mt7981-select-rootdisk.patch b/package/boot/uboot-mediatek/patches/314-mt7981-select-rootdisk.patch
index c53e4a8752..05b620a276 100644
--- a/package/boot/uboot-mediatek/patches/314-mt7981-select-rootdisk.patch
+++ b/package/boot/uboot-mediatek/patches/314-mt7981-select-rootdisk.patch
@@ -81,7 +81,7 @@
 +CONFIG_OF_SYSTEM_SETUP=y
 --- a/configs/mt7981_rfb_defconfig
 +++ b/configs/mt7981_rfb_defconfig
-@@ -135,3 +135,4 @@ CONFIG_DM_SPI=y
+@@ -134,3 +134,4 @@ CONFIG_DM_SPI=y
  CONFIG_MTK_SPIM=y
  CONFIG_HEXDUMP=y
  CONFIG_LMB_MAX_REGIONS=64
@@ -95,7 +95,7 @@
 +CONFIG_OF_SYSTEM_SETUP=y
 --- a/configs/mt7981_snfi_nand_rfb_defconfig
 +++ b/configs/mt7981_snfi_nand_rfb_defconfig
-@@ -120,3 +120,4 @@ CONFIG_DM_SERIAL=y
+@@ -119,3 +119,4 @@ CONFIG_DM_SERIAL=y
  CONFIG_MTK_SERIAL=y
  CONFIG_HEXDUMP=y
  CONFIG_LMB_MAX_REGIONS=64
diff --git a/package/boot/uboot-mediatek/patches/453-add-openwrt-one.patch b/package/boot/uboot-mediatek/patches/453-add-openwrt-one.patch
index b35203bc12..0178c8da6d 100644
--- a/package/boot/uboot-mediatek/patches/453-add-openwrt-one.patch
+++ b/package/boot/uboot-mediatek/patches/453-add-openwrt-one.patch
@@ -206,7 +206,7 @@
 +};
 --- /dev/null
 +++ b/configs/mt7981_openwrt-one-nor_defconfig
-@@ -0,0 +1,129 @@
+@@ -0,0 +1,128 @@
 +CONFIG_ARM=y
 +CONFIG_SYS_HAS_NONCACHED_MEMORY=y
 +CONFIG_POSITION_INDEPENDENT=y
@@ -224,7 +224,6 @@
 +CONFIG_SYS_LOAD_ADDR=0x46000000
 +CONFIG_DEBUG_UART=y
 +CONFIG_FIT=y
-+CONFIG_NAND_BOOT=y
 +CONFIG_SPI_BOOT=y
 +CONFIG_AUTOBOOT_MENU_SHOW=y
 +CONFIG_USE_PREBOOT=y
@@ -338,7 +337,7 @@
 +CONFIG_LMB_MAX_REGIONS=64
 --- /dev/null
 +++ b/configs/mt7981_openwrt-one-spi-nand_defconfig
-@@ -0,0 +1,130 @@
+@@ -0,0 +1,129 @@
 +CONFIG_ARM=y
 +CONFIG_SYS_HAS_NONCACHED_MEMORY=y
 +CONFIG_POSITION_INDEPENDENT=y
@@ -355,7 +354,6 @@
 +CONFIG_SYS_LOAD_ADDR=0x46000000
 +CONFIG_DEBUG_UART=y
 +CONFIG_FIT=y
-+CONFIG_NAND_BOOT=y
 +CONFIG_SPI_BOOT=y
 +CONFIG_AUTOBOOT_MENU_SHOW=y
 +CONFIG_USE_PREBOOT=y