diff --git a/configs/sama5d2-xult/nsh/defconfig b/configs/sama5d2-xult/nsh/defconfig
index 0b7f059c764..b97151bc618 100644
--- a/configs/sama5d2-xult/nsh/defconfig
+++ b/configs/sama5d2-xult/nsh/defconfig
@@ -189,7 +189,7 @@ CONFIG_SAMA5_HAVE_SPI2=y
 # CONFIG_SAMA5_HAVE_TC is not set
 CONFIG_SAMA5_HAVE_TC1=y
 # CONFIG_SAMA5_HAVE_TC2 is not set
-CONFIG_SAMA5_HAVE_TRUSTZONE=y
+CONFIG_ARCH_HAVE_TRUSTZONE=y
 # CONFIG_SAMA5_HAVE_TWI3 is not set
 # CONFIG_SAMA5_HAVE_VDEC is not set
 CONFIG_SAMA5_FLEXCOM=y
diff --git a/configs/sama5d3-xplained/bridge/defconfig b/configs/sama5d3-xplained/bridge/defconfig
index b4b83562385..6aa5cb6550e 100644
--- a/configs/sama5d3-xplained/bridge/defconfig
+++ b/configs/sama5d3-xplained/bridge/defconfig
@@ -182,7 +182,7 @@ CONFIG_SAMA5_HAVE_PIOE=y
 # CONFIG_SAMA5_HAVE_TC is not set
 CONFIG_SAMA5_HAVE_TC1=y
 # CONFIG_SAMA5_HAVE_TC2 is not set
-# CONFIG_SAMA5_HAVE_TRUSTZONE is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
 # CONFIG_SAMA5_HAVE_TWI3 is not set
 # CONFIG_SAMA5_HAVE_VDEC is not set
 # CONFIG_SAMA5_FLEXCOM is not set
diff --git a/configs/sama5d3-xplained/nsh/defconfig b/configs/sama5d3-xplained/nsh/defconfig
index 1983090df06..3f568c0c7cb 100644
--- a/configs/sama5d3-xplained/nsh/defconfig
+++ b/configs/sama5d3-xplained/nsh/defconfig
@@ -181,7 +181,7 @@ CONFIG_SAMA5_HAVE_PIOE=y
 # CONFIG_SAMA5_HAVE_TC is not set
 CONFIG_SAMA5_HAVE_TC1=y
 # CONFIG_SAMA5_HAVE_TC2 is not set
-# CONFIG_SAMA5_HAVE_TRUSTZONE is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
 # CONFIG_SAMA5_HAVE_TWI3 is not set
 # CONFIG_SAMA5_HAVE_VDEC is not set
 # CONFIG_SAMA5_FLEXCOM is not set
diff --git a/configs/sama5d3x-ek/demo/defconfig b/configs/sama5d3x-ek/demo/defconfig
index ee436450676..a90b6d4fe83 100644
--- a/configs/sama5d3x-ek/demo/defconfig
+++ b/configs/sama5d3x-ek/demo/defconfig
@@ -187,7 +187,7 @@ CONFIG_SAMA5_HAVE_PIOE=y
 # CONFIG_SAMA5_HAVE_TC is not set
 # CONFIG_SAMA5_HAVE_TC1 is not set
 # CONFIG_SAMA5_HAVE_TC2 is not set
-# CONFIG_SAMA5_HAVE_TRUSTZONE is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
 # CONFIG_SAMA5_HAVE_TWI3 is not set
 # CONFIG_SAMA5_HAVE_VDEC is not set
 # CONFIG_SAMA5_FLEXCOM is not set
diff --git a/configs/sama5d3x-ek/hello/defconfig b/configs/sama5d3x-ek/hello/defconfig
index f8cb679a055..be15f24c050 100644
--- a/configs/sama5d3x-ek/hello/defconfig
+++ b/configs/sama5d3x-ek/hello/defconfig
@@ -182,7 +182,7 @@ CONFIG_SAMA5_HAVE_PIOE=y
 # CONFIG_SAMA5_HAVE_TC is not set
 # CONFIG_SAMA5_HAVE_TC1 is not set
 # CONFIG_SAMA5_HAVE_TC2 is not set
-# CONFIG_SAMA5_HAVE_TRUSTZONE is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
 # CONFIG_SAMA5_HAVE_TWI3 is not set
 # CONFIG_SAMA5_HAVE_VDEC is not set
 # CONFIG_SAMA5_FLEXCOM is not set
diff --git a/configs/sama5d3x-ek/norboot/defconfig b/configs/sama5d3x-ek/norboot/defconfig
index 69e9b103724..05e24d4f567 100644
--- a/configs/sama5d3x-ek/norboot/defconfig
+++ b/configs/sama5d3x-ek/norboot/defconfig
@@ -182,7 +182,7 @@ CONFIG_SAMA5_HAVE_PIOE=y
 # CONFIG_SAMA5_HAVE_TC is not set
 # CONFIG_SAMA5_HAVE_TC1 is not set
 # CONFIG_SAMA5_HAVE_TC2 is not set
