diff --git a/configs/sabre-6quad/nsh/defconfig b/configs/sabre-6quad/nsh/defconfig
index fec179abe42..8c0060774d3 100644
--- a/configs/sabre-6quad/nsh/defconfig
+++ b/configs/sabre-6quad/nsh/defconfig
@@ -126,8 +126,6 @@ CONFIG_ARCH_HAVE_FPU=y
 CONFIG_ARCH_FPU=y
 CONFIG_ARCH_HAVE_TRUSTZONE=y
 CONFIG_ARCH_TRUSTZONE_SECURE=y
-# CONFIG_ARCH_TRUSTZONE_NONSECURE is not set
-# CONFIG_ARCH_TRUSTZONE_BOTH is not set
 # CONFIG_ARM_HAVE_MPU_UNIFIED is not set
 CONFIG_ARCH_HAVE_LOWVECTORS=y
 CONFIG_ARCH_LOWVECTORS=y
@@ -136,7 +134,7 @@ CONFIG_ARCH_LOWVECTORS=y
 #
 # ARMv7-A Configuration Options
 #
-CONFIG_ARMV7A_HAVE_GIC=y
+CONFIG_ARMV7A_HAVE_GICv2=y
 CONFIG_ARMV7A_HAVE_GTM=y
 CONFIG_ARMV7A_HAVE_PTM=y
 CONFIG_ARMV7A_HAVE_L2CC=y
diff --git a/configs/sama5d2-xult/nsh/defconfig b/configs/sama5d2-xult/nsh/defconfig
index b97151bc618..a3ce33bba3f 100644
--- a/configs/sama5d2-xult/nsh/defconfig
+++ b/configs/sama5d2-xult/nsh/defconfig
@@ -130,7 +130,7 @@ CONFIG_ARCH_LOWVECTORS=y
 #
 # ARMv7-A Configuration Options
 #
-# CONFIG_ARMV7A_HAVE_GIC is not set
+# CONFIG_ARMV7A_HAVE_GICv2 is not set
 CONFIG_ARMV7A_HAVE_L2CC=y
 CONFIG_ARMV7A_HAVE_L2CC_PL310=y
 
diff --git a/configs/sama5d3-xplained/bridge/defconfig b/configs/sama5d3-xplained/bridge/defconfig
index 6aa5cb6550e..06e9e896759 100644
--- a/configs/sama5d3-xplained/bridge/defconfig
+++ b/configs/sama5d3-xplained/bridge/defconfig
@@ -130,7 +130,7 @@ CONFIG_ARCH_LOWVECTORS=y
 #
 # ARMv7-A Configuration Options
 #
-# CONFIG_ARMV7A_HAVE_GIC is not set
+# CONFIG_ARMV7A_HAVE_GICv2 is not set
 # CONFIG_ARMV7A_HAVE_L2CC is not set
 # CONFIG_ARMV7A_HAVE_L2CC_PL310 is not set
 # CONFIG_ARMV7A_TOOLCHAIN_BUILDROOT is not set
diff --git a/configs/sama5d3-xplained/nsh/defconfig b/configs/sama5d3-xplained/nsh/defconfig
index 3f568c0c7cb..8e340f2eb91 100644
--- a/configs/sama5d3-xplained/nsh/defconfig
+++ b/configs/sama5d3-xplained/nsh/defconfig
@@ -130,7 +130,7 @@ CONFIG_ARCH_LOWVECTORS=y
 #
 # ARMv7-A Configuration Options
 #
-# CONFIG_ARMV7A_HAVE_GIC is not set
+# CONFIG_ARMV7A_HAVE_GICv2 is not set
 # CONFIG_ARMV7A_HAVE_L2CC is not set
 # CONFIG_ARMV7A_HAVE_L2CC_PL310 is not set
 # CONFIG_ARMV7A_TOOLCHAIN_BUILDROOT is not set
diff --git a/configs/sama5d3x-ek/demo/defconfig b/configs/sama5d3x-ek/demo/defconfig
index a90b6d4fe83..5ef90b33422 100644
--- a/configs/sama5d3x-ek/demo/defconfig
+++ b/configs/sama5d3x-ek/demo/defconfig
@@ -130,7 +130,7 @@ CONFIG_ARCH_LOWVECTORS=y
 #
 # ARMv7-A Configuration Options
 #
