From 2b431a49151f7bc1e0e593b4b1b4fea9dfefe229 Mon Sep 17 00:00:00 2001
From: Piotr Szczepanik <piter75@gmail.com>
Date: Thu, 16 Jun 2022 19:29:16 +0200
Subject: [PATCH] Adjust u-boot configs for Station M1 and Station P1 (#3900)

---
 .../board_station-m1/u-boot-rk-rk3328-roc-pc-config.patch | 4 +++-
 .../board_station-p1/u-boot-rk3399-roc-pc-plus.patch      | 8 +++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/patch/u-boot/u-boot-rockchip64/board_station-m1/u-boot-rk-rk3328-roc-pc-config.patch b/patch/u-boot/u-boot-rockchip64/board_station-m1/u-boot-rk-rk3328-roc-pc-config.patch
index 9f819e6b23..8e476f51a6 100644
--- a/patch/u-boot/u-boot-rockchip64/board_station-m1/u-boot-rk-rk3328-roc-pc-config.patch
+++ b/patch/u-boot/u-boot-rockchip64/board_station-m1/u-boot-rk-rk3328-roc-pc-config.patch
@@ -1,7 +1,8 @@
 --- /dev/null
 +++ b/configs/roc-pc-rk3328_defconfig
-@@ -0,0 +1,103 @@
+@@ -0,0 +1,105 @@
 +CONFIG_ARM=y
++CONFIG_SKIP_LOWLEVEL_INIT=y
 +CONFIG_ARCH_ROCKCHIP=y
 +CONFIG_SYS_TEXT_BASE=0x00200000
 +CONFIG_SPL_GPIO=y
@@ -17,6 +18,7 @@
 +CONFIG_DEBUG_UART_BASE=0xFF130000
 +CONFIG_DEBUG_UART_CLOCK=24000000
 +CONFIG_DEBUG_UART=y
++CONFIG_SYS_LOAD_ADDR=0x800800
 +CONFIG_TPL_SYS_MALLOC_F_LEN=0x800
 +# CONFIG_ANDROID_BOOT_IMAGE is not set
 +CONFIG_FIT=y
diff --git a/patch/u-boot/u-boot-rockchip64/board_station-p1/u-boot-rk3399-roc-pc-plus.patch b/patch/u-boot/u-boot-rockchip64/board_station-p1/u-boot-rk3399-roc-pc-plus.patch
index fa56ac5945..8d364de5a4 100644
--- a/patch/u-boot/u-boot-rockchip64/board_station-p1/u-boot-rk3399-roc-pc-plus.patch
+++ b/patch/u-boot/u-boot-rockchip64/board_station-p1/u-boot-rk3399-roc-pc-plus.patch
@@ -2,11 +2,12 @@ new file mode 100644
 index 00000000..cf3462ea
 --- /dev/null
 +++ b/configs/roc-pc-plus-rk3399_defconfig
-@@ -0,0 +1,86 @@
+@@ -0,0 +1,88 @@
 +CONFIG_ARM=y
++CONFIG_SKIP_LOWLEVEL_INIT=y
 +CONFIG_ARCH_ROCKCHIP=y
 +CONFIG_SYS_TEXT_BASE=0x00200000
-+CONFIG_SPL_GPIO_SUPPORT=y
++CONFIG_SPL_GPIO=y
 +CONFIG_NR_DRAM_BANKS=1
 +CONFIG_ENV_SIZE=0x8000
 +CONFIG_ENV_OFFSET=0x3F8000
@@ -17,8 +18,9 @@ index 00000000..cf3462ea
 +CONFIG_DEBUG_UART_BASE=0xFF1A0000
 +CONFIG_DEBUG_UART_CLOCK=24000000
 +CONFIG_SPL_SPI_FLASH_SUPPORT=y
-+CONFIG_SPL_SPI_SUPPORT=y
++CONFIG_SPL_SPI=y
 +CONFIG_DEBUG_UART=y
++CONFIG_SYS_LOAD_ADDR=0x800800
 +# CONFIG_ANDROID_BOOT_IMAGE is not set
 +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-roc-pc-plus.dtb"
 +CONFIG_DISPLAY_BOARDINFO_LATE=y