diff --git a/configs/sama5d4-ek/nsh/defconfig b/configs/sama5d4-ek/nsh/defconfig
index 9d797d8634..bdd18e57e9 100644
--- a/configs/sama5d4-ek/nsh/defconfig
+++ b/configs/sama5d4-ek/nsh/defconfig
@@ -112,6 +112,12 @@ CONFIG_ARCH_LOWVECTORS=y
 #
 # ARMv7-A Configuration Options
 #
+CONFIG_ARMV7A_HAVE_L2CC=y
+CONFIG_ARMV7A_HAVE_L2CC_PL310=y
+
+#
+# L2 Cache Configuration
+#
 # CONFIG_ARMV7A_TOOLCHAIN_BUILDROOT is not set
 CONFIG_ARMV7A_TOOLCHAIN_CODESOURCERYW=y
 # CONFIG_ARMV7A_TOOLCHAIN_DEVKITARM is not set
@@ -139,7 +145,6 @@ CONFIG_SAMA5_HAVE_USART4=y
 # CONFIG_SAMA5_HAVE_DMA is not set
 CONFIG_SAMA5_HAVE_DDR32=y
 CONFIG_SAMA5_HAVE_XDMA=y
-CONFIG_SAMA5_HAVE_L2CC=y
 CONFIG_SAMA5_HAVE_LCDC=y
 # CONFIG_SAMA5_HAVE_GMAC is not set
 # CONFIG_SAMA5_HAVE_EMACA is not set
@@ -174,7 +179,6 @@ CONFIG_ARCH_CHIP_ATSAMA5D44=y
 # CONFIG_SAMA5_TDES is not set
 # CONFIG_SAMA5_AESB is not set
 # CONFIG_SAMA5_DBGU is not set
-# CONFIG_SAMA5_L2CC is not set
 # CONFIG_SAMA5_PIT is not set
 # CONFIG_SAMA5_WDT is not set
 CONFIG_SAMA5_RTC=y
@@ -290,12 +294,6 @@ CONFIG_SAMA5_EMAC0_ISETH0=y
 # TWI device driver options
 #
 CONFIG_SAMA5_TWI0_FREQUENCY=100000
-# CONFIG_SAMA5_SSC0_RX_RKINPUT is not set
-# CONFIG_SAMA5_SSC0_RX_TXCLK is not set
-# CONFIG_SAMA5_SSC0_RX_MCKDIV is not set
-# CONFIG_SAMA5_SSC0_TX_TKINPUT is not set
-# CONFIG_SAMA5_SSC0_TX_RXCLK is not set
-# CONFIG_SAMA5_SSC0_TX_MCKDIV is not set
 
 #
 # HSMCI device driver options
@@ -347,6 +345,7 @@ CONFIG_SAMA5_DDRCS_HEAP_END=0x2fa00000
 # CONFIG_ARCH_VECNOTIRQ is not set
 CONFIG_ARCH_DMA=y
 CONFIG_ARCH_HAVE_IRQPRIO=y
+# CONFIG_ARCH_L2CACHE is not set
 # CONFIG_CUSTOM_STACK is not set
 # CONFIG_ADDRENV is not set
 CONFIG_ARCH_HAVE_VFORK=y
@@ -413,6 +412,7 @@ CONFIG_NSH_MMCSDSLOTNO=0
 #
 # Board-Specific Options
 #
+CONFIG_SAMA5D4_MB_REVC=y
 # CONFIG_SAMA5D4EK_384MHZ is not set
 # CONFIG_SAMA5D4EK_396MHZ is not set
 CONFIG_SAMA5D4EK_528MHZ=y
@@ -678,7 +678,7 @@ CONFIG_USBHOST=y
 CONFIG_USBHOST_NPREALLOC=4
 CONFIG_USBHOST_MSC=y
 CONFIG_USBHOST_HIDKBD=y
-CONFIG_HIDKBD_POLLUSEC=100000
+CONFIG_HIDKBD_POLLUSEC=80000
 CONFIG_HIDKBD_DEFPRIO=50
 CONFIG_HIDKBD_STACKSIZE=1024
 CONFIG_HIDKBD_BUFSIZE=64
@@ -921,6 +921,10 @@ CONFIG_MM_REGIONS=1
 #
 CONFIG_AUDIO=y
 # CONFIG_AUDIO_MULTI_SESSION is not set
+
+#
+# Audio Buffer Configuration
+#
 # CONFIG_AUDIO_LARGE_BUFFERS is not set
 CONFIG_AUDIO_NUM_BUFFERS=2
 CONFIG_AUDIO_BUFFER_NUMBYTES=8192
@@ -942,9 +946,12 @@ CONFIG_AUDIO_FORMAT_PCM=y
 #
 # CONFIG_AUDIO_EXCLUDE_VOLUME is not set
 # CONFIG_AUDIO_EXCLUDE_BALANCE is not set
+CONFIG_AUDIO_EXCLUDE_EQUALIZER=y
 # CONFIG_AUDIO_EXCLUDE_TONE is not set
 # CONFIG_AUDIO_EXCLUDE_PAUSE_RESUME is not set
 # CONFIG_AUDIO_EXCLUDE_STOP is not set
+# CONFIG_AUDIO_EXCLUDE_FFORWARD is not set
+CONFIG_AUDIO_EXCLUDE_REWIND=y
 # CONFIG_AUDIO_CUSTOM_DEV_PATH is not set
 
 #
diff --git a/configs/sama5d4-ek/nxwm/defconfig b/configs/sama5d4-ek/nxwm/defconfig
index f532dbd7f8..6de02f3a8a 100644
--- a/configs/sama5d4-ek/nxwm/defconfig
+++ b/configs/sama5d4-ek/nxwm/defconfig
@@ -674,7 +674,7 @@ CONFIG_USBHOST=y
 CONFIG_USBHOST_NPREALLOC=4
 CONFIG_USBHOST_MSC=y
 CONFIG_USBHOST_HIDKBD=y
-CONFIG_HIDKBD_POLLUSEC=100000
+CONFIG_HIDKBD_POLLUSEC=80000
 CONFIG_HIDKBD_DEFPRIO=50
 CONFIG_HIDKBD_STACKSIZE=1024
 CONFIG_HIDKBD_BUFSIZE=64