[openwrt/openwrt] uboot-mediatek: fix build error on mt7988-rfb

[LEDE Commits]

nbd pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/37f5a3bb01305ca9e853f512fc3e4b929be83f0c

commit 37f5a3bb01305ca9e853f512fc3e4b929be83f0c
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Mon Jul 15 11:55:20 2024 +0200

    uboot-mediatek: fix build error on mt7988-rfb
    
    Remove an unnecessary config option that was breaking the build
    
    Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
 .../105-configs-add-usefull-stuff-to-mt7988-rfb.patch      | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/package/boot/uboot-mediatek/patches/105-configs-add-usefull-stuff-to-mt7988-rfb.patch b/package/boot/uboot-mediatek/patches/105-configs-add-usefull-stuff-to-mt7988-rfb.patch
index 32d87a376d..6040aaa0c4 100644
--- a/package/boot/uboot-mediatek/patches/105-configs-add-usefull-stuff-to-mt7988-rfb.patch
+++ b/package/boot/uboot-mediatek/patches/105-configs-add-usefull-stuff-to-mt7988-rfb.patch
@@ -1,6 +1,6 @@
 --- a/configs/mt7988_sd_rfb_defconfig
 +++ b/configs/mt7988_sd_rfb_defconfig
-@@ -11,6 +11,24 @@ CONFIG_DEBUG_UART_BASE=0x11000000
+@@ -11,6 +11,23 @@ CONFIG_DEBUG_UART_BASE=0x11000000
  CONFIG_DEBUG_UART_CLOCK=40000000
  CONFIG_SYS_LOAD_ADDR=0x46000000
  CONFIG_DEBUG_UART=y
@@ -19,13 +19,12 @@
 +CONFIG_LED_GPIO=y
 +CONFIG_SPI_BOOT=y
 +CONFIG_SD_BOOT=y
-+CONFIG_NAND_BOOT=y
 +CONFIG_BOOTSTD_DEFAULTS=y
 +CONFIG_BOOTSTD_FULL=y
  # CONFIG_AUTOBOOT is not set
  CONFIG_DEFAULT_FDT_FILE="mt7988-sd-rfb"
  CONFIG_SYS_CBSIZE=512
-@@ -22,15 +40,118 @@ CONFIG_SYS_PROMPT="MT7988> "
+@@ -22,15 +39,118 @@ CONFIG_SYS_PROMPT="MT7988> "
  # CONFIG_BOOTM_PLAN9 is not set
  # CONFIG_BOOTM_RTEMS is not set
  # CONFIG_BOOTM_VXWORKS is not set
@@ -145,7 +144,7 @@
  CONFIG_DOS_PARTITION=y
  CONFIG_EFI_PARTITION=y
  CONFIG_PARTITION_TYPE_GUID=y
-@@ -46,6 +167,9 @@ CONFIG_PROT_TCP=y
+@@ -46,6 +166,9 @@ CONFIG_PROT_TCP=y
  CONFIG_REGMAP=y
  CONFIG_SYSCON=y
  CONFIG_CLK=y
@@ -157,7 +156,7 @@
  CONFIG_MTD=y
 --- a/configs/mt7988_rfb_defconfig
 +++ b/configs/mt7988_rfb_defconfig
-@@ -11,7 +11,24 @@ CONFIG_DEBUG_UART_BASE=0x11000000
+@@ -11,7 +11,23 @@ CONFIG_DEBUG_UART_BASE=0x11000000
  CONFIG_DEBUG_UART_CLOCK=40000000
  CONFIG_SYS_LOAD_ADDR=0x46000000
  CONFIG_DEBUG_UART=y
@@ -177,13 +176,12 @@
 +CONFIG_LED_GPIO=y
 +CONFIG_SPI_BOOT=y
 +CONFIG_SD_BOOT=y
-+CONFIG_NAND_BOOT=y
 +CONFIG_BOOTSTD_DEFAULTS=y
 +CONFIG_BOOTSTD_FULL=y
  CONFIG_DEFAULT_FDT_FILE="mt7988-rfb"
  CONFIG_SYS_CBSIZE=512
  CONFIG_SYS_PBSIZE=1049
-@@ -22,15 +39,120 @@ CONFIG_SYS_PROMPT="MT7988> "
+@@ -22,15 +38,120 @@ CONFIG_SYS_PROMPT="MT7988> "
  # CONFIG_BOOTM_PLAN9 is not set
  # CONFIG_BOOTM_RTEMS is not set
  # CONFIG_BOOTM_VXWORKS is not set
@@ -305,7 +303,7 @@
  CONFIG_DOS_PARTITION=y
  CONFIG_EFI_PARTITION=y
  CONFIG_PARTITION_TYPE_GUID=y
-@@ -46,6 +168,9 @@ CONFIG_PROT_TCP=y
+@@ -46,6 +167,9 @@ CONFIG_PROT_TCP=y
  CONFIG_REGMAP=y
  CONFIG_SYSCON=y
  CONFIG_CLK=y