SPL: powerpc: expand SPL's length to 128K
PATCH v2 1/4 SPL: powerpc: expand SPL's length to 128K
From: Ying Zhang <[email protected]>
1. The SPL's length of SDCARD boot has not enough,expand the SPL's length to 128K.
2. deleted unused symbol: CONFIG_SYS_RUN_INDDR
---
Change from v1:
- No change.
include/configs/P1022DS.h | 12 ++++++------ include/configs/p1_p2_rdb_pc.h | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-)
include/configs/P1022DS.h +6 -6
@@ -30,12 +30,12 @@#define CONFIG_FSL_LAW /* Use common FSL init code */ #define CONFIG_SYS_TEXT_BASE 0x11001000#define CONFIG_SPL_TEXT_BASE 0xf8f81000 -#define CONFIG_SPL_PAD_TO 0x18000 -#define CONFIG_SPL_MAX_SIZE (96 * 1024) +#define CONFIG_SPL_PAD_TO 0x20000 +#define CONFIG_SPL_MAX_SIZE (128 * 1024)#define CONFIG_SYS_MMC_U_BOOT_SIZE (768 << 10)#define CONFIG_SYS_MMC_U_BOOT_DST (0x11000000)#define CONFIG_SYS_MMC_U_BOOT_START (0x11000000) -#define CONFIG_SYS_MMC_U_BOOT_OFFS (96 << 10) +#define CONFIG_SYS_MMC_U_BOOT_OFFS (128 << 10)#define CONFIG_SYS_MPC85XX_NO_RESETVEC #define CONFIG_SYS_LDSCRIPT "arch/powerpc/cpu/mpc85xx/u-boot.lds"#define CONFIG_SPL_MMC_BOOT
@@ -60,12 +60,12 @@#define CONFIG_FSL_LAW /* Use common FSL init code */ #define CONFIG_SYS_TEXT_BASE 0x11001000#define CONFIG_SPL_TEXT_BASE 0xf8f81000 -#define CONFIG_SPL_PAD_TO 0x18000 -#define CONFIG_SPL_MAX_SIZE (96 * 1024) +#define CONFIG_SPL_PAD_TO 0x20000 +#define CONFIG_SPL_MAX_SIZE (128 * 1024)#define CONFIG_SYS_SPI_FLASH_U_BOOT_SIZE (768 << 10)#define CONFIG_SYS_SPI_FLASH_U_BOOT_DST (0x11000000)#define CONFIG_SYS_SPI_FLASH_U_BOOT_START (0x11000000) -#define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS (96 << 10) +#define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS (128 << 10)#define CONFIG_SYS_MPC85XX_NO_RESETVEC #define CONFIG_SYS_LDSCRIPT "arch/powerpc/cpu/mpc85xx/u-boot.lds"#define CONFIG_SPL_SPI_BOOT
include/configs/p1_p2_rdb_pc.h +6 -6
@@ -159,12 +159,12 @@#define CONFIG_FSL_LAW /* Use common FSL init code */ #define CONFIG_SYS_TEXT_BASE 0x11001000#define CONFIG_SPL_TEXT_BASE 0xf8f81000 -#define CONFIG_SPL_PAD_TO 0x18000 -#define CONFIG_SPL_MAX_SIZE (96 * 1024) +#define CONFIG_SPL_PAD_TO 0x20000 +#define CONFIG_SPL_MAX_SIZE (128 * 1024)#define CONFIG_SYS_MMC_U_BOOT_SIZE (768 << 10)#define CONFIG_SYS_MMC_U_BOOT_DST (0x11000000)#define CONFIG_SYS_MMC_U_BOOT_START (0x11000000) -#define CONFIG_SYS_MMC_U_BOOT_OFFS (96 << 10) +#define CONFIG_SYS_MMC_U_BOOT_OFFS (128 << 10)#define CONFIG_SYS_MPC85XX_NO_RESETVEC #define CONFIG_SYS_LDSCRIPT "arch/powerpc/cpu/mpc85xx/u-boot.lds"#define CONFIG_SPL_MMC_BOOT
@@ -189,12 +189,12 @@#define CONFIG_FSL_LAW /* Use common FSL init code */ #define CONFIG_SYS_TEXT_BASE 0x11001000#define CONFIG_SPL_TEXT_BASE 0xf8f81000 -#define CONFIG_SPL_PAD_TO 0x18000 -#define CONFIG_SPL_MAX_SIZE (96 * 1024) +#define CONFIG_SPL_PAD_TO 0x20000 +#define CONFIG_SPL_MAX_SIZE (128 * 1024)#define CONFIG_SYS_SPI_FLASH_U_BOOT_SIZE (768 << 10)#define CONFIG_SYS_SPI_FLASH_U_BOOT_DST (0x11000000)#define CONFIG_SYS_SPI_FLASH_U_BOOT_START (0x11000000) -#define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS (96 << 10) +#define CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS (128 << 10)#define CONFIG_SYS_MPC85XX_NO_RESETVEC #define CONFIG_SYS_LDSCRIPT "arch/powerpc/cpu/mpc85xx/u-boot.lds"#define CONFIG_SPL_SPI_BOOT
Signature · 1 line
1.8.4.1
PATCH v2 2/4 SPL: P2020RDB: fix the problem booting from spi flash
From: Ying Zhang <[email protected]>
There was no enough stack in SPL, so the buffer needed in SPL is to malloc from memory pool and to repalce the temporary variable.
---
Change from v1:
- The malloc size expand to 364K bytes.
common/env_sf.c | 7 ++++++- include/configs/p1_p2_rdb_pc.h | 12 ++++++++---- 2 files changed, 14 insertions(+), 5 deletions(-)
common/env_sf.c +6 -1
@@ -299,13 +299,16 @@ int saveenv(void)void env_relocate_spec (void ) { -char buf[CONFIG_ENV_SIZE ];int ret; +char *buf =NULL ; + buf = (char *)malloc (CONFIG_ENV_SIZE ); env_flash =spi_flash_probe (CONFIG_ENV_SPI_BUS ,CONFIG_ENV_SPI_CS ,CONFIG_ENV_SPI_MAX_HZ ,CONFIG_ENV_SPI_MODE );if (!env_flash) {set_default_env ("!spi_flash_probe() failed" ); +if (buf) +free (buf);return ; }
@@ -321,6 +324,8 @@ void env_relocate_spec(void) gd->env_valid =1 ; out:spi_flash_free (env_flash); +if (buf) +free (buf); env_flash = NULL; }#endif
include/configs/p1_p2_rdb_pc.h +8 -4
@@ -580,11 +580,15 @@#define CONFIG_SYS_INIT_L2_ADDR_PHYS CONFIG_SYS_INIT_L2_ADDR#define CONFIG_SYS_INIT_L2_END (CONFIG_SYS_INIT_L2_ADDR + CONFIG_SYS_L2_SIZE)#define CONFIG_SPL_RELOC_TEXT_BASE 0xf8f81000 -#define CONFIG_SPL_RELOC_STACK (CONFIG_SYS_INIT_L2_ADDR + 128 * 1024) -#define CONFIG_SPL_RELOC_STACK_SIZE (32 << 10) -#define CONFIG_SPL_RELOC_MALLOC_ADDR (CONFIG_SYS_INIT_L2_ADDR + 160 * 1024) -#define CONFIG_SPL_RELOC_MALLOC_SIZE (96 << 10)#define CONFIG_SPL_GD_ADDR (CONFIG_SYS_INIT_L2_ADDR + 112 * 1024) +#define CONFIG_SPL_RELOC_STACK (CONFIG_SYS_INIT_L2_ADDR + 116 * 1024) +#define CONFIG_SPL_RELOC_STACK_SIZE (32 << 10) +#define CONFIG_SPL_RELOC_MALLOC_ADDR (CONFIG_SYS_INIT_L2_ADDR + 148 * 1024) +#if defined(CONFIG_P2020RDB ) +#define CONFIG_SPL_RELOC_MALLOC_SIZE (364 << 10) +#else +#define CONFIG_SPL_RELOC_MALLOC_SIZE (108 << 10) +#endif #elif defined(CONFIG_NAND )#ifdef CONFIG_TPL_BUILD #define CONFIG_SYS_INIT_L2_ADDR 0xf8f80000
Signature · 1 line
1.8.4.1
PATCH v2 2/4 SPL: P2020RDB: fix the problem booting from spi flash
Quoted 10 lines · ying.zhang at freescale.com
From: Ying Zhang <[email protected]>
There was no enough stack in SPL, so the buffer needed in SPL is to malloc from memory pool and to repalce the temporary variable.
Signed-off-by Ying Zhang <[email protected]>---
Change from v1:
- The malloc size expand to 364K bytes.
Applied to u-boot-mpc85xx/master. Thanks.
York
PATCH v2 3/4 SPL: P1022DS: fix the problem booting from spi flash
In reply to ying.zhang at freescale.comFrom: Ying Zhang <[email protected]>
There was no enough memory for malloc in SPL booting from spi flash, so relayout the memory in SPL: reduce the memory for global data from 16K Bytes to 4K Bytes, save the space for malloc.
---
Change from v1:
- Move the content about P2020RDB to 2 of patchset.
include/configs/P1022DS.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
include/configs/P1022DS.h +3 -3
@@ -366,10 +366,10 @@#define CONFIG_SYS_L2_SIZE (256 << 10)#define CONFIG_SYS_INIT_L2_END (CONFIG_SYS_INIT_L2_ADDR + CONFIG_SYS_L2_SIZE)#define CONFIG_SPL_RELOC_TEXT_BASE 0xf8f81000 -#define CONFIG_SPL_RELOC_STACK (CONFIG_SYS_INIT_L2_ADDR + 128 * 1024) +#define CONFIG_SPL_RELOC_STACK (CONFIG_SYS_INIT_L2_ADDR + 116 * 1024)#define CONFIG_SPL_RELOC_STACK_SIZE (32 << 10) -#define CONFIG_SPL_RELOC_MALLOC_ADDR (CONFIG_SYS_INIT_L2_ADDR + 160 * 1024) -#define CONFIG_SPL_RELOC_MALLOC_SIZE (96 << 10) +#define CONFIG_SPL_RELOC_MALLOC_ADDR (CONFIG_SYS_INIT_L2_ADDR + 148 * 1024) +#define CONFIG_SPL_RELOC_MALLOC_SIZE (108 << 10)#define CONFIG_SPL_GD_ADDR (CONFIG_SYS_INIT_L2_ADDR + 112 * 1024)#elif defined(CONFIG_NAND )#ifdef CONFIG_TPL_BUILD
Signature · 1 line
1.8.4.1
PATCH v2 3/4 SPL: P1022DS: fix the problem booting from spi flash
Quoted 11 lines · ying.zhang at freescale.com
From: Ying Zhang <[email protected]>
There was no enough memory for malloc in SPL booting from spi flash, so relayout the memory in SPL: reduce the memory for global data from 16K Bytes to 4K Bytes, save the space for malloc.
Signed-off-by Ying Zhang <[email protected]>---
Change from v1:
- Move the content about P2020RDB to 2 of patchset.
Applied to u-boot-mpc85xx/master. Thanks.
York
PATCH v2 4/4 powerpc: p1010rdb: Enable p1010rdb to start from NAND/SD/SPI flash with SPL
In reply to ying.zhang at freescale.comFrom: Ying Zhang <[email protected]>
In the previous patches, we introduced the SPL/TPL fraamework.
For SD/SPI flash booting way, we introduce the SPL to enable a loader stub. The SPL was loaded by the code from the internal on-chip ROM. The SPL initializes the DDR according to the SPD and loads the final uboot image into DDR, then jump to the DDR to begin execution.
For NAND booting way, the nand SPL has size limitation on some board(e.g. P1010RDB), it can not be more than 8KB, we can call it "minimal SPL", So the dynamic DDR driver doesn't fit into this minimum SPL. We added the TPL that is loaded by the the minimal SPL. The TPL initializes the DDR according to the SPD and loads the final uboot image into DDR,then jump to the DDR to begin execution.
This patch enabled SPL/TPL for P1010RDB to support starting from NAND/SD/SPI flash with SPL framework and initializing the DDR according to SPD in the SPL/TPL. Because the minimal SPL load the TPL to L2 SRAM and the jump to the L2 SRAM to execute, so the section .resetvec is no longer needed.
---
Change from v1:
- No change.
board/freescale/p1010rdb/Makefile | 4 + board/freescale/p1010rdb/spl.c | 108 +++++++++++++++++++++++ board/freescale/p1010rdb/spl_minimal.c | 76 ++-------------- board/freescale/p1010rdb/tlb.c | 12 ++- include/configs/P1010RDB.h | 156 +++++++++++++++++++++++++++++++-- 5 files changed, 275 insertions(+), 81 deletions(-) create mode 100644 board/freescale/p1010rdb/spl.c
board/freescale/p1010rdb/Makefile +4 -0
@@ -18,6 +18,10 @@ obj-y += spl_minimal.o tlb.o law.o else +ifdef CONFIG_SPL_BUILD +obj-y += spl.o +endif + obj-y += p1010rdb.o obj-y += ddr.o obj-y += law.o
board/freescale/p1010rdb/spl.c new file +108 -0
108 lines not on this page · raw message
board/freescale/p1010rdb/spl_minimal.c +6 -70
99 lines not on this page · raw message
board/freescale/p1010rdb/tlb.c +10 -2
@@ -73,10 +73,18 @@ struct fsl_e_tlb_entry tlb_table[] = { MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, 0, 7, BOOKE_PAGESZ_1M, 1), -#if defined(CONFIG_SYS_RAMBOOT ) || defined(CONFIG_SPL ) +#if defined(CONFIG_SYS_RAMBOOT ) || \ + (defined(CONFIG_SPL ) && !defined(CONFIG_SPL_COMMON_INIT_DDR )) SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE, CONFIG_SYS_DDR_SDRAM_BASE, MAS3_SX|MAS3_SW|MAS3_SR, 0, - 0, 8, BOOKE_PAGESZ_1G, 1) + 0, 8, BOOKE_PAGESZ_1G, 1), +#endif + +#ifdef CONFIG_SYS_INIT_L2_ADDR +/* *I*G - L2SRAM */ +SET_TLB_ENTRY (1 ,CONFIG_SYS_INIT_L2_ADDR ,CONFIG_SYS_INIT_L2_ADDR_PHYS , +MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_G , + 0, 11, BOOKE_PAGESZ_256K, 1)#endif };
include/configs/P1010RDB.h +147 -9
212 lines not on this page · raw message
Signature · 1 line
1.8.4.1
PATCH v2 4/4 powerpc: p1010rdb: Enable p1010rdb to start from NAND/SD/SPI flash with SPL
Quoted 19 lines · ying.zhang at freescale.com
From: Ying Zhang <[email protected]>
In the previous patches, we introduced the SPL/TPL fraamework.
For SD/SPI flash booting way, we introduce the SPL to enable a loader stub. The SPL was loaded by the code from the internal on-chip ROM. The SPL initializes the DDR according to the SPD and loads the final uboot image into DDR, then jump to the DDR to begin execution.For NAND booting way, the nand SPL has size limitation on some board(e.g. P1010RDB), it can not be more than 8KB, we can call it "minimal SPL", So the dynamic DDR driver doesn't fit into this minimum SPL. We added the TPL that is loaded by the the minimal SPL. The TPL initializes the DDR according to the SPD and loads the final uboot image into DDR,then jump to the DDR to begin execution.
This patch enabled SPL/TPL for P1010RDB to support starting from NAND/SD/SPI flash with SPL framework and initializing the DDR according to SPD in the SPL/TPL. Because the minimal SPL load the TPL to L2 SRAM and the jump to the L2 SRAM to execute, so the section .resetvec is no longer needed.
Quoted 4 lines
Signed-off-by Ying Zhang <[email protected]>---
Change from v1:
- No change.
Applied to u-boot-mpc85xx/master. Thanks.
York
PATCH v2 1/4 SPL: powerpc: expand SPL's length to 128K
In reply to ying.zhang at freescale.comQuoted 10 lines · ying.zhang at freescale.com
From: Ying Zhang <[email protected]>
1. The SPL's length of SDCARD boot has not enough,expand the SPL's length to 128K.
2. deleted unused symbol:CONFIG_SYS_RUN_INDDRSigned-off-by Ying Zhang <[email protected]>---
Change from v1:
- No change.
Applied to u-boot-mpc85xx/master. Thanks.
York