| Message ID | 20191009100750.3353-1-kever.yang@rock-chips.com |
|---|---|
| State | Accepted |
| Delegated to: | Kever Yang |
| Headers | show |
| Series | [U-Boot] rockchip: rk3399: defconfig: no need to reserve IRAM for SPL | expand |
On Wed, Oct 9, 2019 at 11:08 AM Kever Yang <kever.yang@rock-chips.com> wrote: > > 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 Is that in a tagged ATF release? > 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/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 - > 12 files changed, 12 deletions(-) > > diff --git a/configs/evb-rk3399_defconfig b/configs/evb-rk3399_defconfig > index a0d215a5f1..48836c7b88 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 d022631465..4828f0ccac 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 acfd91dbe7..19e1350285 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 b71fd3a286..c10f710b42 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 0a789872dc..9b3b6bf634 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/nanopc-t4-rk3399_defconfig b/configs/nanopc-t4-rk3399_defconfig > index 1d4c8f8a02..b266b3ff41 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 7375b758a2..c78dd106e8 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 874ee5efb6..48413cfe61 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 7b02c59f08..28f5ae18b1 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 28b18333d7..79c128a929 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 554945dd19..dbff125bf1 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 22b8bc503b..e876533304 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 > -- > 2.17.1 > > _______________________________________________ > U-Boot mailing list > U-Boot@lists.denx.de > https://lists.denx.de/listinfo/u-boot
Hi Peter, On 2019/10/9 下午8:01, Peter Robinson wrote: > On Wed, Oct 9, 2019 at 11:08 AM Kever Yang <kever.yang@rock-chips.com> wrote: >> 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 > Is that in a tagged ATF release? It's not in any of tagged release now, maybe in next release. Thanks, - Kever > >> 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/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 - >> 12 files changed, 12 deletions(-) >> >> diff --git a/configs/evb-rk3399_defconfig b/configs/evb-rk3399_defconfig >> index a0d215a5f1..48836c7b88 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 d022631465..4828f0ccac 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 acfd91dbe7..19e1350285 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 b71fd3a286..c10f710b42 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 0a789872dc..9b3b6bf634 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/nanopc-t4-rk3399_defconfig b/configs/nanopc-t4-rk3399_defconfig >> index 1d4c8f8a02..b266b3ff41 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 7375b758a2..c78dd106e8 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 874ee5efb6..48413cfe61 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 7b02c59f08..28f5ae18b1 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 28b18333d7..79c128a929 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 554945dd19..dbff125bf1 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 22b8bc503b..e876533304 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 >> -- >> 2.17.1 >> >> _______________________________________________ >> U-Boot mailing list >> U-Boot@lists.denx.de >> https://lists.denx.de/listinfo/u-boot
On Thu, Oct 10, 2019 at 2:15 AM Kever Yang <kever.yang@rock-chips.com> wrote: > > Hi Peter, > > On 2019/10/9 下午8:01, Peter Robinson wrote: > > On Wed, Oct 9, 2019 at 11:08 AM Kever Yang <kever.yang@rock-chips.com> wrote: > >> 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 > > Is that in a tagged ATF release? > > > It's not in any of tagged release now, maybe in next release. It may be problematic moving to something that needs something that's not in a tagged release. For vendors that grab anything and ship and deal with it that's probably fine, in distros that generally stick to tagged releases so there's less of a moving target and a known quantity this could be a problem. The move to TPL with Rockchips in 2019.10 has caught me as there were devices that weren't moved over and I had devices that didn't work with the new release. I also see that you've not updated all the devices that are rk3399 that are shipped, Rock960 is missing for example, any reason for that? Peter > >> 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/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 - > >> 12 files changed, 12 deletions(-) > >> > >> diff --git a/configs/evb-rk3399_defconfig b/configs/evb-rk3399_defconfig > >> index a0d215a5f1..48836c7b88 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 d022631465..4828f0ccac 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 acfd91dbe7..19e1350285 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 b71fd3a286..c10f710b42 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 0a789872dc..9b3b6bf634 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/nanopc-t4-rk3399_defconfig b/configs/nanopc-t4-rk3399_defconfig > >> index 1d4c8f8a02..b266b3ff41 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 7375b758a2..c78dd106e8 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 874ee5efb6..48413cfe61 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 7b02c59f08..28f5ae18b1 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 28b18333d7..79c128a929 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 554945dd19..dbff125bf1 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 22b8bc503b..e876533304 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 > >> -- > >> 2.17.1 > >> > >> _______________________________________________ > >> U-Boot mailing list > >> U-Boot@lists.denx.de > >> https://lists.denx.de/listinfo/u-boot > >
On 2019/10/9 下午6:07, Kever Yang wrote: > 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> Applied to u-boot-rockchip master. > --- > > 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/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 - > 12 files changed, 12 deletions(-) > > diff --git a/configs/evb-rk3399_defconfig b/configs/evb-rk3399_defconfig > index a0d215a5f1..48836c7b88 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 d022631465..4828f0ccac 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 acfd91dbe7..19e1350285 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 b71fd3a286..c10f710b42 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 0a789872dc..9b3b6bf634 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/nanopc-t4-rk3399_defconfig b/configs/nanopc-t4-rk3399_defconfig > index 1d4c8f8a02..b266b3ff41 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 7375b758a2..c78dd106e8 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 874ee5efb6..48413cfe61 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 7b02c59f08..28f5ae18b1 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 28b18333d7..79c128a929 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 554945dd19..dbff125bf1 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 22b8bc503b..e876533304 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
diff --git a/configs/evb-rk3399_defconfig b/configs/evb-rk3399_defconfig index a0d215a5f1..48836c7b88 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 d022631465..4828f0ccac 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 acfd91dbe7..19e1350285 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 b71fd3a286..c10f710b42 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 0a789872dc..9b3b6bf634 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/nanopc-t4-rk3399_defconfig b/configs/nanopc-t4-rk3399_defconfig index 1d4c8f8a02..b266b3ff41 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 7375b758a2..c78dd106e8 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 874ee5efb6..48413cfe61 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 7b02c59f08..28f5ae18b1 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 28b18333d7..79c128a929 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 554945dd19..dbff125bf1 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 22b8bc503b..e876533304 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
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/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 - 12 files changed, 12 deletions(-)