Skip to contentSkip to conversation

Add boot from NAND/eSDHC/eSPI support

PATCH Superseded Mingkai Hu 4 participants 15 messages Sep 11, 2009 – Sep 14, 2009

Subsystems (2)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Mingkai Hu

author
#0 lore raw

v2 cover Add boot from NAND/eSDHC/eSPI support

These patches implement boot from NAND/eSDHC/eSPI in a unified way - all of these use the general file cpu/mpc85xx/start.S and load the image into L2SRAM.

Modification over v1:
- Align to the latest tree: http://git.denx.de/u-boot-mpc85xx.git
- Align the NAND board make config to the latest mkconfig mofication
- Split the "save env variables to SDCard" patches to another patchset, so patch 4 doesn't depend on that patchset.
- Some cleanup work

The general modification for 85xx platform:
[PATCH v2 1/5] 85xx: add boot from NAND/eSDHC/eSPI support

Add support for boot from NAND:
[PATCH v2 2/5] NAND boot: change NAND loader's relocate SP to CONFIG param [PATCH v2 3/5] NAND boot: MPC8536DS support

Add support for boot from eSDHC and eSPI:
[PATCH v2 4/5] On-chip ROM boot: MPC8536DS support

[PATCH v2 5/5] Add README.mpc8536ds

author
#1 lore raw

PATCH v2 1/5 85xx: add boot from NAND/eSDHC/eSPI support

The MPC8536E is capable of booting form NAND/eSDHC/eSPI, this patch implements these three bootup methods in a unified way - all of these use the general cpu/mpc85xx/start.S, and load the main image to L2SRAM which lets us use the SPD to initialize the SDRAM.

For all three bootup methods, the bootup process can be divided into two
stages: the first stage will initialize the corresponding controller, configure the L2SRAM, then copy the second stage image to L2SRAM and jump to it. The second stage image is just like the general U-Boot image to configure all the hardware and boot up to U-Boot command line.

When boot from NAND, the eLBC controller will first load the first stage image to internal 4K RAM buffer because it's also stored on the NAND flash. The first stage image, also call 4K NADN loader, will initialize the L2SRAM, load the second stage image to L2SRAM and jump to it. The 4K NAND loader's code comes from the corresponding nand_spl directory, along with the code twisted by CONFIG_NAND_SPL.

When boot from eSDHC/eSPI, there's no such a first stage image because the CPU ROM code does the same work. It will initialize the L2SRAM according to the config addr/word pairs on the fixed address and initialize the eSDHC/eSPI controller, then load the second stage image to L2SRAM and jump to it.

The macro CONFIG_SYS_RAMBOOT is used to control the code to produce the second stage image for all different bootup methods. It's set in the board config file when one of the bootup methods above is selected.

---
 cpu/mpc85xx/cpu_init.c |   19 +++++++++++++++++++
 cpu/mpc85xx/start.S    |   23 ++++++++++++++++++++++-
 cpu/mpc85xx/tlb.c      |    6 ++++++
 drivers/misc/fsl_law.c |    2 ++
 4 files changed, 49 insertions(+), 1 deletions(-)
cpu/mpc85xx/cpu_init.c +19 -0
index a54cf5d..5f66511 100644
@@ -291,6 +291,25 @@ int cpu_init_r(void)
 
 	asm("msync;isync");
 	cache_ctl = l2cache->l2ctl;