-# CONFIG_ARMV7A_HAVE_GIC is not set
+# CONFIG_ARMV7A_HAVE_GICv2 is not set
 # CONFIG_ARMV7A_HAVE_L2CC is not set
 # CONFIG_ARMV7A_HAVE_L2CC_PL310 is not set
 # CONFIG_ARMV7A_TOOLCHAIN_BUILDROOT is not set
diff --git a/configs/sama5d3x-ek/hello/defconfig b/configs/sama5d3x-ek/hello/defconfig
index be15f24c050..722502c798c 100644
--- a/configs/sama5d3x-ek/hello/defconfig
+++ b/configs/sama5d3x-ek/hello/defconfig
@@ -130,7 +130,7 @@ CONFIG_ARCH_LOWVECTORS=y
 #
 # ARMv7-A Configuration Options
 #
-# CONFIG_ARMV7A_HAVE_GIC is not set
+# CONFIG_ARMV7A_HAVE_GICv2 is not set
 # CONFIG_ARMV7A_HAVE_L2CC is not set
 # CONFIG_ARMV7A_HAVE_L2CC_PL310 is not set
 # CONFIG_ARMV7A_TOOLCHAIN_BUILDROOT is not set
diff --git a/configs/sama5d3x-ek/norboot/defconfig b/configs/sama5d3x-ek/norboot/defconfig
index 05e24d4f567..79f13000811 100644
--- a/configs/sama5d3x-ek/norboot/defconfig
+++ b/configs/sama5d3x-ek/norboot/defconfig
@@ -130,7 +130,7 @@ CONFIG_ARCH_LOWVECTORS=y
 #
 # ARMv7-A Configuration Options
 #
-# CONFIG_ARMV7A_HAVE_GIC is not set
+# CONFIG_ARMV7A_HAVE_GICv2 is not set
 # CONFIG_ARMV7A_HAVE_L2CC is not set
 # CONFIG_ARMV7A_HAVE_L2CC_PL310 is not set
 # CONFIG_ARMV7A_TOOLCHAIN_BUILDROOT is not set
diff --git a/configs/sama5d3x-ek/nsh/defconfig b/configs/sama5d3x-ek/nsh/defconfig
index 6cbc70b043f..2cc5628f813 100644
--- a/configs/sama5d3x-ek/nsh/defconfig
+++ b/configs/sama5d3x-ek/nsh/defconfig
@@ -130,7 +130,7 @@ CONFIG_ARCH_LOWVECTORS=y
 #
 # ARMv7-A Configuration Options
 #
-# CONFIG_ARMV7A_HAVE_GIC is not set
+# CONFIG_ARMV7A_HAVE_GICv2 is not set
 # CONFIG_ARMV7A_HAVE_L2CC is not set
 # CONFIG_ARMV7A_HAVE_L2CC_PL310 is not set
 # CONFIG_ARMV7A_TOOLCHAIN_BUILDROOT is not set
diff --git a/configs/sama5d3x-ek/nx/defconfig b/configs/sama5d3x-ek/nx/defconfig
index 4ce3f4c88cf..a29ba1ff144 100644
--- a/configs/sama5d3x-ek/nx/defconfig
+++ b/configs/sama5d3x-ek/nx/defconfig
@@ -130,7 +130,7 @@ CONFIG_ARCH_LOWVECTORS=y
 #
 # ARMv7-A Configuration Options
 #
-# CONFIG_ARMV7A_HAVE_GIC is not set
+# CONFIG_ARMV7A_HAVE_GICv2 is not set
 # CONFIG_ARMV7A_HAVE_L2CC is not set
 # CONFIG_ARMV7A_HAVE_L2CC_PL310 is not set
 # CONFIG_ARMV7A_TOOLCHAIN_BUILDROOT is not set
diff --git a/configs/sama5d3x-ek/nxplayer/defconfig b/configs/sama5d3x-ek/nxplayer/defconfig
index a7a5d69ea10..68641af3614 100644
--- a/configs/sama5d3x-ek/nxplayer/defconfig
+++ b/configs/sama5d3x-ek/nxplayer/defconfig
@@ -130,7 +130,7 @@ CONFIG_ARCH_LOWVECTORS=y
 #
 # ARMv7-A Configuration Options
 #
