diff --git a/arch/arm/src/armv7-a/Kconfig b/arch/arm/src/armv7-a/Kconfig
index b612009b74..5f2b3fdecc 100644
--- a/arch/arm/src/armv7-a/Kconfig
+++ b/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/arch/arm/src/armv7-a/l2cc_pl310.h b/arch/arm/src/armv7-a/l2cc_pl310.h
index 81d65d1e64..164fa77aaa 100644
--- a/arch/arm/src/armv7-a/l2cc_pl310.h
+++ b/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 */