+
+#if defined(CONFIG_SYS_RAMBOOT) && defined(CONFIG_SYS_INIT_L2_ADDR)
+	if (cache_ctl & MPC85xx_L2CTL_L2E) {
+		/* Clear L2 SRAM memory-mapped base address */
+		out_be32(&l2cache->l2srbar0, 0x0);
+		out_be32(&l2cache->l2srbar1, 0x0);
+
+		/* set MBECCDIS=0, SBECCDIS=0 */
+		clrbits_be32(&l2cache->l2errdis,
+				(MPC85xx_L2ERRDIS_MBECC |
+				 MPC85xx_L2ERRDIS_SBECC));
+
+		/* set L2E=0, L2SRAM=0 */
+		clrbits_be32(&l2cache->l2ctl,
+				(MPC85xx_L2CTL_L2E |
+				 MPC85xx_L2CTL_L2SRAM_ENTIRE));
+	}
+#endif
+
 	l2siz_field = (cache_ctl >> 28) & 0x3;
 
 	switch (l2siz_field) {
cpu/mpc85xx/start.S +22 -1
index e21a4eb..c5b6bd9 100644
@@ -57,10 +57,12 @@
 	GOT_ENTRY(_GOT2_TABLE_)
 	GOT_ENTRY(_FIXUP_TABLE_)
 
+#ifndef CONFIG_NAND_SPL
 	GOT_ENTRY(_start)
 	GOT_ENTRY(_start_of_vectors)
 	GOT_ENTRY(_end_of_vectors)
 	GOT_ENTRY(transfer_to_handler)
+#endif
 
 	GOT_ENTRY(__init_end)
 	GOT_ENTRY(_end)
@@ -235,10 +237,11 @@ _start_e500:
 
 #endif /* CONFIG_MPC8569 */
 
-	/* create a temp mapping in AS=1 to the 4M boot window */
 	lis     r6,FSL_BOOKE_MAS0(1, 15, 0)@h
 	ori     r6,r6,FSL_BOOKE_MAS0(1, 15, 0)@l
 
+#ifndef CONFIG_SYS_RAMBOOT
+	/* create a temp mapping in AS=1 to the 4M boot window */
 	lis     r7,FSL_BOOKE_MAS1(1, 1, 0, 1, BOOKE_PAGESZ_4M)@h
 	ori     r7,r7,FSL_BOOKE_MAS1(1, 1, 0, 1, BOOKE_PAGESZ_4M)@l
 
@@ -248,6 +251,20 @@ _start_e500:
 	/* The 85xx has the default boot window 0xff800000 - 0xffffffff */
 	lis     r9,FSL_BOOKE_MAS3(0xffc00000, 0, (MAS3_SX|MAS3_SW|MAS3_SR))@h
 	ori     r9,r9,FSL_BOOKE_MAS3(0xffc00000, 0, (MAS3_SX|MAS3_SW|MAS3_SR))@l
+#else
+	/*
+	 * create a temp mapping in AS=1 to the 1M TEXT_BASE space, the main
+	 * image has been relocated to TEXT_BASE on the second stage.
+	 */
+	lis     r7,FSL_BOOKE_MAS1(1, 1, 0, 1, BOOKE_PAGESZ_1M)@h
+	ori     r7,r7,FSL_BOOKE_MAS1(1, 1, 0, 1, BOOKE_PAGESZ_1M)@l
+
+	lis     r8,FSL_BOOKE_MAS2(TEXT_BASE, (MAS2_I|MAS2_G))@h
+	ori     r8,r8,FSL_BOOKE_MAS2(TEXT_BASE, (MAS2_I|MAS2_G))@l
+
+	lis     r9,FSL_BOOKE_MAS3(TEXT_BASE, 0, (MAS3_SX|MAS3_SW|MAS3_SR))@h
+	ori     r9,r9,FSL_BOOKE_MAS3(TEXT_BASE, 0, (MAS3_SX|MAS3_SW|MAS3_SR))@l
+#endif
 
 	mtspr   MAS0,r6
 	mtspr   MAS1,r7
@@ -359,6 +376,7 @@ _start_cont:
 	bl	board_init_f
 	isync
 
+#ifndef CONFIG_NAND_SPL
 	. = EXC_OFF_SYS_RESET
 	.globl	_start_of_vectors
 _start_of_vectors:
@@ -813,6 +831,7 @@ in32:
 in32r:
 	lwbrx	r3,r0,r3
 	blr
+#endif  /* !CONFIG_NAND_SPL */
 
 /*------------------------------------------------------------------------------*/
 
@@ -975,6 +994,7 @@ clear_bss:
 	mr	r4,r10		/* Destination Address		*/
 	bl	board_init_r
 
+#ifndef CONFIG_NAND_SPL
 	/*
 	 * Copy exception vector code to low memory
 	 *
@@ -1128,3 +1148,4 @@ setup_ivors:
 
 #include "fixed_ivor.S"
 	blr
+#endif /* !CONFIG_NAND_SPL */
cpu/mpc85xx/tlb.c +6 -0
index 0497a29..9c7c928 100644
@@ -59,6 +59,7 @@ void set_tlb(u8 tlb, u32 epn, u64 rpn,
 #endif
 }
 
+#ifndef CONFIG_NAND_SPL
 void disable_tlb(u8 esel)
 {
 	u32 _mas0, _mas1, _mas2, _mas3, _mas7;
@@ -83,6 +84,7 @@ void disable_tlb(u8 esel)
 		addrmap_set_entry(0, 0, 0, esel);
 #endif
 }
+#endif
 
 void invalidate_tlb(u8 tlb)
 {
@@ -106,6 +108,7 @@ void init_tlbs(void)
 	return ;
 }
 
+#ifdef CONFIG_ADDR_MAP
 static void tlbsx (const volatile unsigned *addr)
 {
 	__asm__ __volatile__ ("tlbsx 0,%0" : : "r" (addr), "m" (*addr));
@@ -132,6 +135,7 @@ int find_tlb_idx(void *addr, u8 tlbsel)
 
 	return -1;
 }
+#endif
 
 #ifdef CONFIG_ADDR_MAP
 void init_addr_map(void)
@@ -168,6 +172,7 @@ void init_addr_map(void)
 }
 #endif
 
+#ifndef CONFIG_NAND_SPL
 #ifndef CONFIG_SYS_DDR_TLB_START
 #define CONFIG_SYS_DDR_TLB_START 8
 #endif
@@ -215,3 +220,4 @@ unsigned int setup_ddr_tlbs(unsigned int memsize_in_meg)
 	 */
 	return memsize_in_meg;
 }
