From 99fc33dd6ebac5bfdbd8b82360ed03758861f199 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Fri, 25 Jul 2014 19:46:09 -0600 Subject: ARMv7-A: L2CC PL310 address filtering is an optional feature --- nuttx/arch/arm/src/armv7-a/Kconfig | 4 ++++ nuttx/arch/arm/src/armv7-a/l2cc_pl310.h | 9 ++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'nuttx/arch') diff --git a/nuttx/arch/arm/src/armv7-a/Kconfig b/nuttx/arch/arm/src/armv7-a/Kconfig index b612009b7..5f2b3fdec 100644 --- a/nuttx/arch/arm/src/armv7-a/Kconfig +++ b/nuttx/arch/arm/src/armv7-a/Kconfig @@ -31,6 +31,10 @@ config PL310_LOCKDOWN_BY_LINE bool "PL310 Lockdown by Line" default n +config PL310_ADDRESS_FILTERING + bool "PL310 Address Filtering by Line" + default n + endif # ARMV7A_L2CC_PL310 choice diff --git a/nuttx/arch/arm/src/armv7-a/l2cc_pl310.h b/nuttx/arch/arm/src/armv7-a/l2cc_pl310.h index 81d65d1e6..164fa77aa 100644 --- a/nuttx/arch/arm/src/armv7-a/l2cc_pl310.h +++ b/nuttx/arch/arm/src/armv7-a/l2cc_pl310.h @@ -447,12 +447,15 @@ /* Address filter start */ -#define L2CC_FLSTRT_ENABLE (1 << 0) /* Bit 0: Address filter enable */ -#define L2CC_FLSTRT_MASK (0xfff00000) /* Bits 20-31: Bits 20-31 of address mask */ +#ifdef PL310_ADDRESS_FILTERING +# define L2CC_FLSTRT_ENABLE (1 << 0) /* Bit 0: Address filter enable */ +# define L2CC_FLSTRT_MASK (0xfff00000) /* Bits 20-31: Bits 20-31 of address mask */ /* Address filter end */ -#define L2CC_FLEND_MASK (0xfff00000) /* Bits 20-31: Bits 20-31 of address mask */ +#ifdef PL310_ADDRESS_FILTERING +# define L2CC_FLEND_MASK (0xfff00000) /* Bits 20-31: Bits 20-31 of address mask */ +#endif /* Debug Control Register */ -- cgit v1.2.3