mirror of
https://github.com/Fishwaldo/build.git
synced 2025-03-29 10:11:23 +00:00
1c9ef0872b
* Updated rockchip64-dev to u-boot v2019.10 and BL31 v1.30 (rk3399 boards) * Updated rk3399 to u-boot v2019.10 and BL31 v1.30 * Revert changes to renegade u-boot patches * Moved renegade u-boot patches into board dir * Added debug info for RockPro64 and switched sdmmc to fifo-mode * Disabled regulators in SPL for RockPro64 * Re-enabled sd vcc regulator in SPL for RockPro64 * Some device tree and config changes for OrangePi RK3399 * Fixed Rock Pi 4A's $BOOTCONFIG * Let some boards use mainline atf instead of the one in rkbin For example, roc-rk3399-pc can just boot the kernel using the mainline atf. * Add roc-rk3399-pc * Fixed reset in mainline ATF * Attached ATF version to v2.2 tag * WIP: sdmmc fifo-mode in SPL only * Renamed source config files * Reverted changes to rockchip64 sources config * Reverted patch moves * Add missing trust.ini patch to rk3399 u-boot * Reinstated tpl/spl patches in rk3399 family * Added $RKBIN_DIR prefix in rk3399 sources * Add demonstration of boards bootloader assignment in rk3399
59 lines
2.3 KiB
Diff
59 lines
2.3 KiB
Diff
Patch adaped to exclude rk3288 and rk3328 for now
|
|
|
|
From 5c0e65007979a743a5776440b06ae9ae5a475e84 Mon Sep 17 00:00:00 2001
|
|
From: Kever Yang <kever.yang@rock-chips.com>
|
|
Date: Fri, 18 Oct 2019 15:54:16 +0800
|
|
Subject: [PATCH] rockchip: config: update CONFIG_SPL_MAX_SIZE for 64bit CPUs
|
|
|
|
Since we move the ATF bl31 entry for 64bit CPUs to 0x40000, we need to
|
|
limit the SPL size in 0x40000(start from 0) so that we don't need to do
|
|
the relocate for ATF loading.
|
|
Note that there will be separate BSS, STACK and MALLOC heap, so the size
|
|
0x40000(256KB) should be enough for SPL text.
|
|
|
|
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
|
|
---
|
|
include/configs/rk3328_common.h | 2 +-
|
|
include/configs/rk3368_common.h | 2 +-
|
|
include/configs/rk3399_common.h | 2 +-
|
|
3 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
#diff --git a/include/configs/rk3328_common.h b/include/configs/rk3328_common.h
|
|
#index 3ff3331c808..e51e1b0e0e7 100644
|
|
#--- a/include/configs/rk3328_common.h
|
|
#+++ b/include/configs/rk3328_common.h
|
|
#@@ -18,7 +18,7 @@
|
|
# #define CONFIG_SYS_INIT_SP_ADDR 0x00300000
|
|
# #define CONFIG_SYS_LOAD_ADDR 0x00800800
|
|
# #define CONFIG_SPL_STACK 0x00400000
|
|
#-#define CONFIG_SPL_MAX_SIZE 0x100000
|
|
#+#define CONFIG_SPL_MAX_SIZE 0x40000
|
|
# #define CONFIG_SPL_BSS_START_ADDR 0x2000000
|
|
# #define CONFIG_SPL_BSS_MAX_SIZE 0x2000
|
|
#
|
|
#diff --git a/include/configs/rk3368_common.h b/include/configs/rk3368_common.h
|
|
#index e4b2114a0dd..e57d0efa7f9 100644
|
|
#--- a/include/configs/rk3368_common.h
|
|
#+++ b/include/configs/rk3368_common.h
|
|
#@@ -27,7 +27,7 @@
|
|
# #define CONFIG_SYS_INIT_SP_ADDR 0x00300000
|
|
# #define CONFIG_SYS_LOAD_ADDR 0x00280000
|
|
#
|
|
#-#define CONFIG_SPL_MAX_SIZE 0x60000
|
|
#+#define CONFIG_SPL_MAX_SIZE 0x40000
|
|
# #define CONFIG_SPL_BSS_START_ADDR 0x400000
|
|
# #define CONFIG_SPL_BSS_MAX_SIZE 0x20000
|
|
# #define CONFIG_SPL_STACK 0x00188000
|
|
diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h
|
|
index 126c34763ea..7331c6dc026 100644
|
|
--- a/include/configs/rk3399_common.h
|
|
+++ b/include/configs/rk3399_common.h
|
|
@@ -21,7 +21,7 @@
|
|
|
|
#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_TPL_BOOTROM_SUPPORT)
|
|
#define CONFIG_SPL_STACK 0x00400000
|
|
-#define CONFIG_SPL_MAX_SIZE 0x100000
|
|
+#define CONFIG_SPL_MAX_SIZE 0x40000
|
|
#define CONFIG_SPL_BSS_START_ADDR 0x00400000
|
|
#define CONFIG_SPL_BSS_MAX_SIZE 0x2000
|
|
#else
|