mirror of
https://github.com/Fishwaldo/build.git
synced 2025-07-21 20:39:03 +00:00
Switched rk3399 to u-boot v2020.01 (#1725)
This commit is contained in:
Piotr Szczepanik
GitHub
parent
811754bc73
commit
c86ba2d9c7
5 changed files with 2 additions and 506 deletions
|
|
@ -1,191 +0,0 @@
|
|||
Patch adapted to disable leez config for now
|
||||
|
||||
From 45f412fc2dcdf00873444eb4c78769b1571b0237 Mon Sep 17 00:00:00 2001
|
||||
From: Kever Yang <kever.yang@rock-chips.com>
|
||||
Date: Fri, 18 Oct 2019 15:54:14 +0800
|
||||
Subject: [PATCH] rockchip: rk3399: defconfig: no need to reserve IRAM for SPL
|
||||
|
||||
We use to reserve IRAM to avoid the SPL text overlap with ATF M0 code,
|
||||
and when we introduce the TPL, the SPL space is in DRAM, we reserve
|
||||
space to avoid SPL text overlap with ATF bl31.
|
||||
|
||||
Now we decide to move ATF entry point to 0x40000 instead of 0x1000,
|
||||
so that the SPL can have 0x4000 as code size and no need to reserve
|
||||
space or relocate before loading ATF.
|
||||
|
||||
The mainline ATF has update since:
|
||||
0aad563c rockchip: Update BL31_BASE to 0x40000
|
||||
|
||||
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
|
||||
---
|
||||
configs/evb-rk3399_defconfig | 1 -
|
||||
configs/firefly-rk3399_defconfig | 1 -
|
||||
configs/khadas-edge-captain-rk3399_defconfig | 1 -
|
||||
configs/khadas-edge-rk3399_defconfig | 1 -
|
||||
configs/khadas-edge-v-rk3399_defconfig | 1 -
|
||||
configs/leez-rk3399_defconfig | 1 -
|
||||
configs/nanopc-t4-rk3399_defconfig | 1 -
|
||||
configs/nanopi-m4-rk3399_defconfig | 1 -
|
||||
configs/nanopi-neo4-rk3399_defconfig | 1 -
|
||||
configs/orangepi-rk3399_defconfig | 1 -
|
||||
configs/roc-rk3399-pc_defconfig | 1 -
|
||||
configs/rock-pi-4-rk3399_defconfig | 1 -
|
||||
configs/rockpro64-rk3399_defconfig | 1 -
|
||||
13 files changed, 13 deletions(-)
|
||||
|
||||
diff --git a/configs/evb-rk3399_defconfig b/configs/evb-rk3399_defconfig
|
||||
index a0d215a5f18..48836c7b887 100644
|
||||
--- a/configs/evb-rk3399_defconfig
|
||||
+++ b/configs/evb-rk3399_defconfig
|
||||
@@ -2,7 +2,6 @@ CONFIG_ARM=y
|
||||
CONFIG_ARCH_ROCKCHIP=y
|
||||
CONFIG_SYS_TEXT_BASE=0x00200000
|
||||
CONFIG_ROCKCHIP_RK3399=y
|
||||
-CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x50000
|
||||
CONFIG_NR_DRAM_BANKS=1
|
||||
CONFIG_SPL_STACK_R_ADDR=0x80000
|
||||
CONFIG_DEBUG_UART_BASE=0xFF1A0000
|
||||
diff --git a/configs/firefly-rk3399_defconfig b/configs/firefly-rk3399_defconfig
|
||||
index d0226314651..4828f0ccaca 100644
|
||||
--- a/configs/firefly-rk3399_defconfig
|
||||
+++ b/configs/firefly-rk3399_defconfig
|
||||
@@ -2,7 +2,6 @@ CONFIG_ARM=y
|
||||
CONFIG_ARCH_ROCKCHIP=y
|
||||
CONFIG_SYS_TEXT_BASE=0x00200000
|
||||
CONFIG_ROCKCHIP_RK3399=y
|
||||
-CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x50000
|
||||
CONFIG_NR_DRAM_BANKS=1
|
||||
CONFIG_SPL_STACK_R_ADDR=0x80000
|
||||
CONFIG_DEBUG_UART_BASE=0xFF1A0000
|
||||
diff --git a/configs/khadas-edge-captain-rk3399_defconfig b/configs/khadas-edge-captain-rk3399_defconfig
|
||||
index acfd91dbe7a..19e13502852 100644
|
||||
--- a/configs/khadas-edge-captain-rk3399_defconfig
|
||||
+++ b/configs/khadas-edge-captain-rk3399_defconfig
|
||||
@@ -2,7 +2,6 @@ CONFIG_ARM=y
|
||||
CONFIG_ARCH_ROCKCHIP=y
|
||||
CONFIG_SYS_TEXT_BASE=0x00200000
|
||||
CONFIG_ROCKCHIP_RK3399=y
|
||||
-CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x50000
|
||||
CONFIG_NR_DRAM_BANKS=1
|
||||
CONFIG_SPL_STACK_R_ADDR=0x80000
|
||||
CONFIG_DEBUG_UART_BASE=0xFF1A0000
|
||||
diff --git a/configs/khadas-edge-rk3399_defconfig b/configs/khadas-edge-rk3399_defconfig
|
||||
index b71fd3a286e..c10f710b42c 100644
|
||||
--- a/configs/khadas-edge-rk3399_defconfig
|
||||
+++ b/configs/khadas-edge-rk3399_defconfig
|
||||
@@ -2,7 +2,6 @@ CONFIG_ARM=y
|
||||
CONFIG_ARCH_ROCKCHIP=y
|
||||
CONFIG_SYS_TEXT_BASE=0x00200000
|
||||
CONFIG_ROCKCHIP_RK3399=y
|
||||
-CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x50000
|
||||
CONFIG_NR_DRAM_BANKS=1
|
||||
CONFIG_SPL_STACK_R_ADDR=0x80000
|
||||
CONFIG_DEBUG_UART_BASE=0xFF1A0000
|
||||
diff --git a/configs/khadas-edge-v-rk3399_defconfig b/configs/khadas-edge-v-rk3399_defconfig
|
||||
index 0a789872dc3..9b3b6bf634a 100644
|
||||
--- a/configs/khadas-edge-v-rk3399_defconfig
|
||||
+++ b/configs/khadas-edge-v-rk3399_defconfig
|
||||
@@ -2,7 +2,6 @@ CONFIG_ARM=y
|
||||
CONFIG_ARCH_ROCKCHIP=y
|
||||
CONFIG_SYS_TEXT_BASE=0x00200000
|
||||
CONFIG_ROCKCHIP_RK3399=y
|
||||
-CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x50000
|
||||
CONFIG_NR_DRAM_BANKS=1
|
||||
CONFIG_SPL_STACK_R_ADDR=0x80000
|
||||
CONFIG_DEBUG_UART_BASE=0xFF1A0000
|
||||
#diff --git a/configs/leez-rk3399_defconfig b/configs/leez-rk3399_defconfig
|
||||
#index 4757aaaec44..35f3a8cfd84 100644
|
||||
#--- a/configs/leez-rk3399_defconfig
|
||||
#+++ b/configs/leez-rk3399_defconfig
|
||||
#@@ -2,7 +2,6 @@ CONFIG_ARM=y
|
||||
# CONFIG_ARCH_ROCKCHIP=y
|
||||
# CONFIG_SYS_TEXT_BASE=0x00200000
|
||||
# CONFIG_ROCKCHIP_RK3399=y
|
||||
#-CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x50000
|
||||
# CONFIG_NR_DRAM_BANKS=1
|
||||
# CONFIG_SPL_STACK_R_ADDR=0x80000
|
||||
# CONFIG_DEBUG_UART_BASE=0xFF1A0000
|
||||
diff --git a/configs/nanopc-t4-rk3399_defconfig b/configs/nanopc-t4-rk3399_defconfig
|
||||
index 1d4c8f8a024..b266b3ff419 100644
|
||||
--- a/configs/nanopc-t4-rk3399_defconfig
|
||||
+++ b/configs/nanopc-t4-rk3399_defconfig
|
||||
@@ -2,7 +2,6 @@ CONFIG_ARM=y
|
||||
CONFIG_ARCH_ROCKCHIP=y
|
||||
CONFIG_SYS_TEXT_BASE=0x00200000
|
||||
CONFIG_ROCKCHIP_RK3399=y
|
||||
-CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x50000
|
||||
CONFIG_NR_DRAM_BANKS=1
|
||||
CONFIG_SPL_STACK_R_ADDR=0x80000
|
||||
CONFIG_DEBUG_UART_BASE=0xFF1A0000
|
||||
diff --git a/configs/nanopi-m4-rk3399_defconfig b/configs/nanopi-m4-rk3399_defconfig
|
||||
index 7375b758a27..c78dd106e8c 100644
|
||||
--- a/configs/nanopi-m4-rk3399_defconfig
|
||||
+++ b/configs/nanopi-m4-rk3399_defconfig
|
||||
@@ -2,7 +2,6 @@ CONFIG_ARM=y
|
||||
CONFIG_ARCH_ROCKCHIP=y
|
||||
CONFIG_SYS_TEXT_BASE=0x00200000
|
||||
CONFIG_ROCKCHIP_RK3399=y
|
||||
-CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x50000
|
||||
CONFIG_NR_DRAM_BANKS=1
|
||||
CONFIG_SPL_STACK_R_ADDR=0x80000
|
||||
CONFIG_DEBUG_UART_BASE=0xFF1A0000
|
||||
diff --git a/configs/nanopi-neo4-rk3399_defconfig b/configs/nanopi-neo4-rk3399_defconfig
|
||||
index 874ee5efb61..48413cfe61d 100644
|
||||
--- a/configs/nanopi-neo4-rk3399_defconfig
|
||||
+++ b/configs/nanopi-neo4-rk3399_defconfig
|
||||
@@ -2,7 +2,6 @@ CONFIG_ARM=y
|
||||
CONFIG_ARCH_ROCKCHIP=y
|
||||
CONFIG_SYS_TEXT_BASE=0x00200000
|
||||
CONFIG_ROCKCHIP_RK3399=y
|
||||
-CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x50000
|
||||
CONFIG_NR_DRAM_BANKS=1
|
||||
CONFIG_SPL_STACK_R_ADDR=0x80000
|
||||
CONFIG_DEBUG_UART_BASE=0xFF1A0000
|
||||
diff --git a/configs/orangepi-rk3399_defconfig b/configs/orangepi-rk3399_defconfig
|
||||
index 7b02c59f08d..28f5ae18b17 100644
|
||||
--- a/configs/orangepi-rk3399_defconfig
|
||||
+++ b/configs/orangepi-rk3399_defconfig
|
||||
@@ -2,7 +2,6 @@ CONFIG_ARM=y
|
||||
CONFIG_ARCH_ROCKCHIP=y
|
||||
CONFIG_SYS_TEXT_BASE=0x00200000
|
||||
CONFIG_ROCKCHIP_RK3399=y
|
||||
-CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x50000
|
||||
CONFIG_NR_DRAM_BANKS=1
|
||||
CONFIG_SPL_STACK_R_ADDR=0x80000
|
||||
CONFIG_DEBUG_UART_BASE=0xFF1A0000
|
||||
diff --git a/configs/roc-rk3399-pc_defconfig b/configs/roc-rk3399-pc_defconfig
|
||||
index 28b18333d78..79c128a9292 100644
|
||||
--- a/configs/roc-rk3399-pc_defconfig
|
||||
+++ b/configs/roc-rk3399-pc_defconfig
|
||||
@@ -2,7 +2,6 @@ CONFIG_ARM=y
|
||||
CONFIG_ARCH_ROCKCHIP=y
|
||||
CONFIG_SYS_TEXT_BASE=0x00200000
|
||||
CONFIG_ROCKCHIP_RK3399=y
|
||||
-CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x50000
|
||||
CONFIG_NR_DRAM_BANKS=1
|
||||
CONFIG_SPL_STACK_R_ADDR=0x80000
|
||||
CONFIG_DEBUG_UART_BASE=0xFF1A0000
|
||||
diff --git a/configs/rock-pi-4-rk3399_defconfig b/configs/rock-pi-4-rk3399_defconfig
|
||||
index 554945dd190..dbff125bf1d 100644
|
||||
--- a/configs/rock-pi-4-rk3399_defconfig
|
||||
+++ b/configs/rock-pi-4-rk3399_defconfig
|
||||
@@ -2,7 +2,6 @@ CONFIG_ARM=y
|
||||
CONFIG_ARCH_ROCKCHIP=y
|
||||
CONFIG_SYS_TEXT_BASE=0x00200000
|
||||
CONFIG_ROCKCHIP_RK3399=y
|
||||
-CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x50000
|
||||
CONFIG_NR_DRAM_BANKS=1
|
||||
CONFIG_SPL_STACK_R_ADDR=0x80000
|
||||
CONFIG_DEBUG_UART_BASE=0xFF1A0000
|
||||
diff --git a/configs/rockpro64-rk3399_defconfig b/configs/rockpro64-rk3399_defconfig
|
||||
index 22b8bc503b4..e8765333049 100644
|
||||
--- a/configs/rockpro64-rk3399_defconfig
|
||||
+++ b/configs/rockpro64-rk3399_defconfig
|
||||
@@ -2,7 +2,6 @@ CONFIG_ARM=y
|
||||
CONFIG_ARCH_ROCKCHIP=y
|
||||
CONFIG_SYS_TEXT_BASE=0x00200000
|
||||
CONFIG_ROCKCHIP_RK3399=y
|
||||
-CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x50000
|
||||
CONFIG_NR_DRAM_BANKS=1
|
||||
CONFIG_SPL_STACK_R_ADDR=0x80000
|
||||
CONFIG_DEBUG_UART_BASE=0xFF1A0000
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
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
|
||||
|
|
@ -1,255 +0,0 @@
|
|||
Patch adapted to disable leez config for now
|
||||
|
||||
From 9ff5697175953fcb3d623ec3579a5a0d2b433b69 Mon Sep 17 00:00:00 2001
|
||||
From: Kever Yang <kever.yang@rock-chips.com>
|
||||
Date: Fri, 18 Oct 2019 15:54:15 +0800
|
||||
Subject: [PATCH] rockchip: rk3399: update SPL_STACK_R_ADDR
|
||||
|
||||
Use the same SPL_STACK_R_ADDR in Kconfig instead of each board config;
|
||||
default to 0x4000000(64MB) instead of 0x80000(512KB) for this address
|
||||
can support all the SoCs including those may have only 64MB memory, and
|
||||
also reserve enough space for atf, kernel(in falcon mode) loading.
|
||||
|
||||
After the ATF entry move to 0x40000, the stack from 0x80000 may be override
|
||||
when loading ATF bl31.
|
||||
|
||||
Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
|
||||
---
|
||||
arch/arm/mach-rockchip/rk3399/Kconfig | 3 +++
|
||||
configs/chromebook_bob_defconfig | 1 -
|
||||
configs/evb-rk3399_defconfig | 1 -
|
||||
configs/ficus-rk3399_defconfig | 1 -
|
||||
configs/firefly-rk3399_defconfig | 1 -
|
||||
configs/khadas-edge-captain-rk3399_defconfig | 1 -
|
||||
configs/khadas-edge-rk3399_defconfig | 1 -
|
||||
configs/khadas-edge-v-rk3399_defconfig | 1 -
|
||||
configs/leez-rk3399_defconfig | 1 -
|
||||
configs/nanopc-t4-rk3399_defconfig | 1 -
|
||||
configs/nanopi-m4-rk3399_defconfig | 1 -
|
||||
configs/nanopi-neo4-rk3399_defconfig | 1 -
|
||||
configs/orangepi-rk3399_defconfig | 1 -
|
||||
configs/puma-rk3399_defconfig | 1 -
|
||||
configs/roc-rk3399-pc_defconfig | 1 -
|
||||
configs/rock-pi-4-rk3399_defconfig | 1 -
|
||||
configs/rock960-rk3399_defconfig | 1 -
|
||||
configs/rockpro64-rk3399_defconfig | 1 -
|
||||
18 files changed, 3 insertions(+), 17 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/mach-rockchip/rk3399/Kconfig b/arch/arm/mach-rockchip/rk3399/Kconfig
|
||||
index 6660d05349b..f781eacd163 100644
|
||||
--- a/arch/arm/mach-rockchip/rk3399/Kconfig
|
||||
+++ b/arch/arm/mach-rockchip/rk3399/Kconfig
|
||||
@@ -91,6 +91,9 @@ config TPL_STACK
|
||||
config TPL_TEXT_BASE
|
||||
default 0xff8c2000
|
||||
|
||||
+config SPL_STACK_R_ADDR
|
||||
+ default 0x04000000
|
||||
+
|
||||
source "board/rockchip/evb_rk3399/Kconfig"
|
||||
source "board/theobroma-systems/puma_rk3399/Kconfig"
|
||||
source "board/vamrs/rock960_rk3399/Kconfig"
|
||||
diff --git a/configs/chromebook_bob_defconfig b/configs/chromebook_bob_defconfig
|
||||
index 8059c633cec..b6e31a4c499 100644
|
||||
--- a/configs/chromebook_bob_defconfig
|
||||
+++ b/configs/chromebook_bob_defconfig
|
||||
@@ -8,7 +8,6 @@ CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x4000
|
||||
# CONFIG_SPL_MMC_SUPPORT is not set
|
||||
CONFIG_TARGET_CHROMEBOOK_BOB=y
|
||||
CONFIG_NR_DRAM_BANKS=1
|
||||
-CONFIG_SPL_STACK_R_ADDR=0x80000
|
||||
CONFIG_DEBUG_UART_BASE=0xff1a0000
|
||||
CONFIG_DEBUG_UART_CLOCK=24000000
|
||||
CONFIG_SPL_SPI_FLASH_SUPPORT=y
|
||||
diff --git a/configs/evb-rk3399_defconfig b/configs/evb-rk3399_defconfig
|
||||
index 48836c7b887..c1d7d613a9e 100644
|
||||
--- a/configs/evb-rk3399_defconfig
|
||||
+++ b/configs/evb-rk3399_defconfig
|
||||
@@ -3,7 +3,6 @@ CONFIG_ARCH_ROCKCHIP=y
|
||||
CONFIG_SYS_TEXT_BASE=0x00200000
|
||||
CONFIG_ROCKCHIP_RK3399=y
|
||||
CONFIG_NR_DRAM_BANKS=1
|
||||
-CONFIG_SPL_STACK_R_ADDR=0x80000
|
||||
CONFIG_DEBUG_UART_BASE=0xFF1A0000
|
||||
CONFIG_DEBUG_UART_CLOCK=24000000
|
||||
CONFIG_DEBUG_UART=y
|
||||
diff --git a/configs/ficus-rk3399_defconfig b/configs/ficus-rk3399_defconfig
|
||||
index 05bbfbf381a..0dcc9a760d6 100644
|
||||
--- a/configs/ficus-rk3399_defconfig
|
||||
+++ b/configs/ficus-rk3399_defconfig
|
||||
@@ -4,7 +4,6 @@ CONFIG_SYS_TEXT_BASE=0x00200000
|
||||
CONFIG_ROCKCHIP_RK3399=y
|
||||
CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x4000
|
||||
CONFIG_TARGET_ROCK960_RK3399=y
|
||||
-CONFIG_SPL_STACK_R_ADDR=0x80000
|
||||
CONFIG_DEBUG_UART_BASE=0xFF1A0000
|
||||
CONFIG_DEBUG_UART_CLOCK=24000000
|
||||
CONFIG_DEBUG_UART=y
|
||||
diff --git a/configs/firefly-rk3399_defconfig b/configs/firefly-rk3399_defconfig
|
||||
index 4828f0ccaca..ba57fbd5278 100644
|
||||
--- a/configs/firefly-rk3399_defconfig
|
||||
+++ b/configs/firefly-rk3399_defconfig
|
||||
@@ -3,7 +3,6 @@ CONFIG_ARCH_ROCKCHIP=y
|
||||
CONFIG_SYS_TEXT_BASE=0x00200000
|
||||
CONFIG_ROCKCHIP_RK3399=y
|
||||
CONFIG_NR_DRAM_BANKS=1
|
||||
-CONFIG_SPL_STACK_R_ADDR=0x80000
|
||||
CONFIG_DEBUG_UART_BASE=0xFF1A0000
|
||||
CONFIG_DEBUG_UART_CLOCK=24000000
|
||||
CONFIG_DEBUG_UART=y
|
||||
diff --git a/configs/khadas-edge-captain-rk3399_defconfig b/configs/khadas-edge-captain-rk3399_defconfig
|
||||
index 19e13502852..80d92e1aad3 100644
|
||||
--- a/configs/khadas-edge-captain-rk3399_defconfig
|
||||
+++ b/configs/khadas-edge-captain-rk3399_defconfig
|
||||
@@ -3,7 +3,6 @@ CONFIG_ARCH_ROCKCHIP=y
|
||||
CONFIG_SYS_TEXT_BASE=0x00200000
|
||||
CONFIG_ROCKCHIP_RK3399=y
|
||||
CONFIG_NR_DRAM_BANKS=1
|
||||
-CONFIG_SPL_STACK_R_ADDR=0x80000
|
||||
CONFIG_DEBUG_UART_BASE=0xFF1A0000
|
||||
CONFIG_DEBUG_UART_CLOCK=24000000
|
||||
CONFIG_DEBUG_UART=y
|
||||
diff --git a/configs/khadas-edge-rk3399_defconfig b/configs/khadas-edge-rk3399_defconfig
|
||||
index c10f710b42c..9ba25b7d57c 100644
|
||||
--- a/configs/khadas-edge-rk3399_defconfig
|
||||
+++ b/configs/khadas-edge-rk3399_defconfig
|
||||
@@ -3,7 +3,6 @@ CONFIG_ARCH_ROCKCHIP=y
|
||||
CONFIG_SYS_TEXT_BASE=0x00200000
|
||||
CONFIG_ROCKCHIP_RK3399=y
|
||||
CONFIG_NR_DRAM_BANKS=1
|
||||
-CONFIG_SPL_STACK_R_ADDR=0x80000
|
||||
CONFIG_DEBUG_UART_BASE=0xFF1A0000
|
||||
CONFIG_DEBUG_UART_CLOCK=24000000
|
||||
CONFIG_DEBUG_UART=y
|
||||
diff --git a/configs/khadas-edge-v-rk3399_defconfig b/configs/khadas-edge-v-rk3399_defconfig
|
||||
index 9b3b6bf634a..424dec1fbac 100644
|
||||
--- a/configs/khadas-edge-v-rk3399_defconfig
|
||||
+++ b/configs/khadas-edge-v-rk3399_defconfig
|
||||
@@ -3,7 +3,6 @@ CONFIG_ARCH_ROCKCHIP=y
|
||||
CONFIG_SYS_TEXT_BASE=0x00200000
|
||||
CONFIG_ROCKCHIP_RK3399=y
|
||||
CONFIG_NR_DRAM_BANKS=1
|
||||
-CONFIG_SPL_STACK_R_ADDR=0x80000
|
||||
CONFIG_DEBUG_UART_BASE=0xFF1A0000
|
||||
CONFIG_DEBUG_UART_CLOCK=24000000
|
||||
CONFIG_DEBUG_UART=y
|
||||
#diff --git a/configs/leez-rk3399_defconfig b/configs/leez-rk3399_defconfig
|
||||
#index 35f3a8cfd84..c671879d9a7 100644
|
||||
#--- a/configs/leez-rk3399_defconfig
|
||||
#+++ b/configs/leez-rk3399_defconfig
|
||||
#@@ -3,7 +3,6 @@ CONFIG_ARCH_ROCKCHIP=y
|
||||
# CONFIG_SYS_TEXT_BASE=0x00200000
|
||||
# CONFIG_ROCKCHIP_RK3399=y
|
||||
# CONFIG_NR_DRAM_BANKS=1
|
||||
#-CONFIG_SPL_STACK_R_ADDR=0x80000
|
||||
# CONFIG_DEBUG_UART_BASE=0xFF1A0000
|
||||
# CONFIG_DEBUG_UART_CLOCK=24000000
|
||||
# CONFIG_DEBUG_UART=y
|
||||
diff --git a/configs/nanopc-t4-rk3399_defconfig b/configs/nanopc-t4-rk3399_defconfig
|
||||
index b266b3ff419..ae09273a486 100644
|
||||
--- a/configs/nanopc-t4-rk3399_defconfig
|
||||
+++ b/configs/nanopc-t4-rk3399_defconfig
|
||||
@@ -3,7 +3,6 @@ CONFIG_ARCH_ROCKCHIP=y
|
||||
CONFIG_SYS_TEXT_BASE=0x00200000
|
||||
CONFIG_ROCKCHIP_RK3399=y
|
||||
CONFIG_NR_DRAM_BANKS=1
|
||||
-CONFIG_SPL_STACK_R_ADDR=0x80000
|
||||
CONFIG_DEBUG_UART_BASE=0xFF1A0000
|
||||
CONFIG_DEBUG_UART_CLOCK=24000000
|
||||
CONFIG_DEBUG_UART=y
|
||||
diff --git a/configs/nanopi-m4-rk3399_defconfig b/configs/nanopi-m4-rk3399_defconfig
|
||||
index c78dd106e8c..e1a61e5a574 100644
|
||||
--- a/configs/nanopi-m4-rk3399_defconfig
|
||||
+++ b/configs/nanopi-m4-rk3399_defconfig
|
||||
@@ -3,7 +3,6 @@ CONFIG_ARCH_ROCKCHIP=y
|
||||
CONFIG_SYS_TEXT_BASE=0x00200000
|
||||
CONFIG_ROCKCHIP_RK3399=y
|
||||
CONFIG_NR_DRAM_BANKS=1
|
||||
-CONFIG_SPL_STACK_R_ADDR=0x80000
|
||||
CONFIG_DEBUG_UART_BASE=0xFF1A0000
|
||||
CONFIG_DEBUG_UART_CLOCK=24000000
|
||||
CONFIG_DEBUG_UART=y
|
||||
diff --git a/configs/nanopi-neo4-rk3399_defconfig b/configs/nanopi-neo4-rk3399_defconfig
|
||||
index 48413cfe61d..c3a592d8fe9 100644
|
||||
--- a/configs/nanopi-neo4-rk3399_defconfig
|
||||
+++ b/configs/nanopi-neo4-rk3399_defconfig
|
||||
@@ -3,7 +3,6 @@ CONFIG_ARCH_ROCKCHIP=y
|
||||
CONFIG_SYS_TEXT_BASE=0x00200000
|
||||
CONFIG_ROCKCHIP_RK3399=y
|
||||
CONFIG_NR_DRAM_BANKS=1
|
||||
-CONFIG_SPL_STACK_R_ADDR=0x80000
|
||||
CONFIG_DEBUG_UART_BASE=0xFF1A0000
|
||||
CONFIG_DEBUG_UART_CLOCK=24000000
|
||||
CONFIG_DEBUG_UART=y
|
||||
diff --git a/configs/orangepi-rk3399_defconfig b/configs/orangepi-rk3399_defconfig
|
||||
index 28f5ae18b17..296fd5f0a0f 100644
|
||||
--- a/configs/orangepi-rk3399_defconfig
|
||||
+++ b/configs/orangepi-rk3399_defconfig
|
||||
@@ -3,7 +3,6 @@ CONFIG_ARCH_ROCKCHIP=y
|
||||
CONFIG_SYS_TEXT_BASE=0x00200000
|
||||
CONFIG_ROCKCHIP_RK3399=y
|
||||
CONFIG_NR_DRAM_BANKS=1
|
||||
-CONFIG_SPL_STACK_R_ADDR=0x80000
|
||||
CONFIG_DEBUG_UART_BASE=0xFF1A0000
|
||||
CONFIG_DEBUG_UART_CLOCK=24000000
|
||||
CONFIG_DEBUG_UART=y
|
||||
diff --git a/configs/puma-rk3399_defconfig b/configs/puma-rk3399_defconfig
|
||||
index 30b0f4ac6c6..351b0ea3d0d 100644
|
||||
--- a/configs/puma-rk3399_defconfig
|
||||
+++ b/configs/puma-rk3399_defconfig
|
||||
@@ -6,7 +6,6 @@ CONFIG_ROCKCHIP_RK3399=y
|
||||
CONFIG_ROCKCHIP_BOOT_MODE_REG=0x0
|
||||
CONFIG_TARGET_PUMA_RK3399=y
|
||||
CONFIG_NR_DRAM_BANKS=1
|
||||
-CONFIG_SPL_STACK_R_ADDR=0x80000
|
||||
CONFIG_DEBUG_UART_BASE=0xFF180000
|
||||
CONFIG_DEBUG_UART_CLOCK=24000000
|
||||
CONFIG_SPL_SPI_FLASH_SUPPORT=y
|
||||
diff --git a/configs/roc-rk3399-pc_defconfig b/configs/roc-rk3399-pc_defconfig
|
||||
index 79c128a9292..809f5222368 100644
|
||||
--- a/configs/roc-rk3399-pc_defconfig
|
||||
+++ b/configs/roc-rk3399-pc_defconfig
|
||||
@@ -3,7 +3,6 @@ CONFIG_ARCH_ROCKCHIP=y
|
||||
CONFIG_SYS_TEXT_BASE=0x00200000
|
||||
CONFIG_ROCKCHIP_RK3399=y
|
||||
CONFIG_NR_DRAM_BANKS=1
|
||||
-CONFIG_SPL_STACK_R_ADDR=0x80000
|
||||
CONFIG_DEBUG_UART_BASE=0xFF1A0000
|
||||
CONFIG_DEBUG_UART_CLOCK=24000000
|
||||
CONFIG_DEBUG_UART=y
|
||||
diff --git a/configs/rock-pi-4-rk3399_defconfig b/configs/rock-pi-4-rk3399_defconfig
|
||||
index dbff125bf1d..f4bb3818cea 100644
|
||||
--- a/configs/rock-pi-4-rk3399_defconfig
|
||||
+++ b/configs/rock-pi-4-rk3399_defconfig
|
||||
@@ -3,7 +3,6 @@ CONFIG_ARCH_ROCKCHIP=y
|
||||
CONFIG_SYS_TEXT_BASE=0x00200000
|
||||
CONFIG_ROCKCHIP_RK3399=y
|
||||
CONFIG_NR_DRAM_BANKS=1
|
||||
-CONFIG_SPL_STACK_R_ADDR=0x80000
|
||||
CONFIG_DEBUG_UART_BASE=0xFF1A0000
|
||||
CONFIG_DEBUG_UART_CLOCK=24000000
|
||||
CONFIG_DEBUG_UART=y
|
||||
diff --git a/configs/rock960-rk3399_defconfig b/configs/rock960-rk3399_defconfig
|
||||
index cb3c68db6bd..0d6c55ce745 100644
|
||||
--- a/configs/rock960-rk3399_defconfig
|
||||
+++ b/configs/rock960-rk3399_defconfig
|
||||
@@ -4,7 +4,6 @@ CONFIG_SYS_TEXT_BASE=0x00200000
|
||||
CONFIG_ROCKCHIP_RK3399=y
|
||||
CONFIG_ROCKCHIP_SPL_RESERVE_IRAM=0x4000
|
||||
CONFIG_TARGET_ROCK960_RK3399=y
|
||||
-CONFIG_SPL_STACK_R_ADDR=0x80000
|
||||
CONFIG_DEBUG_UART_BASE=0xFF1A0000
|
||||
CONFIG_DEBUG_UART_CLOCK=24000000
|
||||
CONFIG_DEBUG_UART=y
|
||||
diff --git a/configs/rockpro64-rk3399_defconfig b/configs/rockpro64-rk3399_defconfig
|
||||
index e8765333049..68f0dca7b2c 100644
|
||||
--- a/configs/rockpro64-rk3399_defconfig
|
||||
+++ b/configs/rockpro64-rk3399_defconfig
|
||||
@@ -3,7 +3,6 @@ CONFIG_ARCH_ROCKCHIP=y
|
||||
CONFIG_SYS_TEXT_BASE=0x00200000
|
||||
CONFIG_ROCKCHIP_RK3399=y
|
||||
CONFIG_NR_DRAM_BANKS=1
|
||||
-CONFIG_SPL_STACK_R_ADDR=0x80000
|
||||
CONFIG_DEBUG_UART_BASE=0xFF1A0000
|
||||
CONFIG_DEBUG_UART_CLOCK=24000000
|
||||
CONFIG_DEBUG_UART=y
|
||||
Loading…
Add table
Add a link
Reference in a new issue