-# CONFIG_ARMV7A_HAVE_GIC is not set
+# CONFIG_ARMV7A_HAVE_GICv2 is not set
 # CONFIG_ARMV7A_HAVE_L2CC is not set
 # CONFIG_ARMV7A_HAVE_L2CC_PL310 is not set
 # CONFIG_ARMV7A_TOOLCHAIN_BUILDROOT is not set
diff --git a/configs/sama5d3x-ek/nxwm/defconfig b/configs/sama5d3x-ek/nxwm/defconfig
index 1318968f21b..3cef1d601a1 100644
--- a/configs/sama5d3x-ek/nxwm/defconfig
+++ b/configs/sama5d3x-ek/nxwm/defconfig
@@ -130,7 +130,7 @@ CONFIG_ARCH_LOWVECTORS=y
 #
 # ARMv7-A Configuration Options
 #
-# CONFIG_ARMV7A_HAVE_GIC is not set
+# CONFIG_ARMV7A_HAVE_GICv2 is not set
 # CONFIG_ARMV7A_HAVE_L2CC is not set
 # CONFIG_ARMV7A_HAVE_L2CC_PL310 is not set
 # CONFIG_ARMV7A_TOOLCHAIN_BUILDROOT is not set
diff --git a/configs/sama5d3x-ek/ov2640/defconfig b/configs/sama5d3x-ek/ov2640/defconfig
index 01eeb44d403..87c629c94f2 100644
--- a/configs/sama5d3x-ek/ov2640/defconfig
+++ b/configs/sama5d3x-ek/ov2640/defconfig
@@ -130,7 +130,7 @@ CONFIG_ARCH_LOWVECTORS=y
 #
 # ARMv7-A Configuration Options
 #
-# CONFIG_ARMV7A_HAVE_GIC is not set
+# CONFIG_ARMV7A_HAVE_GICv2 is not set
 # CONFIG_ARMV7A_HAVE_L2CC is not set
 # CONFIG_ARMV7A_HAVE_L2CC_PL310 is not set
 # CONFIG_ARMV7A_TOOLCHAIN_BUILDROOT is not set
diff --git a/configs/sama5d4-ek/at25boot/defconfig b/configs/sama5d4-ek/at25boot/defconfig
index 85706d098a8..906c3ebd1a1 100644
--- a/configs/sama5d4-ek/at25boot/defconfig
+++ b/configs/sama5d4-ek/at25boot/defconfig
@@ -130,7 +130,7 @@ CONFIG_ARCH_LOWVECTORS=y
 #
 # ARMv7-A Configuration Options
 #
-# CONFIG_ARMV7A_HAVE_GIC is not set
+# CONFIG_ARMV7A_HAVE_GICv2 is not set
 CONFIG_ARMV7A_HAVE_L2CC=y
 CONFIG_ARMV7A_HAVE_L2CC_PL310=y
 
diff --git a/configs/sama5d4-ek/bridge/defconfig b/configs/sama5d4-ek/bridge/defconfig
index e8419e4f38d..5154ab0ed8c 100644
--- a/configs/sama5d4-ek/bridge/defconfig
+++ b/configs/sama5d4-ek/bridge/defconfig
@@ -130,7 +130,7 @@ CONFIG_ARCH_LOWVECTORS=y
 #
 # ARMv7-A Configuration Options
 #
-# CONFIG_ARMV7A_HAVE_GIC is not set
+# CONFIG_ARMV7A_HAVE_GICv2 is not set
 CONFIG_ARMV7A_HAVE_L2CC=y
 CONFIG_ARMV7A_HAVE_L2CC_PL310=y
 
diff --git a/configs/sama5d4-ek/dramboot/defconfig b/configs/sama5d4-ek/dramboot/defconfig
index 01c7b28870f..94a63499bde 100644
--- a/configs/sama5d4-ek/dramboot/defconfig
+++ b/configs/sama5d4-ek/dramboot/defconfig
@@ -130,7 +130,7 @@ CONFIG_ARCH_LOWVECTORS=y
 #
 # ARMv7-A Configuration Options
 #
-# CONFIG_ARMV7A_HAVE_GIC is not set
+# CONFIG_ARMV7A_HAVE_GICv2 is not set
 CONFIG_ARMV7A_HAVE_L2CC=y
 CONFIG_ARMV7A_HAVE_L2CC_PL310=y
 
