| Message ID | 20211020024933.16964-10-chiawei_wang@aspeedtech.com |
|---|---|
| State | Superseded |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | aspeed: Support secure boot chain with FIT image verification | expand |
On Wed, 20 Oct 2021 at 02:50, Chia-Wei Wang <chiawei_wang@aspeedtech.com> wrote: > > Return CONFIG_SYS_LOAD_ADDR pointing to DRAM space for > spl_get_load_buffer() to allow generic SPL image loading > code (e.g. FIT and Ymodem) to store data in DRAM. > > Signed-off-by: Chia-Wei Wang <chiawei_wang@aspeedtech.com> Reviewed-by: Joel Stanley <joel@jms.id.au> > --- > arch/arm/mach-aspeed/ast2600/spl.c | 9 +-------- > 1 file changed, 1 insertion(+), 8 deletions(-) > > diff --git a/arch/arm/mach-aspeed/ast2600/spl.c b/arch/arm/mach-aspeed/ast2600/spl.c > index 0d8cb29678..6c49d6aede 100644 > --- a/arch/arm/mach-aspeed/ast2600/spl.c > +++ b/arch/arm/mach-aspeed/ast2600/spl.c > @@ -28,14 +28,7 @@ u32 spl_boot_device(void) > > struct image_header *spl_get_load_buffer(ssize_t offset, size_t size) > { > - /* > - * When boot from SPI, AST2600 already remap 0x00000000 ~ 0x0fffffff > - * to BMC SPI memory space 0x20000000 ~ 0x2fffffff. The next stage BL > - * has been located in SPI for XIP. In this case, the load buffer for > - * SPL image loading will be set to the remapped address of the next > - * BL instead of the DRAM space CONFIG_SYS_LOAD_ADDR > - */ > - return (struct image_header *)(CONFIG_SYS_TEXT_BASE); > + return (struct image_header *)(CONFIG_SYS_LOAD_ADDR); > } > > #ifdef CONFIG_SPL_OS_BOOT > -- > 2.17.1 >
diff --git a/arch/arm/mach-aspeed/ast2600/spl.c b/arch/arm/mach-aspeed/ast2600/spl.c index 0d8cb29678..6c49d6aede 100644 --- a/arch/arm/mach-aspeed/ast2600/spl.c +++ b/arch/arm/mach-aspeed/ast2600/spl.c @@ -28,14 +28,7 @@ u32 spl_boot_device(void) struct image_header *spl_get_load_buffer(ssize_t offset, size_t size) { - /* - * When boot from SPI, AST2600 already remap 0x00000000 ~ 0x0fffffff - * to BMC SPI memory space 0x20000000 ~ 0x2fffffff. The next stage BL - * has been located in SPI for XIP. In this case, the load buffer for - * SPL image loading will be set to the remapped address of the next - * BL instead of the DRAM space CONFIG_SYS_LOAD_ADDR - */ - return (struct image_header *)(CONFIG_SYS_TEXT_BASE); + return (struct image_header *)(CONFIG_SYS_LOAD_ADDR); } #ifdef CONFIG_SPL_OS_BOOT
Return CONFIG_SYS_LOAD_ADDR pointing to DRAM space for spl_get_load_buffer() to allow generic SPL image loading code (e.g. FIT and Ymodem) to store data in DRAM. Signed-off-by: Chia-Wei Wang <chiawei_wang@aspeedtech.com> --- arch/arm/mach-aspeed/ast2600/spl.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)