-# CONFIG_SAMA5_HAVE_TRUSTZONE is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
 # CONFIG_SAMA5_HAVE_TWI3 is not set
 # CONFIG_SAMA5_HAVE_VDEC is not set
 # CONFIG_SAMA5_FLEXCOM is not set
diff --git a/configs/sama5d3x-ek/nsh/defconfig b/configs/sama5d3x-ek/nsh/defconfig
index 9197be42f5c..6cbc70b043f 100644
--- a/configs/sama5d3x-ek/nsh/defconfig
+++ b/configs/sama5d3x-ek/nsh/defconfig
@@ -182,7 +182,7 @@ CONFIG_SAMA5_HAVE_PIOE=y
 # CONFIG_SAMA5_HAVE_TC is not set
 # CONFIG_SAMA5_HAVE_TC1 is not set
 # CONFIG_SAMA5_HAVE_TC2 is not set
-# CONFIG_SAMA5_HAVE_TRUSTZONE is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
 # CONFIG_SAMA5_HAVE_TWI3 is not set
 # CONFIG_SAMA5_HAVE_VDEC is not set
 # CONFIG_SAMA5_FLEXCOM is not set
diff --git a/configs/sama5d3x-ek/nx/defconfig b/configs/sama5d3x-ek/nx/defconfig
index 55f2c22dd40..4ce3f4c88cf 100644
--- a/configs/sama5d3x-ek/nx/defconfig
+++ b/configs/sama5d3x-ek/nx/defconfig
@@ -182,7 +182,7 @@ CONFIG_SAMA5_HAVE_PIOE=y
 # CONFIG_SAMA5_HAVE_TC is not set
 # CONFIG_SAMA5_HAVE_TC1 is not set
 # CONFIG_SAMA5_HAVE_TC2 is not set
-# CONFIG_SAMA5_HAVE_TRUSTZONE is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
 # CONFIG_SAMA5_HAVE_TWI3 is not set
 # CONFIG_SAMA5_HAVE_VDEC is not set
 # CONFIG_SAMA5_FLEXCOM is not set
diff --git a/configs/sama5d3x-ek/nxplayer/defconfig b/configs/sama5d3x-ek/nxplayer/defconfig
index 83d2f761ef7..a7a5d69ea10 100644
--- a/configs/sama5d3x-ek/nxplayer/defconfig
+++ b/configs/sama5d3x-ek/nxplayer/defconfig
@@ -184,7 +184,7 @@ CONFIG_SAMA5_HAVE_PIOE=y
 # CONFIG_SAMA5_HAVE_TC is not set
 # CONFIG_SAMA5_HAVE_TC1 is not set
 # CONFIG_SAMA5_HAVE_TC2 is not set
-# CONFIG_SAMA5_HAVE_TRUSTZONE is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
 # CONFIG_SAMA5_HAVE_TWI3 is not set
 # CONFIG_SAMA5_HAVE_VDEC is not set
 # CONFIG_SAMA5_FLEXCOM is not set
diff --git a/configs/sama5d3x-ek/nxwm/defconfig b/configs/sama5d3x-ek/nxwm/defconfig
index 993d8daca5d..1318968f21b 100644
--- a/configs/sama5d3x-ek/nxwm/defconfig
+++ b/configs/sama5d3x-ek/nxwm/defconfig
@@ -182,7 +182,7 @@ CONFIG_SAMA5_HAVE_PIOE=y
 # CONFIG_SAMA5_HAVE_TC is not set
 # CONFIG_SAMA5_HAVE_TC1 is not set
 # CONFIG_SAMA5_HAVE_TC2 is not set
-# CONFIG_SAMA5_HAVE_TRUSTZONE is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
 # CONFIG_SAMA5_HAVE_TWI3 is not set
 # CONFIG_SAMA5_HAVE_VDEC is not set
 # CONFIG_SAMA5_FLEXCOM is not set
diff --git a/configs/sama5d3x-ek/ov2640/defconfig b/configs/sama5d3x-ek/ov2640/defconfig
index 99d5d0afb96..01eeb44d403 100644
--- a/configs/sama5d3x-ek/ov2640/defconfig
+++ b/configs/sama5d3x-ek/ov2640/defconfig
@@ -182,7 +182,7 @@ CONFIG_SAMA5_HAVE_PIOE=y
 # CONFIG_SAMA5_HAVE_TC is not set
 # CONFIG_SAMA5_HAVE_TC1 is not set
 # CONFIG_SAMA5_HAVE_TC2 is not set