+#endif /* !CONFIG_NAND_SPL */
drivers/misc/fsl_law.c +2 -0
index 7bdd355..aa877c6 100644
@@ -74,6 +74,7 @@ int set_next_law(phys_addr_t addr, enum law_size sz, enum law_trgt_if id)
 	return idx;
 }
 
+#ifndef CONFIG_NAND_SPL
 int set_last_law(phys_addr_t addr, enum law_size sz, enum law_trgt_if id)
 {
 	u32 idx;
@@ -166,6 +167,7 @@ int set_ddr_laws(u64 start, u64 sz, enum law_trgt_if id)
 
 	return 0;
 }
+#endif
 
 void init_laws(void)
 {
Signature · 1 line
1.6.4
author
#2 lore raw

PATCH v2 2/5 NAND boot: change NAND loader's relocate SP to CONFIG param

So that we can set the NAND loader's relocate stack pointer to the value other than the relocate address + 0x10000.

---
 board/freescale/mpc8313erdb/mpc8313erdb.c |    2 +-
 board/sheldon/simpc8313/simpc8313.c       |    2 +-
 include/configs/MPC8313ERDB.h             |    1 +
 include/configs/SIMPC8313.h               |    1 +
 4 files changed, 4 insertions(+), 2 deletions(-)
board/freescale/mpc8313erdb/mpc8313erdb.c +1 -1
index 9ffd4bf..e5f62ae 100644
@@ -140,7 +140,7 @@ void board_init_f(ulong bootflag)
 	puts("NAND boot... ");
 	init_timebase();
 	initdram(0);
-	relocate_code(CONFIG_SYS_NAND_U_BOOT_RELOC + 0x10000, (gd_t *)gd,
+	relocate_code(CONFIG_SYS_NAND_U_BOOT_RELOC_SP, (gd_t *)gd,
 	              CONFIG_SYS_NAND_U_BOOT_RELOC);
 }
 
board/sheldon/simpc8313/simpc8313.c +1 -1
index 25e5c24..1044de2 100644
@@ -112,7 +112,7 @@ void board_init_f(ulong bootflag)
 	puts("NAND boot... ");
 	init_timebase();
 	initdram(0);
-	relocate_code(CONFIG_SYS_NAND_U_BOOT_RELOC + 0x10000, (gd_t *)gd,
+	relocate_code(CONFIG_SYS_NAND_U_BOOT_RELOC_SP, (gd_t *)gd,
 				  CONFIG_SYS_NAND_U_BOOT_RELOC);
 }
 
include/configs/MPC8313ERDB.h +1 -0
index 4bf05d2..76b7894 100644
@@ -242,6 +242,7 @@
 #define CONFIG_SYS_NAND_U_BOOT_START 0x00100100
 #define CONFIG_SYS_NAND_U_BOOT_OFFS  16384
 #define CONFIG_SYS_NAND_U_BOOT_RELOC 0x00010000
+#define CONFIG_SYS_NAND_U_BOOT_RELOC_SP (CONFIG_SYS_NAND_U_BOOT_RELOC + 0x10000)
 
 #define CONFIG_SYS_NAND_BR_PRELIM	( CONFIG_SYS_NAND_BASE \
 				| (2<<BR_DECC_SHIFT)	/* Use HW ECC */ \
include/configs/SIMPC8313.h +1 -0
index b847ce8..866ff17 100644
@@ -136,6 +136,7 @@
 #define CONFIG_SYS_NAND_U_BOOT_DST	0x00100000
 #define CONFIG_SYS_NAND_U_BOOT_START	0x00100100
 #define CONFIG_SYS_NAND_U_BOOT_RELOC	0x00010000
+#define CONFIG_SYS_NAND_U_BOOT_RELOC_SP (CONFIG_SYS_NAND_U_BOOT_RELOC + 0x10000)
 
 #define CONFIG_SYS_NAND_BR_PRELIM	( CONFIG_SYS_NAND_BASE \
 					| (2<<BR_DECC_SHIFT)	/* Use HW ECC */ \
Signature · 1 line
1.6.4
author
#3 lore raw

PATCH v2 3/5 NAND boot: MPC8536DS support

MPC8536E can support booting from NAND flash which uses the image u-boot-nand.bin. This image contains two parts: a 4K NAND loader and a main U-Boot image. The former is appended to the latter to produce u-boot-nand.bin. The 4K NAND loader includes the corresponding nand_spl directory, along with the code twisted by CONFIG_NAND_SPL. The main U-Boot image just like a general U-Boot image except the parts that included by CONFIG_SYS_RAMBOOT.

When power on, eLBC will automatically load from bank 0 the 4K NAND loader into the FCM buffer RAM where CPU can execute the boot code directly. In the first stage, the NAND loader copies itself to RAM or L2SRAM to free up the FCM buffer RAM, then loads the main image from NAND flash to RAM or L2SRAM and boot from it.

This patch implements the NAND loader to load the main image into L2SRAM, so the main image can configure the RAM by using SPD EEPROM. In the first stage, the NAND loader copies itself to the second to last 4K address space, and uses the last 4K address space as the initial RAM for stack.

Obviously, the size of L2SRAM shouldn't be less than the size of the image used. If so, the workaround is to generate another image that includes the code to configure the RAM by SPD and load it to L2SRAM first, then relocate the main image to RAM to boot up.

---
 Makefile                                       |    1 +
 board/freescale/mpc8536ds/config.mk            |    7 +
 board/freescale/mpc8536ds/tlb.c                |   11 ++
 board/freescale/mpc8536ds/u-boot-nand.lds      |  140 ++++++++++++++++++++++++
 cpu/mpc85xx/nand_init.c                        |  109 ++++++++++++++++++
 include/configs/MPC8536DS.h                    |   96 +++++++++++++----
 nand_spl/board/freescale/mpc8536ds/Makefile    |  119 ++++++++++++++++++++
 nand_spl/board/freescale/mpc8536ds/nand_boot.c |   99 +++++++++++++++++
 nand_spl/board/freescale/mpc8536ds/u-boot.lds  |   67 +++++++++++
 9 files changed, 629 insertions(+), 20 deletions(-)
 create mode 100644 board/freescale/mpc8536ds/u-boot-nand.lds
 create mode 100644 cpu/mpc85xx/nand_init.c
 create mode 100644 nand_spl/board/freescale/mpc8536ds/Makefile
 create mode 100644 nand_spl/board/freescale/mpc8536ds/nand_boot.c
 create mode 100644 nand_spl/board/freescale/mpc8536ds/u-boot.lds
Makefile +1 -0
index 8fd9979..681242e 100644
@@ -2442,6 +2442,7 @@ vme8349_config:		unconfig
 ATUM8548_config:	unconfig
 	@$(MKCONFIG) $(@:_config=) ppc mpc85xx atum8548
 
+MPC8536DS_NAND_config \
 MPC8536DS_36BIT_config \
 MPC8536DS_config:       unconfig
 	@$(MKCONFIG) -n $(@:_config=) MPC8536DS ppc mpc85xx mpc8536ds freescale
board/freescale/mpc8536ds/config.mk +7 -0
index f030876..b4bc33c 100644
@@ -23,6 +23,13 @@
 #
 # mpc8536ds board
 #
+ifndef NAND_SPL
+ifeq ($(CONFIG_MK_MPC8536DS_NAND), y)
+TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE)
+LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot-nand.lds
+endif
+endif
+
 ifndef TEXT_BASE
 TEXT_BASE = 0xeff80000
 endif
