ppc/85xx: Change cpu_init_early_f so we can use with NAND SPL
PATCH 1/2 ppc/85xx: Change cpu_init_early_f so we can use with NAND SPL
Use write_tlb and don't use memset so we can use the same code for cpu_init_early_f between NAND SPL and not.
--- cpu/mpc85xx/cpu_init.c | 34 +++++++++++++++++++++++++--------- 1 files changed, 25 insertions(+), 9 deletions(-)
cpu/mpc85xx/cpu_init.c +25 -9
@@ -1,5 +1,5 @@/* -* Copyright 2007 Freescale Semiconductor. +* Copyright 2007-2009 Freescale Semiconductor, Inc. * * (C) Copyright 2003 Motorola Inc. * Modified by Xianghua Xiao, X.Xiao at motorola.com
@@ -132,15 +132,26 @@ void config_8560_ioports (volatile ccsr_cpm_t * cpm)/* We run cpu_init_early_f in AS = 1 */ void cpu_init_early_f (void ) { +u32 mas0, mas1, mas2, mas3, mas7; +int i; +/* Pointer is writable since we allocated a register for it */ gd = (gd_t *) (CONFIG_SYS_INIT_RAM_ADDR +CONFIG_SYS_GBL_DATA_OFFSET ); -/* Clear initial global data */ -memset ((void *) gd,0 ,sizeof (gd_t)); +/* +* Clear initial global data +* we don't use memset so we can share this code with NAND_SPL +*/ +for (i =0 ; i <sizeof (gd_t); i++) + ((char *)gd)[i] =0 ; -set_tlb (0 ,CONFIG_SYS_CCSRBAR ,CONFIG_SYS_CCSRBAR_PHYS , -MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_I |MAS2_G , -1 ,0 ,BOOKE_PAGESZ_4K ,0 ); + mas0 =MAS0_TLBSEL (0 ) |MAS0_ESEL (0 ); + mas1 =MAS1_VALID |MAS1_TID (0 ) |MAS1_TS |MAS1_TSIZE (BOOKE_PAGESZ_4K ); + mas2 =FSL_BOOKE_MAS2 (CONFIG_SYS_CCSRBAR ,MAS2_I |MAS2_G ); + mas3 =FSL_BOOKE_MAS3 (CONFIG_SYS_CCSRBAR_PHYS ,0 ,MAS3_SW |MAS3_SR ); + mas7 =FSL_BOOKE_MAS7 (CONFIG_SYS_CCSRBAR_PHYS ); + +write_tlb (mas0, mas1, mas2, mas3, mas7);/* set up CCSR if we want it moved */ #if (CONFIG_SYS_CCSRBAR_DEFAULT !=CONFIG_SYS_CCSRBAR_PHYS )
@@ -149,9 +160,14 @@ void cpu_init_early_f(void)volatile u32 *ccsr_virt = (volatile u32 *)(CONFIG_SYS_CCSRBAR +0x1000 ); -set_tlb (0 , (u32 )ccsr_virt,CONFIG_SYS_CCSRBAR_DEFAULT , -MAS3_SX |MAS3_SW |MAS3_SR ,MAS2_I |MAS2_G , -1 ,1 ,BOOKE_PAGESZ_4K ,0 ); + mas0 =MAS0_TLBSEL (0 ) |MAS0_ESEL (1 ); +/* mas1 is the same as above */ + mas2 =FSL_BOOKE_MAS2 ((u32 )ccsr_virt,MAS2_I |MAS2_G ); + mas3 =FSL_BOOKE_MAS3 (CONFIG_SYS_CCSRBAR_DEFAULT ,0 , +MAS3_SW |MAS3_SR ); + mas7 =FSL_BOOKE_MAS7 (CONFIG_SYS_CCSRBAR_DEFAULT ); + +write_tlb (mas0, mas1, mas2, mas3, mas7); temp =in_be32 (ccsr_virt);out_be32 (ccsr_virt,CONFIG_SYS_CCSRBAR_PHYS >>12 );
Signature · 1 line
1.6.0.6
Kumar Gala
AppliedPATCH 1/2 ppc/85xx: Change cpu_init_early_f so we can use with NAND SPL
Quoted 7 lines · Kumar Gala
Use
write_tlband don't use memset so we can use the same code forcpu_init_early_fbetween NAND SPL and not.Signed-off-by Kumar Gala <[email protected]>---
cpu/mpc85xx/cpu_init.c| 34 +++++++++++++++++++++++++---------1 files changed, 25 insertions(+), 9 deletions(-)
applied to 85xx
- k
PATCH 2/2 ppc/85xx: Split out cpu_init_early into its own file for NAND_SPL
In reply to Kumar GalaBy pulling out cpu_init_early we can build just it and not all of cpu_init for NAND_SPL.
--- cpu/mpc85xx/Makefile | 1 + cpu/mpc85xx/cpu_init.c | 51 ---------------------------- cpu/mpc85xx/cpu_init_early.c | 76 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 77 insertions(+), 51 deletions(-) create mode 100644 cpu/mpc85xx/cpu_init_early.c
cpu/mpc85xx/Makefile +1 -0
@@ -65,6 +65,7 @@ COBJS-$(CONFIG_CPM2) += serial_scc.o COBJS = $(COBJS-y) COBJS += cpu.o COBJS += cpu_init.o +COBJS += cpu_init_early.o COBJS += interrupts.o COBJS += speed.o COBJS += tlb.o
cpu/mpc85xx/cpu_init.c +0 -51
57 lines not on this page · raw message
cpu/mpc85xx/cpu_init_early.c new file +76 -0
76 lines not on this page · raw message
Signature · 1 line
1.6.0.6
Kumar Gala
AppliedPATCH 2/2 ppc/85xx: Split out cpu_init_early into its own file for NAND_SPL
Quoted 11 lines · Kumar Gala
By pulling out
cpu_init_earlywe can build just it and not all ofcpu_initforNAND_SPL.Signed-off-by Kumar Gala <[email protected]>---
cpu/mpc85xx/Makefile | 1 + cpu/mpc85xx/cpu_init.c | 51 ---------------------------- cpu/mpc85xx/cpu_init_early.c | 76 +++++++++++++++++++++++++++++++++ +++++++++ 3 files changed, 77 insertions(+), 51 deletions(-)create mode 100644
cpu/mpc85xx/cpu_init_early.c
applied to 85xx
- k