-# CONFIG_SAMA5_HAVE_TRUSTZONE is not set
+# CONFIG_ARCH_HAVE_TRUSTZONE is not set
 # CONFIG_SAMA5_HAVE_TWI3 is not set
 # CONFIG_SAMA5_HAVE_VDEC is not set
 # CONFIG_SAMA5_FLEXCOM is not set
diff --git a/configs/sama5d4-ek/at25boot/defconfig b/configs/sama5d4-ek/at25boot/defconfig
index 82fe967683a..85706d098a8 100644
--- a/configs/sama5d4-ek/at25boot/defconfig
+++ b/configs/sama5d4-ek/at25boot/defconfig
@@ -186,7 +186,7 @@ CONFIG_SAMA5_HAVE_SPI2=y
 # CONFIG_SAMA5_HAVE_TC is not set
 CONFIG_SAMA5_HAVE_TC1=y
 CONFIG_SAMA5_HAVE_TC2=y
-CONFIG_SAMA5_HAVE_TRUSTZONE=y
+CONFIG_ARCH_HAVE_TRUSTZONE=y
 CONFIG_SAMA5_HAVE_TWI3=y
 CONFIG_SAMA5_HAVE_VDEC=y
 # CONFIG_SAMA5_FLEXCOM is not set
diff --git a/configs/sama5d4-ek/bridge/defconfig b/configs/sama5d4-ek/bridge/defconfig
index a6e16ca42de..e8419e4f38d 100644
--- a/configs/sama5d4-ek/bridge/defconfig
+++ b/configs/sama5d4-ek/bridge/defconfig
@@ -187,7 +187,7 @@ CONFIG_SAMA5_HAVE_SPI2=y
 # CONFIG_SAMA5_HAVE_TC is not set
 CONFIG_SAMA5_HAVE_TC1=y
 CONFIG_SAMA5_HAVE_TC2=y
-CONFIG_SAMA5_HAVE_TRUSTZONE=y
+CONFIG_ARCH_HAVE_TRUSTZONE=y
 CONFIG_SAMA5_HAVE_TWI3=y
 CONFIG_SAMA5_HAVE_VDEC=y
 # CONFIG_SAMA5_FLEXCOM is not set
diff --git a/configs/sama5d4-ek/dramboot/defconfig b/configs/sama5d4-ek/dramboot/defconfig
index 13fd50cdc16..01c7b28870f 100644
--- a/configs/sama5d4-ek/dramboot/defconfig
+++ b/configs/sama5d4-ek/dramboot/defconfig
@@ -186,7 +186,7 @@ CONFIG_SAMA5_HAVE_SPI2=y
 # CONFIG_SAMA5_HAVE_TC is not set
 CONFIG_SAMA5_HAVE_TC1=y
 CONFIG_SAMA5_HAVE_TC2=y
-CONFIG_SAMA5_HAVE_TRUSTZONE=y
+CONFIG_ARCH_HAVE_TRUSTZONE=y
 CONFIG_SAMA5_HAVE_TWI3=y
 CONFIG_SAMA5_HAVE_VDEC=y
 # CONFIG_SAMA5_FLEXCOM is not set
diff --git a/configs/sama5d4-ek/elf/defconfig b/configs/sama5d4-ek/elf/defconfig
index 6ec34a755a2..b6ef38039ff 100644
--- a/configs/sama5d4-ek/elf/defconfig
+++ b/configs/sama5d4-ek/elf/defconfig
@@ -189,7 +189,7 @@ CONFIG_SAMA5_HAVE_SPI2=y
 # CONFIG_SAMA5_HAVE_TC is not set
 CONFIG_SAMA5_HAVE_TC1=y
 CONFIG_SAMA5_HAVE_TC2=y
-CONFIG_SAMA5_HAVE_TRUSTZONE=y
+CONFIG_ARCH_HAVE_TRUSTZONE=y
 CONFIG_SAMA5_HAVE_TWI3=y
 CONFIG_SAMA5_HAVE_VDEC=y
 # CONFIG_SAMA5_FLEXCOM is not set
@@ -268,7 +268,6 @@ CONFIG_SAMA5_TRNG=y
 # CONFIG_SAMA5_FUSE is not set
 # CONFIG_SAMA5_MPDDRC is not set
 # CONFIG_SAMA5_VDEC is not set
-# CONFIG_SAMA5_SECURE is not set
 # CONFIG_SAMA5_PIO_IRQ is not set
 
 #
diff --git a/configs/sama5d4-ek/ipv6/defconfig b/configs/sama5d4-ek/ipv6/defconfig
index fd4dce78388..15a1be28a55 100644
--- a/configs/sama5d4-ek/ipv6/defconfig
+++ b/configs/sama5d4-ek/ipv6/defconfig
@@ -192,7 +192,7 @@ CONFIG_SAMA5_HAVE_SPI2=y
 # CONFIG_SAMA5_HAVE_TC is not set
 CONFIG_SAMA5_HAVE_TC1=y
 CONFIG_SAMA5_HAVE_TC2=y