board/freescale/mpc8536ds/tlb.c +11 -0
index 35a13d4..dc52d7f 100644
@@ -71,6 +71,17 @@ struct fsl_e_tlb_entry tlb_table[] = {
 	SET_TLB_ENTRY(1, CONFIG_SYS_NAND_BASE, CONFIG_SYS_NAND_BASE_PHYS,
 		      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
 		      0, 4, BOOKE_PAGESZ_1M, 1),
+
+#if defined(CONFIG_SYS_RAMBOOT) && defined(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_I|MAS2_G,
+		      0, 5, BOOKE_PAGESZ_256K, 1),
+	SET_TLB_ENTRY(1, CONFIG_SYS_INIT_L2_ADDR + 0x40000,
+		      CONFIG_SYS_INIT_L2_ADDR_PHYS + 0x40000,
+		      MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G,
+		      0, 6, BOOKE_PAGESZ_256K, 1),
+#endif
 };
 
 int num_tlb_entries = ARRAY_SIZE(tlb_table);
board/freescale/mpc8536ds/u-boot-nand.lds new file +140 -0

140 lines not on this page · raw message

cpu/mpc85xx/nand_init.c new file +109 -0

109 lines not on this page · raw message

include/configs/MPC8536DS.h +76 -20

167 lines not on this page · raw message

nand_spl/board/freescale/mpc8536ds/Makefile new file +119 -0

119 lines not on this page · raw message

nand_spl/board/freescale/mpc8536ds/nand_boot.c new file +99 -0

99 lines not on this page · raw message

nand_spl/board/freescale/mpc8536ds/u-boot.lds new file +67 -0

67 lines not on this page · raw message

Signature · 1 line
1.6.4
author
#4 lore raw

PATCH v2 4/5 On-chip ROM boot: MPC8536DS support

The MPC8536E is capable of booting from the on-chip ROM - boot from eSDHC and boot from eSPI. When power on, the porcessor excutes the ROM code to initialize the eSPI/eSDHC controller, and loads the mian U-Boot image from the memory device that interfaced to the controller, such as the SDCard or SPI EEPROM, to the target memory, e.g. SDRAM or L2SRAM, then boot from it.

The memory device should contain a specific data structure with control word and config word at the fixed address. The config word direct the process how to config the memory device, and the control word direct the processor where to find the image on the memory device, or where copy the main image to. The user can use any method to store the data structure to the memory device, only if store it on the assigned address.

The on-chip ROM code will map the whole 4GB address space by setting entry0 in the TLB1, so the main image need to switch to Address space 1 to disable this mapping and map the address space again.

This patch implements loading the mian U-Boot image into L2SRAM, so the image can configure the system memory by using SPD EEPROM. But save the env variables to NOWHERE.

