From decfbdad4cd3cfaa16b84a7704ebb99b9c65b6b9 Mon Sep 17 00:00:00 2001
From: Jonas Karlman <jonas@kwiboo.se>
Date: Sun, 29 Sep 2024 20:15:07 +0000
Subject: [PATCH] Rockchip: bootloader: update config

Starting with U-Boot v2024.07 RK3328 and RK3399 have common Kconfig
options enabled by default. And starting from U-Boot v2025.04 our RK3288
targets have common Kconfig options enabled by default.

Keep DISPLAY/VIDEO, USB_KEYBOARD, ENV_IS_IN and EFI_LOADER options
disabled to speed up boot.
---
 projects/Rockchip/bootloader/config           | 10 ++++-----
 .../Rockchip/devices/RK3288/bootloader/config | 22 -------------------
 2 files changed, 4 insertions(+), 28 deletions(-)
 delete mode 100644 projects/Rockchip/devices/RK3288/bootloader/config

diff --git a/projects/Rockchip/bootloader/config b/projects/Rockchip/bootloader/config
index 06132bd951..48f9e33450 100644
--- a/projects/Rockchip/bootloader/config
+++ b/projects/Rockchip/bootloader/config
@@ -1,12 +1,10 @@
 CONFIG_BOOTDELAY=1
-# CONFIG_VIDEO is not set
+# CONFIG_BOOTMETH_VBE is not set
 # CONFIG_DISPLAY is not set
 # CONFIG_EFI_LOADER is not set
 # CONFIG_ENV_IS_IN_MMC is not set
+# CONFIG_ENV_IS_IN_SPI_FLASH is not set
 # CONFIG_NET_RANDOM_ETHADDR is not set
+# CONFIG_TOOLS_MKEFICAPSULE is not set
 # CONFIG_USB_KEYBOARD is not set
-# CONFIG_TPL_DRIVERS_MISC is not set
-CONFIG_MISC=y
-CONFIG_MISC_INIT_R=y
-CONFIG_ROCKCHIP_EFUSE=y
-CONFIG_SHA256=y
+# CONFIG_VIDEO is not set
diff --git a/projects/Rockchip/devices/RK3288/bootloader/config b/projects/Rockchip/devices/RK3288/bootloader/config
deleted file mode 100644
index a459f8f4fd..0000000000
--- a/projects/Rockchip/devices/RK3288/bootloader/config
+++ /dev/null
@@ -1,22 +0,0 @@
-CONFIG_BOOTDELAY=1
-# CONFIG_VIDEO is not set
-# CONFIG_DISPLAY is not set
-# CONFIG_EFI_LOADER is not set
-# CONFIG_ENV_IS_IN_MMC is not set
-# CONFIG_NET_RANDOM_ETHADDR is not set
-# CONFIG_USB_KEYBOARD is not set
-# CONFIG_FIT is not set
-# CONFIG_FIT_VERBOSE is not set
-# CONFIG_SPL_LOAD_FIT is not set
-# CONFIG_SPL_OPTEE_IMAGE
-# CONFIG_TPL_DRIVERS_MISC is not set
-# CONFIG_SPL_TEXT_BASE is not set
-# CONFIG_SPL_ROCKCHIP_BACK_TO_BROM is not set
-CONFIG_SPL_TEXT_BASE=0x0
-CONFIG_MISC=y
-CONFIG_MISC_INIT_R=y
-CONFIG_ROCKCHIP_EFUSE=y
-CONFIG_SHA256=y
-CONFIG_TPL=y
-CONFIG_SPL_SIZE_LIMIT=0x4b000
-CONFIG_TEXT_BASE=0x01000000