-CONFIG_SAMA5_HAVE_TRUSTZONE=y
+CONFIG_ARCH_HAVE_TRUSTZONE=y
 CONFIG_SAMA5_HAVE_TWI3=y
 CONFIG_SAMA5_HAVE_VDEC=y
 # CONFIG_SAMA5_FLEXCOM is not set
diff --git a/configs/sama5d4-ek/knsh/defconfig b/configs/sama5d4-ek/knsh/defconfig
index 5a0c06f11ca..1b3b9316982 100644
--- a/configs/sama5d4-ek/knsh/defconfig
+++ b/configs/sama5d4-ek/knsh/defconfig
@@ -190,7 +190,7 @@ CONFIG_SAMA5_HAVE_SPI2=y
 # CONFIG_SAMA5_HAVE_TC is not set
 CONFIG_SAMA5_HAVE_TC1=y
 CONFIG_SAMA5_HAVE_TC2=y
-CONFIG_SAMA5_HAVE_TRUSTZONE=y
+CONFIG_ARCH_HAVE_TRUSTZONE=y
 CONFIG_SAMA5_HAVE_TWI3=y
 CONFIG_SAMA5_HAVE_VDEC=y
 # CONFIG_SAMA5_FLEXCOM is not set
@@ -271,7 +271,6 @@ CONFIG_SAMA5_TRNG=y
 # CONFIG_SAMA5_FUSE is not set
 # CONFIG_SAMA5_MPDDRC is not set
 # CONFIG_SAMA5_VDEC is not set
-# CONFIG_SAMA5_SECURE is not set
 CONFIG_SAMA5_PIO_IRQ=y
 # CONFIG_SAMA5_PIOA_IRQ is not set
 # CONFIG_SAMA5_PIOB_IRQ is not set
diff --git a/configs/sama5d4-ek/nsh/defconfig b/configs/sama5d4-ek/nsh/defconfig
index ee6c4f7b474..79f6c587219 100644
--- a/configs/sama5d4-ek/nsh/defconfig
+++ b/configs/sama5d4-ek/nsh/defconfig
@@ -192,7 +192,7 @@ CONFIG_SAMA5_HAVE_SPI2=y
 # CONFIG_SAMA5_HAVE_TC is not set
 CONFIG_SAMA5_HAVE_TC1=y
 CONFIG_SAMA5_HAVE_TC2=y
-CONFIG_SAMA5_HAVE_TRUSTZONE=y
+CONFIG_ARCH_HAVE_TRUSTZONE=y
 CONFIG_SAMA5_HAVE_TWI3=y
 CONFIG_SAMA5_HAVE_VDEC=y
 # CONFIG_SAMA5_FLEXCOM is not set
diff --git a/configs/sama5d4-ek/nxwm/defconfig b/configs/sama5d4-ek/nxwm/defconfig
index 2730947e035..4e0fc99c37c 100644
--- a/configs/sama5d4-ek/nxwm/defconfig
+++ b/configs/sama5d4-ek/nxwm/defconfig
@@ -192,7 +192,7 @@ CONFIG_SAMA5_HAVE_SPI2=y
 # CONFIG_SAMA5_HAVE_TC is not set
 CONFIG_SAMA5_HAVE_TC1=y
 CONFIG_SAMA5_HAVE_TC2=y
-CONFIG_SAMA5_HAVE_TRUSTZONE=y
+CONFIG_ARCH_HAVE_TRUSTZONE=y
 CONFIG_SAMA5_HAVE_TWI3=y
 CONFIG_SAMA5_HAVE_VDEC=y
 # CONFIG_SAMA5_FLEXCOM is not set
diff --git a/configs/sama5d4-ek/ramtest/defconfig b/configs/sama5d4-ek/ramtest/defconfig
index da77cefc767..46b7e72bb12 100644
--- a/configs/sama5d4-ek/ramtest/defconfig
+++ b/configs/sama5d4-ek/ramtest/defconfig
@@ -186,7 +186,7 @@ CONFIG_SAMA5_HAVE_SPI2=y
 # CONFIG_SAMA5_HAVE_TC is not set
 CONFIG_SAMA5_HAVE_TC1=y
 CONFIG_SAMA5_HAVE_TC2=y
-CONFIG_SAMA5_HAVE_TRUSTZONE=y
+CONFIG_ARCH_HAVE_TRUSTZONE=y
 CONFIG_SAMA5_HAVE_TWI3=y
 CONFIG_SAMA5_HAVE_VDEC=y
 # CONFIG_SAMA5_FLEXCOM is not set