-----Original Message----- From: Samuel Mescoff [mailto:samuel.mescoff@mobile-devices.fr] Sent: 2016年2月16日 0:54 To: u-boot@lists.denx.de Cc: Samuel Mescoff samuel.mescoff@mobile-devices.fr; andreas.devel@googlemail.com; Yang, Wenyou Wenyou.Yang@atmel.com; Ferre, Nicolas Nicolas.FERRE@atmel.com Subject: [U-Boot] [PATCH] ARM: at91: sama5d2: configure the L2 cache memory
The SAMA5D2 has a second internal SRAM that can be reassigned as a L2 cache memory. Make sure it is configured as a L2 cache memory when booting from a SPL image.
Based on the commit b5ea95ef2b5b from the at91bootstrap repository.
Signed-off-by: Samuel Mescoff samuel.mescoff@mobile-devices.fr
arch/arm/mach-at91/atmel_sfr.c | 9 +++++++++ arch/arm/mach-at91/include/mach/at91_common.h | 3 +++ arch/arm/mach-at91/include/mach/sama5_sfr.h | 3 +++ arch/arm/mach-at91/spl_atmel.c | 4 ++++ 4 files changed, 19 insertions(+)
diff --git a/arch/arm/mach-at91/atmel_sfr.c b/arch/arm/mach-at91/atmel_sfr.c index 2bccb84..71aa643 100644 --- a/arch/arm/mach-at91/atmel_sfr.c +++ b/arch/arm/mach-at91/atmel_sfr.c @@ -19,3 +19,12 @@ void redirect_int_from_saic_to_aic(void) writel((key32 | ATMEL_SFR_AICREDIR_NSAIC), &sfr->aicredir); } }
+#ifdef CONFIG_SAMA5D2 +void configure_2nd_sram_as_l2_cache(void) +{
- struct atmel_sfr *sfr = (struct atmel_sfr *)ATMEL_BASE_SFR;
- writel(1, &sfr->l2cc_hramc);
+} +#endif
This #ifdef ... #endif can be removed.
diff --git a/arch/arm/mach-at91/include/mach/at91_common.h b/arch/arm/mach- at91/include/mach/at91_common.h index efcd74e..0967ce7 100644 --- a/arch/arm/mach-at91/include/mach/at91_common.h +++ b/arch/arm/mach-at91/include/mach/at91_common.h @@ -34,5 +34,8 @@ void at91_spl_board_init(void); void at91_disable_wdt(void); void matrix_init(void); void redirect_int_from_saic_to_aic(void); +#ifdef CONFIG_SAMA5D2 +void configure_2nd_sram_as_l2_cache(void); +#endif
#endif /* AT91_COMMON_H */ diff --git a/arch/arm/mach-at91/include/mach/sama5_sfr.h b/arch/arm/mach- at91/include/mach/sama5_sfr.h index 7b19a20..ec2c216 100644 --- a/arch/arm/mach-at91/include/mach/sama5_sfr.h +++ b/arch/arm/mach-at91/include/mach/sama5_sfr.h @@ -25,6 +25,9 @@ struct atmel_sfr { u32 sn0; /* 0x4c */ u32 sn1; /* 0x50 */ u32 aicredir; /* 0x54 */ +#ifdef CONFIG_SAMA5D2
- u32 l2cc_hramc; /* 0x58 */
+#endif
Ditto.
};
/* Bit field in DDRCFG */ diff --git a/arch/arm/mach-at91/spl_atmel.c b/arch/arm/mach-at91/spl_atmel.c index b2fb51d..688289e 100644 --- a/arch/arm/mach-at91/spl_atmel.c +++ b/arch/arm/mach-at91/spl_atmel.c @@ -79,6 +79,10 @@ void board_init_f(ulong dummy) { switch_to_main_crystal_osc();
+#ifdef CONFIG_SAMA5D2
- configure_2nd_sram_as_l2_cache();
+#endif
- /* disable watchdog */ at91_disable_wdt();
-- 2.5.0
Best Regards, Wenyou Yang