diff --git a/configs/sama5d4-ek/elf/defconfig b/configs/sama5d4-ek/elf/defconfig
index b6ef38039ff..91324988ffb 100644
--- a/configs/sama5d4-ek/elf/defconfig
+++ b/configs/sama5d4-ek/elf/defconfig
@@ -132,7 +132,7 @@ CONFIG_ARCH_LOWVECTORS=y
 #
 # ARMv7-A Configuration Options
 #
-# CONFIG_ARMV7A_HAVE_GIC is not set
+# CONFIG_ARMV7A_HAVE_GICv2 is not set
 CONFIG_ARMV7A_HAVE_L2CC=y
 CONFIG_ARMV7A_HAVE_L2CC_PL310=y
 
diff --git a/configs/sama5d4-ek/ipv6/defconfig b/configs/sama5d4-ek/ipv6/defconfig
index 15a1be28a55..d2921e87e1e 100644
--- a/configs/sama5d4-ek/ipv6/defconfig
+++ b/configs/sama5d4-ek/ipv6/defconfig
@@ -130,7 +130,7 @@ CONFIG_ARCH_LOWVECTORS=y
 #
 # ARMv7-A Configuration Options
 #
-# CONFIG_ARMV7A_HAVE_GIC is not set
+# CONFIG_ARMV7A_HAVE_GICv2 is not set
 CONFIG_ARMV7A_HAVE_L2CC=y
 CONFIG_ARMV7A_HAVE_L2CC_PL310=y
 
diff --git a/configs/sama5d4-ek/knsh/defconfig b/configs/sama5d4-ek/knsh/defconfig
index 1b3b9316982..40a8696bae3 100644
--- a/configs/sama5d4-ek/knsh/defconfig
+++ b/configs/sama5d4-ek/knsh/defconfig
@@ -131,7 +131,7 @@ CONFIG_ARCH_LOWVECTORS=y
 #
 # ARMv7-A Configuration Options
 #
-# CONFIG_ARMV7A_HAVE_GIC is not set
+# CONFIG_ARMV7A_HAVE_GICv2 is not set
 CONFIG_ARMV7A_HAVE_L2CC=y
 CONFIG_ARMV7A_HAVE_L2CC_PL310=y
 
diff --git a/configs/sama5d4-ek/nsh/defconfig b/configs/sama5d4-ek/nsh/defconfig
index 79f6c587219..f30a4ceece7 100644
--- a/configs/sama5d4-ek/nsh/defconfig
+++ b/configs/sama5d4-ek/nsh/defconfig
@@ -130,7 +130,7 @@ CONFIG_ARCH_LOWVECTORS=y
 #
 # ARMv7-A Configuration Options
 #
-# CONFIG_ARMV7A_HAVE_GIC is not set
+# CONFIG_ARMV7A_HAVE_GICv2 is not set
 CONFIG_ARMV7A_HAVE_L2CC=y
 CONFIG_ARMV7A_HAVE_L2CC_PL310=y
 
diff --git a/configs/sama5d4-ek/nxwm/defconfig b/configs/sama5d4-ek/nxwm/defconfig
index 4e0fc99c37c..eed6b027d90 100644
--- a/configs/sama5d4-ek/nxwm/defconfig
+++ b/configs/sama5d4-ek/nxwm/defconfig
@@ -130,7 +130,7 @@ CONFIG_ARCH_LOWVECTORS=y
 #
 # ARMv7-A Configuration Options
 #
-# CONFIG_ARMV7A_HAVE_GIC is not set
+# CONFIG_ARMV7A_HAVE_GICv2 is not set
 CONFIG_ARMV7A_HAVE_L2CC=y
 CONFIG_ARMV7A_HAVE_L2CC_PL310=y
 
diff --git a/configs/sama5d4-ek/ramtest/defconfig b/configs/sama5d4-ek/ramtest/defconfig
index 46b7e72bb12..eec5920b6d6 100644
--- a/configs/sama5d4-ek/ramtest/defconfig
+++ b/configs/sama5d4-ek/ramtest/defconfig
@@ -130,7 +130,7 @@ CONFIG_ARCH_LOWVECTORS=y
 #
 # ARMv7-A Configuration Options
 #
-# CONFIG_ARMV7A_HAVE_GIC is not set
+# CONFIG_ARMV7A_HAVE_GICv2 is not set
 CONFIG_ARMV7A_HAVE_L2CC=y
 CONFIG_ARMV7A_HAVE_L2CC_PL310=y