---
 Makefile                            |    2 ++
 board/freescale/mpc8536ds/config.mk |    8 ++++++++
 include/configs/MPC8536DS.h         |   17 ++++++++++++++++-
 3 files changed, 26 insertions(+), 1 deletions(-)
Makefile +2 -0
index 681242e..79d40fa 100644
@@ -2443,6 +2443,8 @@ ATUM8548_config:	unconfig
 	@$(MKCONFIG) $(@:_config=) ppc mpc85xx atum8548
 
 MPC8536DS_NAND_config \
+MPC8536DS_SDCARD_config \
+MPC8536DS_SPIFLASH_config \
 MPC8536DS_36BIT_config \
 MPC8536DS_config:       unconfig
 	@$(MKCONFIG) -n $(@:_config=) MPC8536DS ppc mpc85xx mpc8536ds freescale
board/freescale/mpc8536ds/config.mk +8 -0
index b4bc33c..7e34751 100644
@@ -30,6 +30,14 @@ LDSCRIPT := $(TOPDIR)/board/$(BOARDDIR)/u-boot-nand.lds
 endif
 endif
 
+ifeq ($(CONFIG_MK_MPC8536DS_SDCARD), y)
+TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE)
+endif
+
+ifeq ($(CONFIG_MK_MPC8536DS_SPIFLASH), y)
+TEXT_BASE = $(CONFIG_RAMBOOT_TEXT_BASE)
+endif
+
 ifndef TEXT_BASE
 TEXT_BASE = 0xeff80000
 endif
include/configs/MPC8536DS.h +16 -1
index 9b43e97..580d66f 100644
@@ -37,6 +37,16 @@
 #define CONFIG_RAMBOOT_TEXT_BASE	0xf8f82000
 #endif
 
+#ifdef CONFIG_MK_MPC8536DS_SDCARD
+#define CONFIG_RAMBOOT_SDCARD		1
+#define CONFIG_RAMBOOT_TEXT_BASE	0xf8f80000
+#endif
+
+#ifdef CONFIG_MK_MPC8536DS_SPIFLASH
+#define CONFIG_RAMBOOT_SPIFLASH		1
+#define CONFIG_RAMBOOT_TEXT_BASE	0xf8f80000
+#endif
+
 /* High Level Configuration Options */
 #define CONFIG_BOOKE		1	/* BOOKE */
 #define CONFIG_E500		1	/* BOOKE e500 family */
@@ -231,7 +241,8 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
 
 #define CONFIG_SYS_MONITOR_BASE	TEXT_BASE	/* start of monitor */
 
-#if defined(CONFIG_SYS_SPL) || defined(CONFIG_RAMBOOT_NAND)
+#if defined(CONFIG_SYS_SPL) || defined(CONFIG_RAMBOOT_NAND) \
+	|| defined(CONFIG_RAMBOOT_SDCARD) || defined(CONFIG_RAMBOOT_SPIFLASH)
 #define CONFIG_SYS_RAMBOOT
 #else
 #undef CONFIG_SYS_RAMBOOT
@@ -622,6 +633,10 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy);
 	#define CONFIG_ENV_IS_IN_NAND	1
 	#define CONFIG_ENV_SIZE		CONFIG_SYS_NAND_BLOCK_SIZE
 	#define CONFIG_ENV_OFFSET	((512 * 1024) + CONFIG_SYS_NAND_BLOCK_SIZE)
+#elif defined(CONFIG_RAMBOOT_SPIFLASH) || defined(CONFIG_RAMBOOT_SDCARD)
+	#define CONFIG_ENV_IS_NOWHERE	1	/* Store ENV in memory only */
+	#define CONFIG_ENV_ADDR		(CONFIG_SYS_MONITOR_BASE - 0x1000)
+	#define CONFIG_ENV_SIZE		0x2000
 #endif
 #else
 	#define CONFIG_ENV_IS_IN_FLASH	1
Signature · 1 line
1.6.4
author
#5 lore raw

PATCH v2 5/5 Add README.mpc8536ds

Add boot from NAND/eSDHC/eSPI description

---
 doc/README.mpc8536ds |  127 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 127 insertions(+), 0 deletions(-)
 create mode 100644 doc/README.mpc8536ds
