powerpc/mpc85xx:No NOR boot, do not compile IFC errata A003399
PATCH 1/5 powerpc/mpc85xx:No NOR boot, do not compile IFC errata A003399
IFC errata A003399 is valid for IFC NOR boot i.e.if no on-board NOR flash or no NOR boot, do not compile its workaround.
Signed-off-by Prabhakar Kushwaha <[email protected]>
---
Based upon git://git.denx.de/u-boot.git branch master
arch/powerpc/cpu/mpc85xx/cpu_init_early.c | 12 +++++++++--- arch/powerpc/cpu/mpc8xxx/fsl_ifc.c | 7 ++++++- 2 files changed, 15 insertions(+), 4 deletions(-)
arch/powerpc/cpu/mpc85xx/cpu_init_early.c +9 -3
@@ -25,7 +25,11 @@DECLARE_GLOBAL_DATA_PTR ; -#if defined(CONFIG_SYS_FSL_ERRATUM_IFC_A003399 ) && !defined(CONFIG_SYS_RAMBOOT ) +#if !defined(CONFIG_SPL ) && !defined(CONFIG_SYS_RAMBOOT ) && !defined(CONFIG_SECURE_BOOT ) +#define NOR_BOOT +#endif + +#if defined(CONFIG_SYS_FSL_ERRATUM_IFC_A003399 ) && defined(NOR_BOOT )void setup_ifc (void ) {struct fsl_ifc *ifc_regs = (void *)CONFIG_SYS_IFC_ADDR ;
@@ -99,7 +103,8 @@ void cpu_init_early_f(void)#ifdef CONFIG_SYS_FSL_ERRATUM_P1010_A003549 ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);#endif -#if defined(CONFIG_SYS_FSL_ERRATUM_IFC_A003399 ) && !defined(CONFIG_SYS_RAMBOOT ) +#if defined(CONFIG_SYS_FSL_ERRATUM_IFC_A003399 ) && !defined(CONFIG_SYS_RAMBOOT )\ + && defined(NOR_BOOT ) && !defined(CONFIG_SYS_NO_FLASH )ccsr_l2cache_t *l2cache = (void *)CONFIG_SYS_MPC85xx_L2_ADDR;u32 *dst, *src;void (*setup_ifc_sram)(void );
@@ -138,7 +143,8 @@ void cpu_init_early_f(void)* Work Around for IFC Erratum A003399, issue will hit only when execution * from NOR Flash */ -#if defined(CONFIG_SYS_FSL_ERRATUM_IFC_A003399 ) && !defined(CONFIG_SYS_RAMBOOT ) +#if defined(CONFIG_SYS_FSL_ERRATUM_IFC_A003399 ) && !defined(CONFIG_SYS_RAMBOOT )\ + && defined(NOR_BOOT ) && !defined(CONFIG_SYS_NO_FLASH )#define SRAM_BASE_ADDR (0x00000000)/* TLB for SRAM */ mas0 =MAS0_TLBSEL (1 ) |MAS0_ESEL (9 );
arch/powerpc/cpu/mpc8xxx/fsl_ifc.c +6 -1
@@ -35,6 +35,10 @@ void print_ifc_regs(void) } } +#if !defined(CONFIG_SPL ) && !defined(CONFIG_SYS_RAMBOOT ) && !defined(CONFIG_SECURE_BOOT ) +#define NOR_BOOT +#endif +void init_early_memctl_regs (void ) {#if defined(CONFIG_SYS_CSPR0 ) && defined(CONFIG_SYS_CSOR0 )
@@ -43,7 +47,8 @@ void init_early_memctl_regs(void)set_ifc_ftim (IFC_CS0 ,IFC_FTIM2 ,CONFIG_SYS_CS0_FTIM2 );set_ifc_ftim (IFC_CS0 ,IFC_FTIM3 ,CONFIG_SYS_CS0_FTIM3 ); -#if !defined(CONFIG_SYS_FSL_ERRATUM_IFC_A003399 ) || defined(CONFIG_SYS_RAMBOOT ) +#if !defined(CONFIG_SYS_FSL_ERRATUM_IFC_A003399 ) || defined(CONFIG_SYS_RAMBOOT )\ + || !defined(NOR_BOOT ) || !defined(CONFIG_SPL_BUILD )#ifdef CONFIG_SYS_CSPR0_EXT set_ifc_cspr_ext (IFC_CS0 ,CONFIG_SYS_CSPR0_EXT );#endif
Signature · 1 line
1.7.9.5