powerpc: p1_p2_rdb_pc: Enable p1_p2_rdb_pc to boot from SD Card with SPL
PATCH 1/3 powerpc: p1_p2_rdb_pc: Enable p1_p2_rdb_pc to boot from SD Card with SPL
From: Ying Zhang <[email protected]>
Enable p1_p2_rdb_pc to start from eSDHC with SPL.
--- board/freescale/p1_p2_rdb_pc/Makefile | 3 + board/freescale/p1_p2_rdb_pc/spl.c | 98 +++++++++++++++++++++++++++++++++ board/freescale/p1_p2_rdb_pc/tlb.c | 21 +++---- include/configs/p1_p2_rdb_pc.h | 59 +++++++++++++++----- 4 files changed, 155 insertions(+), 26 deletions(-) create mode 100644 board/freescale/p1_p2_rdb_pc/spl.c
board/freescale/p1_p2_rdb_pc/Makefile +3 -0
@@ -21,6 +21,9 @@ ifdef MINIMAL COBJS-y += spl_minimal.o tlb.o law.o else +ifdef CONFIG_SPL_BUILD +COBJS-y += spl.o +endif COBJS-y += $(BOARD).o COBJS-y += ddr.o
board/freescale/p1_p2_rdb_pc/spl.c new file +98 -0
98 lines not on this page · raw message
board/freescale/p1_p2_rdb_pc/tlb.c +9 -12
@@ -78,17 +78,8 @@ struct fsl_e_tlb_entry tlb_table[] = { 0, 7, BOOKE_PAGESZ_1M, 1),#endif -#if defined(CONFIG_SYS_RAMBOOT ) || defined(CONFIG_SPL ) -#ifdef CONFIG_SYS_INIT_L2_ADDR -/* 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 ,8 ,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 ,12 ,BOOKE_PAGESZ_256K ,1 ), -#else +#if defined(CONFIG_SYS_RAMBOOT ) || \ + (defined(CONFIG_SPL ) && !defined(CONFIG_SPL_COMMON_INIT_DDR ))/* *I*G - eSDHC/eSPI/NAND boot */ SET_TLB_ENTRY(1, CONFIG_SYS_DDR_SDRAM_BASE, CONFIG_SYS_DDR_SDRAM_BASE, MAS3_SX|MAS3_SW|MAS3_SR, 0,
@@ -101,8 +92,14 @@ struct fsl_e_tlb_entry tlb_table[] = { MAS3_SX|MAS3_SW|MAS3_SR, MAS2_I|MAS2_G, 0, 9, BOOKE_PAGESZ_1G, 1),#endif /* P1020MBG */ -#endif /* not L2 SRAM */ #endif /* RAMBOOT/SPL */ + +#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 };int num_tlb_entries =ARRAY_SIZE (tlb_table);
include/configs/p1_p2_rdb_pc.h +45 -14
84 lines not on this page · raw message
Signature · 1 line
1.7.0.4
PATCH 2/3 powerpc : p1_p2_rdb_pc : Enable p1_p2_rdb_pc to start from eSPI with SPL
From: Ying Zhang <[email protected]>
Enable p1_p2_rdb_pc to start from eSPI with SPL.
--- board/freescale/p1_p2_rdb_pc/spl.c | 9 +++++++++ include/configs/p1_p2_rdb_pc.h | 36 +++++++++++++++++++++++++++++------- 2 files changed, 38 insertions(+), 7 deletions(-)
board/freescale/p1_p2_rdb_pc/spl.c +9 -0
@@ -11,6 +11,7 @@#include <nand.h> #include <i2c.h> #include <fsl_esdhc.h> +#include <spi_flash.h> DECLARE_GLOBAL_DATA_PTR ;
@@ -39,6 +40,10 @@ void board_init_f(ulong bootflag)/* Read back the register to synchronize the write. */ in_be32 (&gur->pmuxcr); +#ifdef CONFIG_SPL_SPI_BOOT +clrbits_be32 (&gur->pmuxcr, MPC85xx_PMUXCR_SD_DATA); +#endif +/* initialize selected port with appropriate baud rate */ plat_ratio =in_be32 (&gur->porpllsr) & MPC85xx_PORPLLSR_PLAT_RATIO; plat_ratio >>=1 ;
@@ -49,6 +54,8 @@ void board_init_f(ulong bootflag) bus_clk / 16 / CONFIG_BAUDRATE);#ifdef CONFIG_SPL_MMC_BOOT puts ("\nSD boot...\n" ); +#elif defined(CONFIG_SPL_SPI_BOOT ) +puts ("\nSPI Flash boot...\n" );#endif /* copy code to RAM and jump to it - this should not return */
@@ -94,5 +101,7 @@ void board_init_r(gd_t *gd, ulong dest_addr)#ifdef CONFIG_SPL_MMC_BOOT mmc_boot (); +#elif defined(CONFIG_SPL_SPI_BOOT ) +spi_boot ();#endif }
include/configs/p1_p2_rdb_pc.h +29 -7
@@ -174,11 +174,33 @@#endif #ifdef CONFIG_SPIFLASH -#define CONFIG_RAMBOOT_SPIFLASH -#define CONFIG_SYS_RAMBOOT -#define CONFIG_SYS_EXTRA_ENV_RELOC -#define CONFIG_SYS_TEXT_BASE 0x11000000 -#define CONFIG_RESET_VECTOR_ADDRESS 0x1107fffc +#define CONFIG_SPL +#define CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT +#define CONFIG_SPL_ENV_SUPPORT +#define CONFIG_SPL_SERIAL_SUPPORT +#define CONFIG_SPL_SPI_SUPPORT +#define CONFIG_SPL_SPI_FLASH_SUPPORT +#define CONFIG_SPL_SPI_FLASH_MINIMAL +#define CONFIG_SPL_FLUSH_IMAGE +#define CONFIG_SPL_TARGET "u-boot-with-spl.bin" +#define CONFIG_SPL_LIBGENERIC_SUPPORT +#define CONFIG_SPL_LIBCOMMON_SUPPORT +#define CONFIG_SPL_I2C_SUPPORT +#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_SYS_SPI_FLASH_U_BOOT_SIZE (512 << 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_MPC85XX_NO_RESETVEC +#define CONFIG_SYS_LDSCRIPT "arch/powerpc/cpu/mpc85xx/u-boot.lds" +#define CONFIG_SPL_SPI_BOOT +#ifdef CONFIG_SPL_BUILD +#define CONFIG_SPL_COMMON_INIT_DDR +#endif #endif #ifdef CONFIG_NAND
@@ -544,7 +566,7 @@* Config the L2 Cache as L2 SRAM */ #if defined(CONFIG_SPL_BUILD ) -#if defined(CONFIG_SDCARD ) +#if defined(CONFIG_SDCARD ) || defined(CONFIG_SPIFLASH )#define CONFIG_SYS_INIT_L2_ADDR 0xf8f80000#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)
@@ -764,7 +786,7 @@/* * Environment */ -#ifdef CONFIG_RAMBOOT_SPIFLASH +#ifdef CONFIG_SPIFLASH #define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SPI_BUS 0#define CONFIG_ENV_SPI_CS 0
Signature · 1 line
1.7.0.4
PATCH 2/3 powerpc : p1_p2_rdb_pc : Enable p1_p2_rdb_pc to start from eSPI with SPL
Quoted 6 lines · ying.zhang at freescale.com
From: Ying Zhang <[email protected]>
Enable
p1_p2_rdb_pcto start from eSPI with SPL.Signed-off-by Ying Zhang <[email protected]>---
Applied to u-boot-mpc85xx/next, pending merging to u-boot-mpc85xx/master branch.
York
PATCH 3/3 powerpc: p1_p2_rdb_pc: add TPL for p1_p2_rdb_pc nand boot
In reply to ying.zhang at freescale.comFrom: Ying Zhang <[email protected]>
Enable TPL for p1_p2_rdb_pc nand boot.
--- board/freescale/p1_p2_rdb_pc/spl.c | 15 +++++ board/freescale/p1_p2_rdb_pc/spl_minimal.c | 83 ++-------------------------- board/freescale/p1_p2_rdb_pc/tlb.c | 8 ++- include/configs/p1_p2_rdb_pc.h | 83 +++++++++++++++++++--------- 4 files changed, 84 insertions(+), 105 deletions(-)
board/freescale/p1_p2_rdb_pc/spl.c +15 -0
@@ -83,12 +83,21 @@ void board_init_r(gd_t *gd, ulong dest_addr)mem_malloc_init (CONFIG_SPL_RELOC_MALLOC_ADDR ,CONFIG_SPL_RELOC_MALLOC_SIZE ); +#ifndef CONFIG_SPL_NAND_BOOT env_init (); +#endif #ifdef CONFIG_SPL_MMC_BOOT mmc_initialize (bd);#endif /* relocate environment function pointers etc. */ +#ifdef CONFIG_SPL_NAND_BOOT +nand_spl_load_image (CONFIG_ENV_OFFSET ,CONFIG_ENV_SIZE , + (uchar *)CONFIG_ENV_ADDR ); + gd->env_addr = (ulong)(CONFIG_ENV_ADDR ); + gd->env_valid =1 ; +#else env_relocate (); +#endif #ifdef CONFIG_SYS_I2C i2c_init_all ();
@@ -97,11 +106,17 @@ void board_init_r(gd_t *gd, ulong dest_addr)#endif gd->ram_size =initdram (0 ); +#ifdef CONFIG_SPL_NAND_BOOT +puts ("Tertiary program loader running in sram..." ); +#else puts ("Second program loader running in sram...\n" ); +#endif #ifdef CONFIG_SPL_MMC_BOOT mmc_boot ();#elif defined(CONFIG_SPL_SPI_BOOT )spi_boot (); +#elif defined(CONFIG_SPL_NAND_BOOT ) +nand_boot ();#endif }
board/freescale/p1_p2_rdb_pc/spl_minimal.c +5 -78
105 lines not on this page · raw message
board/freescale/p1_p2_rdb_pc/tlb.c +7 -1
@@ -98,7 +98,13 @@ struct fsl_e_tlb_entry tlb_table[] = {/* *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) +0 ,11 ,BOOKE_PAGESZ_256K ,1 ), +#if CONFIG_SYS_L2_SIZE >= (256 << 10) +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, 12, BOOKE_PAGESZ_256K, 1) +#endif #endif };
include/configs/p1_p2_rdb_pc.h +57 -26
108 lines not on this page · raw message
Signature · 1 line
1.7.0.4
PATCH 3/3 powerpc: p1_p2_rdb_pc: add TPL for p1_p2_rdb_pc nand boot
Quoted 6 lines · ying.zhang at freescale.com
From: Ying Zhang <[email protected]>
Enable TPL for
p1_p2_rdb_pcnand boot.Signed-off-by Ying Zhang <[email protected]>---
Applied to u-boot-mpc85xx/next, pending merging to u-boot-mpc85xx/master branch.
York
PATCH 1/3 powerpc: p1_p2_rdb_pc: Enable p1_p2_rdb_pc to boot from SD Card with SPL
In reply to ying.zhang at freescale.comQuoted 6 lines · ying.zhang at freescale.com
From: Ying Zhang <[email protected]>
Enable
p1_p2_rdb_pcto start from eSDHC with SPL.Signed-off-by Ying Zhang <[email protected]>---
Applied to u-boot-mpc85xx/next, pending merging to u-boot-mpc85xx/master branch.
York