PBL: add support for boot from SPI flash.
PATCH v2 1/2 PBL: add support for boot from SPI flash.
PBL: SPI flash used as RCW and PBI source, CPC used as 1M SRAM where PBL will copy whole U-BOOT image to, U-boot can boot from CPC after PBL completes RCW and PBI phases.
--- arch/powerpc/cpu/mpc85xx/cpu_init.c | 17 +++++++++++++++++ board/freescale/corenet_ds/config.mk | 6 ++++++ board/freescale/corenet_ds/tlb.c | 9 +++++++++ boards.cfg | 1 + include/configs/corenet_ds.h | 31 +++++++++++++++++++++++++++++-- 5 files changed, 62 insertions(+), 2 deletions(-)
arch/powerpc/cpu/mpc85xx/cpu_init.c +17 -0
@@ -139,6 +139,20 @@ static void enable_cpc(void)for (i =0 ; i <CONFIG_SYS_NUM_CPC ; i++, cpc++) {u32 cpccfg0 =in_be32 (&cpc->cpccfg0); size +=CPC_CFG0_SZ_K (cpccfg0); +if (in_be32 (&cpc->cpcsrcr0) &CPC_SRCR0_SRAMEN ) { +/* find and disable LAW of SRAM */ +struct law_entry law =find_law (CONFIG_SYS_INIT_L3_ADDR ); + +if (law.index ==-1 ) { +printf ("\nFatal error happened\n" ); +return ; + }else +disable_law (law.index); + +clrbits_be32 (&cpc->cpchdbcr0,CPC_HDBCR0_CDQ_SPEC_DIS ); +out_be32 (&cpc->cpccsr0,0 ); +out_be32 (&cpc->cpcsrcr0,0 ); + }out_be32 (&cpc->cpccsr0,CPC_CSR0_CE |CPC_CSR0_PE );/* Read back to sync write */
@@ -155,6 +169,9 @@ void invalidate_cpc(void)cpc_corenet_t *cpc = (cpc_corenet_t *)CONFIG_SYS_FSL_CPC_ADDR ;for (i =0 ; i <CONFIG_SYS_NUM_CPC ; i++, cpc++) { +/* skip CPC when it used as all SRAM */ +if (in_be32 (&cpc->cpcsrcr0) &CPC_SRCR0_SRAMEN ) +continue ;/* Flash invalidate the CPC and clear all the locks */ out_be32 (&cpc->cpccsr0,CPC_CSR0_FI |CPC_CSR0_LFC );while (in_be32 (&cpc->cpccsr0) & (CPC_CSR0_FI |CPC_CSR0_LFC ))
board/freescale/corenet_ds/config.mk +6 -0
@@ -24,4 +24,10 @@ # P4080DS board # +ifeq ($(CONFIG_PBL_BOOT_INDIRECT), y) +RESET_VECTOR_ADDRESS = 0xfffffffc +endif + +ifndef RESET_VECTOR_ADDRESS RESET_VECTOR_ADDRESS = 0xeffffffc +endif
board/freescale/corenet_ds/tlb.c +9 -0
@@ -51,9 +51,18 @@ struct fsl_e_tlb_entry tlb_table[] = {/* TLB 1 */ /* *I*** - Covers boot page */ +#if defined(CONFIG_SYS_RAMBOOT ) && defined(CONFIG_SYS_INIT_L3_ADDR ) +/* *I*G - L3SRAM. When L3 is used as 1M SRAM, the address of the +* SRAM is at 0xfff00000, it covered the 0xfffff000. +* */ +SET_TLB_ENTRY (1 ,CONFIG_SYS_INIT_L3_ADDR ,CONFIG_SYS_INIT_L3_ADDR , +MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_I |MAS2_G , +0 ,0 ,BOOKE_PAGESZ_1M ,1 ), +#elseSET_TLB_ENTRY (1 ,0xfffff000 ,0xfffff000 ,MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_I |MAS2_G ,0 ,0 ,BOOKE_PAGESZ_4K ,1 ), +#endif/* *I*G* - CCSRBAR */ SET_TLB_ENTRY(1, CONFIG_SYS_CCSRBAR, CONFIG_SYS_CCSRBAR_PHYS,
boards.cfg +1 -0
@@ -195,6 +195,7 @@ P1022DS powerpc mpc85xx p1022ds freescale P2020DS powerpc mpc85xx p2020ds freescale stxgp3 powerpc mpc85xx stxgp3 stx P4080DS powerpc mpc85xx corenet_ds freescale +P4080DS_PBL_BOOT_INDIRECT powerpc mpc85xx corenet_ds freescale - P4080DS:PBL_BOOT_INDIRECT,SYS_TEXT_BASE=0xFFF80000 sbc8540 powerpc mpc85xx sbc8560 - - SBC8540 sbc8548 powerpc mpc85xx sbc8548 - - sbc8548 sbc8560 powerpc mpc85xx sbc8560 - - sbc8560
include/configs/corenet_ds.h +29 -2
@@ -28,6 +28,11 @@#include "../board/freescale/common/ics307_clk.h" +#ifdef CONFIG_PBL_BOOT_INDIRECT +#define CONFIG_RAMBOOT_PBL 1 +#define CONFIG_RAMBOOT_TEXT_BASE 0xfff80000 +#endif +/* High Level Configuration Options */ #define CONFIG_BOOKE #define CONFIG_E500 /* BOOKE e500 family */
@@ -58,11 +63,17 @@#ifdef CONFIG_SYS_NO_FLASH #define CONFIG_ENV_IS_NOWHERE #else -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_CFI #endif +#if defined(CONFIG_RAMBOOT_PBL ) +#define CONFIG_ENV_IS_NOWHERE 1/* Store ENV in memory only */ +#else +#define CONFIG_ENV_IS_IN_FLASH +#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) +#endif +#define CONFIG_SYS_CLK_FREQ get_board_sys_clk()/* sysclk for MPC85xx */ #define CONFIG_ICS307_REFCLK_HZ 33333000/* ICS307 clock chip ref freq */
@@ -93,6 +104,19 @@#define CONFIG_PANIC_HANG /* do not reset board on panic */ /* +* Config the L3 Cache as L3 SRAM +*/ +#define CONFIG_SYS_INIT_L3_ADDR CONFIG_RAMBOOT_TEXT_BASE +#ifdef CONFIG_PHYS_64BIT +#define CONFIG_SYS_INIT_L3_ADDR_PHYS (0xf00000000ull | CONFIG_RAMBOOT_TEXT_BASE) +#else +#define CONFIG_SYS_INIT_L3_ADDR_PHYS CONFIG_SYS_INIT_L3_ADDR +#endif +#define CONFIG_SYS_L3_SIZE (1024 << 10) +#define CONFIG_SYS_INIT_L3_END (CONFIG_SYS_INIT_L3_ADDR + CONFIG_SYS_L3_SIZE) + + +/* * Base addresses -- Note these are effective addresses where the * actual resources get mapped (not physical addresses) */
@@ -185,6 +209,10 @@#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE/* start of monitor */ +#if defined(CONFIG_RAMBOOT_PBL ) +#define CONFIG_SYS_RAMBOOT +#endif +#define CONFIG_SYS_FLASH_EMPTY_INFO #define CONFIG_SYS_FLASH_AMD_CHECK_DQ7 #define CONFIG_SYS_FLASH_BANKS_LIST {CONFIG_SYS_FLASH_BASE_PHYS + 0x8000000, CONFIG_SYS_FLASH_BASE_PHYS}
@@ -456,7 +484,6 @@/* * Environment */ -#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE)#define CONFIG_ENV_SIZE 0x2000#define CONFIG_ENV_SECT_SIZE 0x20000/* 128K (one sector) */
Signature · 1 line
1.6.4
PATCH v2 1/2 PBL: add support for boot from SPI flash.
Dear Shaohui Xie,
Quoted 3 lines · In message <[email protected]> you wrote:
PBL: SPI flash used as RCW and PBI source, CPC used as 1M SRAM where PBL will copy whole U-BOOT image to, U-boot can boot from CPC after PBL completes RCW and PBI phases.
Can you please write plain text? What does all these TLAs mean?
PBL ?
PBI ?
CPC ?
Best regards,
Wolfgang Denk
Signature · 8 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de Remember thee Ay, thou poor ghost while memory holds a seat In this distracted globe. Remember thee! Yea, from the table of my memory I'll wipe away all trivial fond records, All saws of books, all forms, all pressures past, That youth and observation copied there. Hamlet, I : v : 95 William Shakespeare
PATCH v2 1/2 PBL: add support for boot from SPI flash.
In reply to Shaohui XieQuoted 117 lines · Shaohui Xie
PBL: SPI flash used as RCW and PBI source, CPC used as 1M SRAM where PBL will copy whole U-BOOT image to, U-boot can boot from CPC after PBL completes RCW and PBI phases.
Signed-off-by Chunhe Lan <[email protected]>Signed-off-by Mingkai Hu <[email protected]>Signed-off-by Shaohui Xie <[email protected]>---
arch/powerpc/cpu/mpc85xx/cpu_init.c | 17 +++++++++++++++++ board/freescale/corenet_ds/config.mk | 6 ++++++ board/freescale/corenet_ds/tlb.c | 9 +++++++++ boards.cfg | 1 + include/configs/corenet_ds.h | 31 +++++++++++++++++++++++++++++-- 5 files changed, 62 insertions(+), 2 deletions(-)arch/powerpc/cpu/mpc85xx/cpu_init.c +17
-0@@ -139,6 +139,20 @@ static void enable_cpc(void)for (i =0 ; i <CONFIG_SYS_NUM_CPC ; i++, cpc++) {u32 cpccfg0 =in_be32 (&cpc->cpccfg0); size +=CPC_CFG0_SZ_K (cpccfg0); +if (in_be32 (&cpc->cpcsrcr0) &CPC_SRCR0_SRAMEN ) { +/* find and disable LAW of SRAM */ +struct law_entry law =find_law (CONFIG_SYS_INIT_L3_ADDR ); + +if (law.index ==-1 ) { +printf ("\nFatal error happened\n" ); +return ; + }else +disable_law (law.index); + +clrbits_be32 (&cpc->cpchdbcr0,CPC_HDBCR0_CDQ_SPEC_DIS ); +out_be32 (&cpc->cpccsr0,0 ); +out_be32 (&cpc->cpcsrcr0,0 ); + }out_be32 (&cpc->cpccsr0,CPC_CSR0_CE |CPC_CSR0_PE );/* Read back to sync write */ @@ -155,6 +169,9 @@ void invalidate_cpc(void)cpc_corenet_t *cpc = (cpc_corenet_t *)CONFIG_SYS_FSL_CPC_ADDR ;for (i =0 ; i <CONFIG_SYS_NUM_CPC ; i++, cpc++) { +/* skip CPC when it used as all SRAM */ +if (in_be32 (&cpc->cpcsrcr0) &CPC_SRCR0_SRAMEN ) +continue ;/* Flash invalidate the CPC and clear all the locks */ out_be32 (&cpc->cpccsr0,CPC_CSR0_FI |CPC_CSR0_LFC );while (in_be32 (&cpc->cpccsr0) & (CPC_CSR0_FI |CPC_CSR0_LFC ))board/freescale/corenet_ds/config.mk +5
-0@@ -24,4 +24,10 @@ # P4080DS board # +ifeq ($(CONFIG_PBL_BOOT_INDIRECT), y) +RESET_VECTOR_ADDRESS = 0xfffffffc +endif + +ifndef RESET_VECTOR_ADDRESS
RESET_VECTOR_ADDRESS=0xeffffffcboard/freescale/corenet_ds/config.mk +1
-0+endifboard/freescale/corenet_ds/tlb.c +9
-0@@ -51,9 +51,18 @@ struct fsl_e_tlb_entry tlb_table[] = {/* TLB 1 */ /* *I*** - Covers boot page */ +#if defined(CONFIG_SYS_RAMBOOT ) && defined(CONFIG_SYS_INIT_L3_ADDR ) +/* *I*G - L3SRAM. When L3 is used as 1M SRAM, the address of the +* SRAM is at 0xfff00000, it covered the 0xfffff000. +* */ +SET_TLB_ENTRY (1 ,CONFIG_SYS_INIT_L3_ADDR ,CONFIG_SYS_INIT_L3_ADDR , +MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_I |MAS2_G , +0 ,0 ,BOOKE_PAGESZ_1M ,1 ), +#elseSET_TLB_ENTRY (1 ,0xfffff000 ,0xfffff000 ,MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_I |MAS2_G ,0 ,0 ,BOOKE_PAGESZ_4K ,1 ), +#endif/* *I*G* - CCSRBAR */ SET_TLB_ENTRY(1, CONFIG_SYS_CCSRBAR, CONFIG_SYS_CCSRBAR_PHYS,boards.cfg +0
-0@@ -195,6 +195,7 @@ P1022DS powerpc mpc85xx p1022ds freescaleP2020DS powerpc mpc85xx p2020ds freescale
stxgp3 powerpc mpc85xx stxgp3 stx
P4080DS powerpc mpc85xxcorenet_dsfreescale
+P4080DS_PBL_BOOT_INDIRECT powerpc mpc85xxcorenet_dsfreescale - P4080DS:PBL_BOOT_INDIRECT,SYS_TEXT_BASE=0xFFF80000
sbc8540 powerpc mpc85xx sbc8560 - - SBC8540
sbc8548 powerpc mpc85xx sbc8548 - - sbc8548
sbc8560 powerpc mpc85xx sbc8560 - - sbc8560include/configs/corenet_ds.h +5
-0@@ -28,6 +28,11 @@#include "../board/freescale/common/ics307_clk.h" +#ifdef CONFIG_PBL_BOOT_INDIRECT +#define CONFIG_RAMBOOT_PBL 1 +#define CONFIG_RAMBOOT_TEXT_BASE 0xfff80000 +#endif +/* High Level Configuration Options */ #define CONFIG_BOOKE #define CONFIG_E500 /* BOOKE e500 family */
include/configs/corenet_ds.h line 70
Quoted 9 lines
include/configs/corenet_ds.h +1
-1@@ -58,11 +63,17 @@#ifdef CONFIG_SYS_NO_FLASH #define CONFIG_ENV_IS_NOWHERE #else -#define CONFIG_ENV_IS_IN_FLASH #define CONFIG_FLASH_CFI_DRIVER #define CONFIG_SYS_FLASH_CFI #endif +#if defined(CONFIG_RAMBOOT_PBL )
can we not just use CONFIG_PBL_BOOT_INDIRECT instead of CONFIG_RAMBOOT_PBL
Quoted 30 lines
include/configs/corenet_ds.h +19
-0+#define CONFIG_ENV_IS_NOWHERE 1/* Store ENV in memory only */ +#else +#define CONFIG_ENV_IS_IN_FLASH +#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE) +#endif +#define CONFIG_SYS_CLK_FREQ get_board_sys_clk()/* sysclk for MPC85xx */ #define CONFIG_ICS307_REFCLK_HZ 33333000/* ICS307 clock chip ref freq */ @@ -93,6 +104,19 @@#define CONFIG_PANIC_HANG /* do not reset board on panic */ /* +* Config the L3 Cache as L3 SRAM +*/ +#define CONFIG_SYS_INIT_L3_ADDR CONFIG_RAMBOOT_TEXT_BASE +#ifdef CONFIG_PHYS_64BIT +#define CONFIG_SYS_INIT_L3_ADDR_PHYS (0xf00000000ull | CONFIG_RAMBOOT_TEXT_BASE) +#else +#define CONFIG_SYS_INIT_L3_ADDR_PHYS CONFIG_SYS_INIT_L3_ADDR +#endif +#define CONFIG_SYS_L3_SIZE (1024 << 10) +#define CONFIG_SYS_INIT_L3_END (CONFIG_SYS_INIT_L3_ADDR + CONFIG_SYS_L3_SIZE) + + +/* * Base addresses -- Note these are effective addresses where the * actual resources get mapped (not physical addresses) */
include/configs/corenet_ds.h line 212
Quoted 4 lines
include/configs/corenet_ds.h +1
-0@@ -185,6 +209,10 @@#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE/* start of monitor */ +#if defined(CONFIG_RAMBOOT_PBL )
can we not just use CONFIG_PBL_BOOT_INDIRECT instead of CONFIG_RAMBOOT_PBL and maybe move this up to the top of the file
Quoted 22 lines
include/configs/corenet_ds.h +3
-1+#define CONFIG_SYS_RAMBOOT +#endif +#define CONFIG_SYS_FLASH_EMPTY_INFO #define CONFIG_SYS_FLASH_AMD_CHECK_DQ7 #define CONFIG_SYS_FLASH_BANKS_LIST {CONFIG_SYS_FLASH_BASE_PHYS + 0x8000000, CONFIG_SYS_FLASH_BASE_PHYS}@@ -456,7 +484,6 @@/* * Environment */ -#define CONFIG_ENV_ADDR (CONFIG_SYS_MONITOR_BASE - CONFIG_ENV_SECT_SIZE)#define CONFIG_ENV_SIZE 0x2000#define CONFIG_ENV_SECT_SIZE 0x20000/* 128K (one sector) */ Signature · 7 lines
1.6.4 _______________________________________________ U-Boot mailing list U-Boot at lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot