armv8: fsl: ifc: Put IFC related code under CONFIG_FSL_IFC
PATCH 1/1 armv8: fsl: ifc: Put IFC related code under CONFIG_FSL_IFC
IFC code is put under CONFIG_FSL_IFC
Signed-off-by Sriram Dash <[email protected]>
--- arch/arm/cpu/armv8/fsl-layerscape/soc.c | 2 ++ arch/arm/include/asm/arch-fsl-layerscape/cpu.h | 10 ++++++++++ 2 files changed, 12 insertions(+)
arch/arm/cpu/armv8/fsl-layerscape/soc.c +2 -0
@@ -192,7 +192,9 @@ void bypass_smmu(void)void fsl_lsch3_early_init_f (void ) {erratum_rcw_src (); +#ifdef CONFIG_FSL_IFC init_early_memctl_regs ();/* tighten IFC timing */ +#endif #ifdef CONFIG_SYS_FSL_ERRATUM_A009203 erratum_a009203 ();#endif
arch/arm/include/asm/arch-fsl-layerscape/cpu.h +10 -0
@@ -102,6 +102,7 @@ static struct mm_region early_map[] = { {CONFIG_SYS_FSL_QSPI_BASE1 ,CONFIG_SYS_FSL_QSPI_BASE1 ,CONFIG_SYS_FSL_QSPI_SIZE1 , PTE_BLOCK_MEMTYPE(MT_NORMAL) | PTE_BLOCK_NON_SHARE}, +#ifdef CONFIG_FSL_IFC /* For IFC Region #1, only the first 4MB is cache-enabled */ { CONFIG_SYS_FSL_IFC_BASE1, CONFIG_SYS_FSL_IFC_BASE1, CONFIG_SYS_FSL_IFC_SIZE1_1,
@@ -116,6 +117,7 @@ static struct mm_region early_map[] = { CONFIG_SYS_FSL_IFC_SIZE1, PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | PTE_BLOCK_NON_SHARE }, +#endif { CONFIG_SYS_FSL_DRAM_BASE1, CONFIG_SYS_FSL_DRAM_BASE1, CONFIG_SYS_FSL_DRAM_SIZE1, #if defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD)
@@ -125,11 +127,13 @@ static struct mm_region early_map[] = {#endif PTE_BLOCK_OUTER_SHARE | PTE_BLOCK_NS }, +#ifdef CONFIG_FSL_IFC /* Map IFC region #2 up to CONFIG_SYS_FLASH_BASE for NAND boot */ {CONFIG_SYS_FSL_IFC_BASE2 ,CONFIG_SYS_FSL_IFC_BASE2 ,CONFIG_SYS_FLASH_BASE -CONFIG_SYS_FSL_IFC_BASE2 ,PTE_BLOCK_MEMTYPE (MT_DEVICE_NGNRNE ) |PTE_BLOCK_NON_SHARE }, +#endif { CONFIG_SYS_FSL_DCSR_BASE, CONFIG_SYS_FSL_DCSR_BASE,CONFIG_SYS_FSL_DCSR_SIZE , PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
@@ -159,10 +163,12 @@ static struct mm_region early_map[] = { CONFIG_SYS_FSL_QSPI_SIZE, PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | PTE_BLOCK_NON_SHARE }, +#ifdef CONFIG_FSL_IFC {CONFIG_SYS_FSL_IFC_BASE ,CONFIG_SYS_FSL_IFC_BASE ,CONFIG_SYS_FSL_IFC_SIZE ,PTE_BLOCK_MEMTYPE (MT_DEVICE_NGNRNE ) |PTE_BLOCK_NON_SHARE }, +#endif { CONFIG_SYS_FSL_DRAM_BASE1, CONFIG_SYS_FSL_DRAM_BASE1,CONFIG_SYS_FSL_DRAM_SIZE1 , #if defined(CONFIG_SPL) && !defined(CONFIG_SPL_BUILD)
@@ -206,10 +212,12 @@ static struct mm_region final_map[] = { PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN }, +#ifdef CONFIG_FSL_IFC {CONFIG_SYS_FSL_IFC_BASE2 ,CONFIG_SYS_FSL_IFC_BASE2 ,CONFIG_SYS_FSL_IFC_SIZE2 ,PTE_BLOCK_MEMTYPE (MT_DEVICE_NGNRNE ) |PTE_BLOCK_NON_SHARE }, +#endif { CONFIG_SYS_FSL_DCSR_BASE, CONFIG_SYS_FSL_DCSR_BASE,CONFIG_SYS_FSL_DCSR_SIZE , PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
@@ -304,10 +312,12 @@ static struct mm_region final_map[] = { PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) | PTE_BLOCK_NON_SHARE | PTE_BLOCK_PXN | PTE_BLOCK_UXN }, +#ifdef CONFIG_FSL_IFC {CONFIG_SYS_FSL_IFC_BASE ,CONFIG_SYS_FSL_IFC_BASE ,CONFIG_SYS_FSL_IFC_SIZE ,PTE_BLOCK_MEMTYPE (MT_DEVICE_NGNRNE ) |PTE_BLOCK_NON_SHARE }, +#endif { CONFIG_SYS_FSL_DRAM_BASE1, CONFIG_SYS_FSL_DRAM_BASE1,CONFIG_SYS_FSL_DRAM_SIZE1 , PTE_BLOCK_MEMTYPE(MT_NORMAL) |
Signature · 1 line
1.9.1
York Sun
AppliedPATCH 1/1 armv8: fsl: ifc: Put IFC related code under CONFIG_FSL_IFC
Quoted 4 lines · Sriram Dash
IFC code is put under
CONFIG_FSL_IFCSigned-off-by Sriram Dash <[email protected]>---
Applied to fsl-qoriq mater. Thanks.
York