diff --git a/configs/sabre-6quad/nsh/defconfig b/configs/sabre-6quad/nsh/defconfig
index 0a059c5d47..fec179abe4 100644
--- a/configs/sabre-6quad/nsh/defconfig
+++ b/configs/sabre-6quad/nsh/defconfig
@@ -6,7 +6,7 @@
 #
 # Build Setup
 #
-CONFIG_EXPERIMENTAL=y
+# CONFIG_EXPERIMENTAL is not set
 # CONFIG_DEFAULT_SMALL is not set
 # CONFIG_HOST_LINUX is not set
 # CONFIG_HOST_OSX is not set
@@ -99,6 +99,7 @@ CONFIG_ARCH_CHIP_IMX6=y
 # CONFIG_ARCH_CHIP_SAMV7 is not set
 # CONFIG_ARCH_CHIP_STM32 is not set
 # CONFIG_ARCH_CHIP_STM32F7 is not set
+# CONFIG_ARCH_CHIP_STM32L4 is not set
 # CONFIG_ARCH_CHIP_STR71X is not set
 # CONFIG_ARCH_CHIP_TMS570 is not set
 # CONFIG_ARCH_CHIP_MOXART is not set
@@ -123,6 +124,10 @@ CONFIG_ARCH_CHIP="imx6"
 CONFIG_ARCH_HAVE_FPU=y
 # CONFIG_ARCH_HAVE_DPFPU is not set
 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
@@ -132,13 +137,14 @@ CONFIG_ARCH_LOWVECTORS=y
 # ARMv7-A Configuration Options
 #
 CONFIG_ARMV7A_HAVE_GIC=y
+CONFIG_ARMV7A_HAVE_GTM=y
+CONFIG_ARMV7A_HAVE_PTM=y
 CONFIG_ARMV7A_HAVE_L2CC=y
 CONFIG_ARMV7A_HAVE_L2CC_PL310=y
 
 #
 # L2 Cache Configuration
 #
-# CONFIG_ARMV7A_L2CC_PL310 is not set
 # CONFIG_ARMV7A_TOOLCHAIN_BUILDROOT is not set
 # CONFIG_ARMV7A_TOOLCHAIN_CODESOURCERYW is not set
 # CONFIG_ARMV7A_TOOLCHAIN_DEVKITARM is not set
@@ -287,8 +293,6 @@ CONFIG_PREALLOC_TIMERS=4
 #
 # Tasks and Scheduling
 #
-# CONFIG_SPINLOCK is not set
-# CONFIG_SMP is not set
 # CONFIG_INIT_NONE is not set
 CONFIG_INIT_ENTRYPOINT=y
 # CONFIG_INIT_FILEPATH is not set
@@ -557,7 +561,6 @@ CONFIG_MM_REGIONS=1
 #
 # Wireless Support
 #
-# CONFIG_WIRELESS is not set
 
 #
 # Binary Loader
@@ -602,6 +605,8 @@ CONFIG_ARCH_LOWPUTC=y
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
+CONFIG_ARCH_HAVE_TLS=y
+# CONFIG_TLS is not set
 # CONFIG_LIBC_NETDB is not set
 
 #