doc/README.mpc8536ds new file +127 -0
new file mode 100644
index 0000000..4d0bee0
@@ -0,0 +1,127 @@
+Overview:
+=========
+
+The MPC8536E integrates a PowerPC processor core with system logic
+required for imaging, networking, and communications applications.
+
+Boot from NAND:
+===============
+
+The MPC8536E is capable of booting from NAND flash which uses the image
+u-boot-nand.bin. This image contains two parts: a first stage image(also
+call 4K NAND loader and a second stage image. The former is appended to
+the latter to produce u-boot-nand.bin.
+
+The bootup process can be divided into two stages: the first stage will
+configure the L2SRAM, then copy the second stage image to L2SRAM and jump
+to it. The second stage image is to configure all the hardware and boot up
+to U-Boot command line.
+
+The 4K NAND loader's code comes from the corresponding nand_spl directory,
+along with the code twisted by CONFIG_NAND_SPL. The macro CONFIG_NAND_SPL
+is mainly used to shrink the code size to the 4K size limitation.
+
+The macro CONFIG_SYS_RAMBOOT is used to control the code to produce the
+second stage image. It's set in the board config file when boot from NAND
+is selected.
+
+Build and boot steps
+--------------------
+
+1. Building image
+	make MPC8536DS_NAND_config
+	make CROSS_COMPILE=powerpc-none-linux-gnuspe- all
+
+2. Change dip-switch
+	SW2[5-8] = 1011
+	SW9[1-3] = 101
+	Note: 1 stands for 'on', 0 stands for 'off'
+
+3. Flash image
+	tftp 1000000 u-boot-nand.bin
+	nand erase 0 a0000
+	nand write 1000000 0 a0000
+
+Boot from On-chip ROM:
+======================
+
+The MPC8536E is capable of booting from the on-chip ROM - boot from eSDHC
+and boot from eSPI. When power on, the porcessor excutes the ROM code to
+initialize the eSPI/eSDHC controller, and loads the mian U-Boot image from
+the memory device that interfaced to the controller, such as the SDCard or
+SPI EEPROM, to the target memory, e.g. SDRAM or L2SRAM, then boot from it.
+
+The memory device should contain a specific data structure with control word
+and config word at the fixed address. The config word direct the process how
+to config the memory device, and the control word direct the processor where
+to find the image on the memory device, or where copy the main image to. The
+user can use any method to store the data structure to the memory device, only
+if store it on the assigned address.
+
+Build and boot steps
+--------------------
+
+For boot from eSDHC:
+1. Build image
+	make MPC8536DS_SDCARD_config
+	make CROSS_COMPILE=powerpc-none-linux-gnuspe- all
+
+2. Change dip-switch
+	SW2[5-8] = 0111
+	SW3[1]   = 0
+	SW8[7]   = 0 - The on-board SD/MMC slot is active
+	SW8[7]   = 1 - The externel SD/MMC slot is active
+
+3. Put image to SDCard
+	Put the follwing info at the assigned address on the SDCard:
+
+	   Offset   |   Data     | Description
+	--------------------------------------------------------
+	| 0x40-0x43 | 0x424F4F54 | BOOT signature              |
+	--------------------------------------------------------
+	| 0x48-0x4B | 0x00080000 | u-boot.bin's size           |
+	--------------------------------------------------------
+	| 0x50-0x53 | 0x???????? | u-boot.bin's Addr on SDCard |
+	--------------------------------------------------------
+	| 0x58-0x5B | 0xF8F80000 | Target Address              |
+	-------------------------------------------------------
+	| 0x60-0x63 | 0xF8FFF000 | Execution Starting Address  |
+	--------------------------------------------------------
+	| 0x68-0x6B | 0x6        | Number of Config Addr/Data  |
+	--------------------------------------------------------
+	| 0x80-0x83 | 0xFF720100 | Config Addr 1               |
+	| 0x84-0x87 | 0xF8F80000 | Config Data 1               |
+	--------------------------------------------------------
+	| 0x88-0x8b | 0xFF720e44 | Config Addr 2               |
+	| 0x8c-0x8f | 0x0000000C | Config Data 2               |
+	--------------------------------------------------------
+	| 0x90-0x93 | 0xFF720000 | Config Addr 3               |
+	| 0x94-0x97 | 0x80010000 | Config Data 3               |
+	--------------------------------------------------------
+	| 0x98-0x9b | 0xFF72e40e | Config Addr 4               |
+	| 0x9c-0x9f | 0x00000040 | Config Data 4               |
+	--------------------------------------------------------
+	| 0xa0-0xa3 | 0x40000001 | Config Addr 5               |
+	| 0xa4-0xa7 | 0x00000100 | Config Data 5               |
+	--------------------------------------------------------
+	| 0xa8-0xab | 0x80000001 | Config Addr 6               |
+	| 0xac-0xaf | 0x80000001 | Config Data 6               |
+	--------------------------------------------------------
+	|              ......                                  |
+	--------------------------------------------------------
+	| 0x???????? | u-boot.bin                              |
+	--------------------------------------------------------
+
+	then insert the SDCard to the active slot to boot up.
+
+For boot from eSPI:
+1. Build image
+	make MPC8536DS_SPIFLASH_config
+	make CROSS_COMPILE=powerpc-none-linux-gnuspe- all
+
+2. Change dip-switch
+	SW2[5-8] = 0110
+
+3. Put image to SPI flash
+	Put the info in the above table onto the SPI flash, then
+	boot up.
Signature · 1 line
1.6.4
#6 lore raw

PATCH v2 3/5 NAND boot: MPC8536DS support

In reply to Mingkai Hu
Quoted 2 lines · Mingkai Hu

board/freescale/mpc8536ds/u-boot-nand.lds | 140 +++++++++++++++
+++++++++

Do we really need a specific linker script for this?

- k

#7 lore raw

PATCH v2 3/5 NAND boot: MPC8536DS support

Quoted 7 lines · Kumar Gala
Quoted 2 lines · Mingkai Hu

board/freescale/mpc8536ds/u-boot-nand.lds | 140 +++++++++++++++
+++++++++

Do we really need a specific linker script for this?

More specifically, can we move it into cpu/mpc85xx/u-boot-nand.lds and match cpu/mpc85xx/u-boot.lds.

- k

#8 lore raw

PATCH v2 3/5 NAND boot: MPC8536DS support

Quoted 15 lines

-----Original Message-----
From: Kumar Gala [mailto:galak at kernel.crashing.org]
Sent: Friday, September 11, 2009 12:21 PM
To: Gala Kumar-B11780
Cc: Hu Mingkai-B21284; Wood Scott-B07421; u-boot at lists.denx.de
Subject: Re: [U-Boot] [PATCH v2 3/5] NAND boot: MPC8536DS support

Quoted 3 lines · Kumar Gala

On Sep 10, 2009, at 9:53 PM, Mingkai Hu wrote:

Quoted 9 lines
Quoted 1 line
Quoted 1 line

board/freescale/mpc8536ds/u-boot-nand.lds | 140

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

Quoted 3 lines
Quoted 1 line

+++++++++

Do we really need a specific linker script for this?

More specifically, can we move it into cpu/mpc85xx/u-boot-nand.lds and match cpu/mpc85xx/u-boot.lds.

I think it can be moved to cpu/mpc85xx/*, but it's a little trouble to match u-boot.lds
when load the boot-from-nand image to L2 SRAM.

The script u-boot.lds will expand the image to 512K, along with the 4K NAND loader,
the image size wil over 512K, so we place the boot page on the beginning of the
boot-from-nand image.

When load the image to DDR, I think it can match u-boot.lds.

Thanks,
Mingkai

#9 lore raw

PATCH v2 3/5 NAND boot: MPC8536DS support

Quoted 29 lines · On Sep 11, 2009, at 12:43 AM, Hu Mingkai-B21284 wrote:
Quoted 15 lines

-----Original Message-----
From: Kumar Gala [mailto:galak at kernel.crashing.org]
Sent: Friday, September 11, 2009 12:21 PM
To: Gala Kumar-B11780
Cc: Hu Mingkai-B21284; Wood Scott-B07421; u-boot at lists.denx.de
Subject: Re: [U-Boot] [PATCH v2 3/5] NAND boot: MPC8536DS support

Quoted 3 lines · Kumar Gala

On Sep 10, 2009, at 9:53 PM, Mingkai Hu wrote:

Quoted 9 lines
Quoted 1 line
Quoted 1 line

board/freescale/mpc8536ds/u-boot-nand.lds | 140

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

Quoted 3 lines
Quoted 1 line

+++++++++

Do we really need a specific linker script for this?

More specifically, can we move it into cpu/mpc85xx/u-boot-nand.lds and match cpu/mpc85xx/u-boot.lds.

I think it can be moved to cpu/mpc85xx/*, but it's a little trouble to match u-boot.lds
when load the boot-from-nand image to L2 SRAM.

Quoted 8 lines

The script u-boot.lds will expand the image to 512K, along with the 4K NAND loader,
the image size wil over 512K, so we place the boot page on the beginning
of the
boot-from-nand image.

When load the image to DDR, I think it can match u-boot.lds.

When I say match I just meant the differences should only be the one's required.

For example I don't believe this difference is necessary:

@@ -69,8 +65,10 @@

      PROVIDE (etext = .);
      .rodata    :
     {
+    *(.rodata)
+    *(.rodata1)
+    *(.rodata.str1.4)
      *(.eh_frame)
-    *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
    } :text
    .fini      : { *(.fini)    } =0
    .ctors     : { *(.ctors)   }

- k

#10 lore raw

PATCH v2 3/5 NAND boot: MPC8536DS support

Quoted 18 lines

-----Original Message-----
From: Kumar Gala [mailto:galak at kernel.crashing.org]
Sent: Friday, September 11, 2009 10:49 PM
To: Hu Mingkai-B21284
Cc: Wood Scott-B07421; u-boot at lists.denx.de
Subject: Re: [U-Boot] [PATCH v2 3/5] NAND boot: MPC8536DS support

When I say match I just meant the differences should only be the one's required.

For example I don't believe this difference is necessary:

(quoted diff) +0 -0
@@ -69,8 +65,10 @@
      PROVIDE (etext = .);

Review line 74

Quoted 10 lines
(quoted diff) +3 -1
      .rodata    :
     {
+    *(.rodata)
+    *(.rodata1)
+    *(.rodata.str1.4)
      *(.eh_frame)
-    *(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
    } :text
    .fini      : { *(.fini)    } =0
    .ctors     : { *(.ctors)   }

Ok, I have matched this difference with u-boot.lds in version 3.

Thanks,
Mingkai

#11 lore raw

PATCH v2 2/5 NAND boot: change NAND loader's relocate SP to CONFIG param

In reply to Mingkai Hu
Quoted 10 lines · Mingkai Hu

So that we can set the NAND loader's relocate stack pointer to the value other than the relocate address + 0x10000.

---
 board/freescale/mpc8313erdb/mpc8313erdb.c |    2 +-
 board/sheldon/simpc8313/simpc8313.c       |    2 +-
 include/configs/MPC8313ERDB.h             |    1 +
 include/configs/SIMPC8313.h               |    1 +
 4 files changed, 4 insertions(+), 2 deletions(-)

-Scott

Applied
#12 lore raw

PATCH v2 2/5 NAND boot: change NAND loader's relocate SP to CONFIG param

Quoted 12 lines · Scott Wood
Quoted 10 lines · Mingkai Hu

So that we can set the NAND loader's relocate stack pointer to the value other than the relocate address + 0x10000.

---

board/freescale/mpc8313erdb/mpc8313erdb.c |    2 +-
board/sheldon/simpc8313/simpc8313.c       |    2 +-
include/configs/MPC8313ERDB.h             |    1 +
include/configs/SIMPC8313.h               |    1 +
4 files changed, 4 insertions(+), 2 deletions(-)
Quoted 1 line

applied to 85xx

- k

#13 lore raw

PATCH v2 1/5 85xx: add boot from NAND/eSDHC/eSPI support

In reply to Mingkai Hu
Quoted 21 lines · Mingkai Hu
cpu/mpc85xx/tlb.c +2 -0
index 0497a29..9c7c928 100644
@@ -59,6 +59,7 @@ void set_tlb(u8 tlb, u32 epn, u64 rpn,
 #endif
 }
 
+#ifndef CONFIG_NAND_SPL
 void disable_tlb(u8 esel)
 {
 	u32 _mas0, _mas1, _mas2, _mas3, _mas7;
@@ -83,6 +84,7 @@ void disable_tlb(u8 esel)
 		addrmap_set_entry(0, 0, 0, esel);
 #endif
 }
+#endif
 
 void invalidate_tlb(u8 tlb)
 {

cpu/mpc85xx/tlb.c void init_tlbs(void) · line 111

Quoted 4 lines
cpu/mpc85xx/tlb.c +1 -0
@@ -106,6 +108,7 @@ void init_tlbs(void)
 	return ;
 }
 
+#ifdef CONFIG_ADDR_MAP

why ADDR_MAP?

- k

Quoted 25 lines
cpu/mpc85xx/tlb.c +2 -0
 static void tlbsx (const volatile unsigned *addr)
 {
 	__asm__ __volatile__ ("tlbsx 0,%0" : : "r" (addr), "m" (*addr));
@@ -132,6 +135,7 @@ int find_tlb_idx(void *addr, u8 tlbsel)
 
 	return -1;
 }
+#endif
 
 #ifdef CONFIG_ADDR_MAP
 void init_addr_map(void)
@@ -168,6 +172,7 @@ void init_addr_map(void)
 }
 #endif
 
+#ifndef CONFIG_NAND_SPL
 #ifndef CONFIG_SYS_DDR_TLB_START
 #define CONFIG_SYS_DDR_TLB_START 8
 #endif
@@ -215,3 +220,4 @@ unsigned int setup_ddr_tlbs(unsigned int  
 memsize_in_meg)
 	 */
 	return memsize_in_meg;

}
+#endif /* !CONFIG_NAND_SPL */

