Skip to contentSkip to conversation

PBL: add support for boot from SPI flash.

PATCH Superseded Shaohui Xie 3 participants 4 messages Nov 12, 2010 PowerPC

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 PBL: add support for boot from SPI flash.

PBL: SPI flash used as RCW and PBI source, CPC1 used as 1M SRAM where PBL will copy whole U-BOOT image to, U-boot can boot from CPC1 after PBL completes RCW and PBI phases.

To produces the U-boot image which can used by PBL, pbl_image_tool.html is a necessary tool.

---
 arch/powerpc/cpu/mpc85xx/cpu_init.c  |   25 +++++++++++++++++++++++++
 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, 70 insertions(+), 2 deletions(-)
arch/powerpc/cpu/mpc85xx/cpu_init.c +25 -0
index 27236a0..b5a90fb 100644
@@ -136,6 +136,26 @@ static void enable_cpc(void)
 
 	cpc_corenet_t *cpc = (cpc_corenet_t *)CONFIG_SYS_FSL_CPC_ADDR;
 
+#if defined(CONFIG_SYS_RAMBOOT) && defined(CONFIG_SYS_INIT_L3_ADDR)
+	if (in_be32(&cpc->cpccsr0) & CPC_CSR0_CE) {
+		/* 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);
+
+#ifdef CONFIG_SYS_P4080_ERRATUM_CPC4
+		/* Disable workaround - only needed in all SRAM mode */
+		clrbits_be32(&cpc->cpchdbcr0, CPC_HDBCR0_CDQ_SPEC_DIS);
+#endif
+		out_be32(&cpc->cpccsr0, 0);
+		out_be32(&cpc->cpcsrcr0, 0);
+	}
+#endif
+
 	for (i = 0; i < CONFIG_SYS_NUM_CPC; i++, cpc++) {
 		u32 cpccfg0 = in_be32(&cpc->cpccfg0);
 		size += CPC_CFG0_SZ_K(cpccfg0);
@@ -155,6 +175,11 @@ 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++) {
+#if defined(CONFIG_SYS_RAMBOOT) && defined(CONFIG_SYS_INIT_L3_ADDR)
+		/* skip CPC1 when it used as all SRAM */
+		if (i == 0)
+			continue;
+#endif
 		/* 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
index 15bbf20..ece4578 100644
@@ -24,4 +24,10 @@
 # P4080DS board
 #
 
+ifeq ($(CONFIG_PBLSPI), y)
+RESET_VECTOR_ADDRESS = 0xfffffffc
+endif
+
+ifndef RESET_VECTOR_ADDRESS
 RESET_VECTOR_ADDRESS = 0xeffffffc
+endif
board/freescale/corenet_ds/tlb.c +9 -0
index 1ae0416..08f91a7 100644
@@ -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),
+#else
 	SET_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
index 6c2a667..562721f 100644
@@ -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_PBLSPI	powerpc	mpc85xx		corenet_ds	freescale	-	P4080DS:PBLSPI,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
index 2ac59e5..df03448 100644
@@ -28,6 +28,11 @@
 
 #include "../board/freescale/common/ics307_clk.h"
 
+#ifdef CONFIG_PBLSPI
+#define CONFIG_RAMBOOT_PBLSPI		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_PBLSPI)
+#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_PBLSPI)
+#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
#1 lore raw

PATCH 1/2 PBL: add support for boot from SPI flash.

Quoted 6 lines · Shaohui Xie

PBL: SPI flash used as RCW and PBI source, CPC1 used as 1M SRAM where PBL will copy whole U-BOOT image to, U-boot can boot from CPC1 after PBL completes RCW and PBI phases.

To produces the U-boot image which can used by PBL, pbl_image_tool.html is a necessary tool.

(drop this bit about pbl_image_tool.html, I assume this is the RCW tool??)

Quoted 11 lines

---

arch/powerpc/cpu/mpc85xx/cpu_init.c  |   25 +++++++++++++++++++++++++
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, 70 insertions(+), 2 deletions(-)

Let's use CONFIG_SPIFLASH like we do on all other boards instead of CONFIG_PBLSPI

Quoted 13 lines
arch/powerpc/cpu/mpc85xx/cpu_init.c +4 -0
index 27236a0..b5a90fb 100644
@@ -136,6 +136,26 @@ static void enable_cpc(void)
 
 	cpc_corenet_t *cpc = (cpc_corenet_t *)CONFIG_SYS_FSL_CPC_ADDR;
 
+#if defined(CONFIG_SYS_RAMBOOT) && defined(CONFIG_SYS_INIT_L3_ADDR)
+	if (in_be32(&cpc->cpccsr0) & CPC_CSR0_CE) {
+		/* find and disable LAW of SRAM */
+		struct law_entry law = find_law(CONFIG_SYS_INIT_L3_ADDR);

arch/powerpc/cpu/mpc85xx/cpu_init.c static void enable_cpc(void) · line 152

Quoted 10 lines
arch/powerpc/cpu/mpc85xx/cpu_init.c +10 -0
+
+		if (law.index == -1) {
+			printf("\nFatal error happened\n");
+			return;
+		} else
+			disable_law(law.index);
+
+#ifdef CONFIG_SYS_P4080_ERRATUM_CPC4
+		/* Disable workaround - only needed in all SRAM mode */
+		clrbits_be32(&cpc->cpchdbcr0, CPC_HDBCR0_CDQ_SPEC_DIS);

made the comment before about a separate patch for this.

Quoted 10 lines
arch/powerpc/cpu/mpc85xx/cpu_init.c +6 -0
+#endif
+		out_be32(&cpc->cpccsr0, 0);
+		out_be32(&cpc->cpcsrcr0, 0);
+	}
+#endif
+
 	for (i = 0; i < CONFIG_SYS_NUM_CPC; i++, cpc++) {
 		u32 cpccfg0 = in_be32(&cpc->cpccfg0);
 		size += CPC_CFG0_SZ_K(cpccfg0);

arch/powerpc/cpu/mpc85xx/cpu_init.c void invalidate_cpc(void) · line 179

Quoted 5 lines
arch/powerpc/cpu/mpc85xx/cpu_init.c +0 -0
@@ -155,6 +175,11 @@ 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++) {

Why dont we do something like:

	/* assume if SRAM mode is enabled we are using it to boot from so don't invalidate it */
	if (in_be32(&cpc->cpcsrcr0) & CPC_SRCR0_SRAMEN)
		continue;

instead of the ifdef foo & assuming its CPC1.

Quoted 134 lines
arch/powerpc/cpu/mpc85xx/cpu_init.c +5 -0
+#if defined(CONFIG_SYS_RAMBOOT) && defined(CONFIG_SYS_INIT_L3_ADDR)
+		/* skip CPC1 when it used as all SRAM */
+		if (i == 0)
+			continue;
+#endif
 		/* 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
index 15bbf20..ece4578 100644
@@ -24,4 +24,10 @@
 # P4080DS board
 #
 
+ifeq ($(CONFIG_PBLSPI), y)
+RESET_VECTOR_ADDRESS = 0xfffffffc
+endif
+
+ifndef RESET_VECTOR_ADDRESS

RESET_VECTOR_ADDRESS = 0xeffffffc

board/freescale/corenet_ds/config.mk +1 -0
+endif
board/freescale/corenet_ds/tlb.c +9 -0
index 1ae0416..08f91a7 100644
@@ -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),
+#else
 	SET_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
index 6c2a667..562721f 100644
@@ -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_PBLSPI powerpc mpc85xx corenet_ds freescale - P4080DS:PBLSPI,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
index 2ac59e5..df03448 100644
@@ -28,6 +28,11 @@
 
 #include "../board/freescale/common/ics307_clk.h"
 
+#ifdef CONFIG_PBLSPI
+#define CONFIG_RAMBOOT_PBLSPI		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_PBLSPI)
+#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_PBLSPI)
+#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
#2 lore raw

PATCH 1/2 PBL: add support for boot from SPI flash.

Quoted 7 lines

-----Original Message-----
From: Gala Kumar-B11780
Sent: Friday, November 12, 2010 17:50 PM
To: Xie Shaohui-B21989
Cc: u-boot at lists.denx.de; Zang Roy-R61911; Lan Chunhe-B25806; Hu

Mingkai-

Quoted 11 lines

B21284
Subject: Re: [PATCH 1/2] PBL: add support for boot from SPI flash.

Quoted 5 lines · Shaohui Xie

PBL: SPI flash used as RCW and PBI source, CPC1 used as 1M SRAM where PBL will copy whole U-BOOT image to, U-boot can boot from CPC1 after PBL completes RCW and PBI phases.

To produces the U-boot image which can used by PBL,

pbl_image_tool.html

Quoted 3 lines
Quoted 1 line

is a necessary tool.

(drop this bit about pbl_image_tool.html, I assume this is the RCW

tool??)

Quoted 7 lines
Quoted 7 lines

---
arch/powerpc/cpu/mpc85xx/cpu_init.c | 25

+++++++++++++++++++++++++

Quoted 4 lines
Quoted 4 lines
board/freescale/corenet_ds/config.mk |   6 ++++++++++
board/freescale/corenet_ds/tlb.c     |    9 +++++++++
boards.cfg                           |    1 +
include/configs/corenet_ds.h         |   31

+++++++++++++++++++++++++++++--

Quoted 4 lines
Quoted 1 line
5 files changed, 70 insertions(+), 2 deletions(-)

Let's use CONFIG_SPIFLASH like we do on all other boards instead of CONFIG_PBLSPI

This patch is for PBL boot and is not dedicated to SPI. SD/MMC boot can also use it.
CONFIG_SPIFLASH can't reflect the boot information.
How about CONFIG_PBL_BOOT?
Thanks.
Roy

#3 lore raw

PATCH 1/2 PBL: add support for boot from SPI flash.

Quoted 36 lines · On Nov 12, 2010, at 5:12 AM, Zang Roy-R61911 wrote:
Quoted 7 lines

-----Original Message-----
From: Gala Kumar-B11780
Sent: Friday, November 12, 2010 17:50 PM
To: Xie Shaohui-B21989
Cc: u-boot at lists.denx.de; Zang Roy-R61911; Lan Chunhe-B25806; Hu

Mingkai-

Quoted 11 lines

B21284
Subject: Re: [PATCH 1/2] PBL: add support for boot from SPI flash.

Quoted 5 lines · Shaohui Xie

PBL: SPI flash used as RCW and PBI source, CPC1 used as 1M SRAM where PBL will copy whole U-BOOT image to, U-boot can boot from CPC1 after PBL completes RCW and PBI phases.

To produces the U-boot image which can used by PBL,

pbl_image_tool.html

Quoted 3 lines
Quoted 1 line

is a necessary tool.

(drop this bit about pbl_image_tool.html, I assume this is the RCW

tool??)

Quoted 7 lines
Quoted 7 lines

---
arch/powerpc/cpu/mpc85xx/cpu_init.c | 25

+++++++++++++++++++++++++

Quoted 4 lines
Quoted 4 lines
board/freescale/corenet_ds/config.mk |   6 ++++++++++
board/freescale/corenet_ds/tlb.c     |    9 +++++++++
boards.cfg                           |    1 +
include/configs/corenet_ds.h         |   31
Quoted 8 lines

+++++++++++++++++++++++++++++--

Quoted 4 lines
Quoted 1 line
5 files changed, 70 insertions(+), 2 deletions(-)

Let's use CONFIG_SPIFLASH like we do on all other boards instead of CONFIG_PBLSPI

This patch is for PBL boot and is not dedicated to SPI. SD/MMC boot can also use it.

in theory NAND as well?

Quoted 2 lines

CONFIG_SPIFLASH can't reflect the boot information. How about CONFIG_PBL_BOOT?

hmm, that's better but not quite right. Since we use PBL even on NOR boot.

Maybe something like CONFIG_PBL_BOOT_INDIRECT??

- k