#14 lore raw

PATCH v2 1/5 85xx: add boot from NAND/eSDHC/eSPI support

Quoted 35 lines

-----Original Message-----
From: Gala Kumar-B11780
Sent: Friday, September 11, 2009 11:13 AM
To: Hu Mingkai-B21284
Cc: u-boot at lists.denx.de; Wood Scott-B07421
Subject: Re: [PATCH v2 1/5] 85xx: add boot from
NAND/eSDHC/eSPI support

Quoted 22 lines · Mingkai Hu
cpu/mpc85xx/tlb.c index renamed from cpu/mpc85xx/tlb.c +0 -0

0497a29..9c7c928 100644

cpu/mpc85xx/tlb.c +1 -0
@@ -59,6 +59,7 @@ void set_tlb(u8 tlb, u32 epn, u64 rpn, #endif }
 
+#ifndef CONFIG_NAND_SPL
 void disable_tlb(u8 esel)
 {
 	u32 _mas0, _mas1, _mas2, _mas3, _mas7; @@ -83,6 +84,7 @@ void 
 disable_tlb(u8 esel)
 		addrmap_set_entry(0, 0, 0, esel);

#endif
}
+#endif

void invalidate_tlb(u8 tlb)
{

cpu/mpc85xx/tlb.c +0 -0
@@ -106,6 +108,7 @@ void init_tlbs(void)
 	return ;
 }
 
Quoted 4 lines

cpu/mpc85xx/tlb.c void init_tlbs(void) · line 111

Quoted 1 line
cpu/mpc85xx/tlb.c +1 -0
+#ifdef CONFIG_ADDR_MAP

why ADDR_MAP?

Oh..., sorry, copy error, it should be NAND_SPL. I'll send it again.

Without this, the 4K NAND loader size will over 4K.

Thanks,
Mingkai