diff --git a/configs/Kconfig b/configs/Kconfig
index fc4d057076..2caf802efe 100644
--- a/configs/Kconfig
+++ b/configs/Kconfig
@@ -1265,7 +1265,7 @@ if ARCH_BOARD_RGMP
 source "configs/rgmp/Kconfig"
 endif
 if ARCH_BOARD_SAMA5D3X_EK
-source "configs/sama5d3-xplained/Kconfig"
+source "configs/sama5d3x-ek/Kconfig"
 endif
 if ARCH_BOARD_SAMA5D3_XPLAINED
 source "configs/sama5d3-xplained/Kconfig"
diff --git a/configs/sama5d3x-ek/demo/defconfig b/configs/sama5d3x-ek/demo/defconfig
index 90c402997b..0895fe84f7 100644
--- a/configs/sama5d3x-ek/demo/defconfig
+++ b/configs/sama5d3x-ek/demo/defconfig
@@ -127,24 +127,48 @@ CONFIG_USBHOST_ISOC_DISABLE=y
 #
 # SAMA5 Configuration Options
 #
+# CONFIG_SAMA5_HAVE_AESB is not set
+# CONFIG_SAMA5_HAVE_ICM is not set
 # CONFIG_SAMA5_HAVE_UART0 is not set
 # CONFIG_SAMA5_HAVE_UART1 is not set
+# CONFIG_SAMA5_HAVE_USART4 is not set
 # CONFIG_SAMA5_HAVE_CAN0 is not set
 # CONFIG_SAMA5_HAVE_CAN1 is not set
+CONFIG_SAMA5_HAVE_DMA=y
+# CONFIG_SAMA5_HAVE_DDR32 is not set
+# CONFIG_SAMA5_HAVE_XDMA is not set
+# CONFIG_SAMA5_HAVE_L2CC is not set
 CONFIG_SAMA5_HAVE_LCDC=y
 CONFIG_SAMA5_HAVE_GMAC=y
 # CONFIG_SAMA5_HAVE_EMAC is not set
+# CONFIG_SAMA5_HAVE_EMAC0 is not set
+# CONFIG_SAMA5_HAVE_EMAC1 is not set
 # CONFIG_SAMA5_HAVE_HSMCI2 is not set
+# CONFIG_SAMA5_HAVE_SAIC is not set
+# CONFIG_SAMA5_HAVE_SBM is not set
+# CONFIG_SAMA5_HAVE_SFC is not set
+# CONFIG_SAMA5_HAVE_SPI2 is not set
 # CONFIG_SAMA5_HAVE_TC1 is not set
+# CONFIG_SAMA5_HAVE_TC2 is not set
+# CONFIG_SAMA5_HAVE_TWI3 is not set
+# CONFIG_SAMA5_HAVE_VDEC is not set
+CONFIG_ARCH_CHIP_SAMA5D3=y
+# CONFIG_ARCH_CHIP_SAMA5D4 is not set
 # CONFIG_ARCH_CHIP_ATSAMA5D31 is not set
 CONFIG_ARCH_CHIP_ATSAMA5D33=y
 # CONFIG_ARCH_CHIP_ATSAMA5D34 is not set
 # CONFIG_ARCH_CHIP_ATSAMA5D35 is not set
 # CONFIG_ARCH_CHIP_ATSAMA5D36 is not set
+# CONFIG_ARCH_CHIP_ATSAMA5D41 is not set
+# CONFIG_ARCH_CHIP_ATSAMA5D42 is not set
+# CONFIG_ARCH_CHIP_ATSAMA5D43 is not set
+# CONFIG_ARCH_CHIP_ATSAMA5D44 is not set
 
 #
 # SAMA5 Peripheral Support
 #
+# CONFIG_SAMA5_AES is not set
+# CONFIG_SAMA5_TDES is not set
 # CONFIG_SAMA5_DBGU is not set
 # CONFIG_SAMA5_PIT is not set
 # CONFIG_SAMA5_WDT is not set
@@ -174,11 +198,7 @@ CONFIG_SAMA5_UDPHS=y
 # CONFIG_SAMA5_ISI is not set
 # CONFIG_SAMA5_SSC0 is not set
 # CONFIG_SAMA5_SSC1 is not set
-# CONFIG_SAMA5_CAN0 is not set
-# CONFIG_SAMA5_CAN1 is not set
 # CONFIG_SAMA5_SHA is not set
-# CONFIG_SAMA5_AES is not set
-# CONFIG_SAMA5_TDES is not set
 CONFIG_SAMA5_TRNG=y
 # CONFIG_SAMA5_ARM is not set
 # CONFIG_SAMA5_FUSE is not set
@@ -268,12 +288,13 @@ CONFIG_ARCH_HAVE_IRQPRIO=y
 CONFIG_ARCH_HAVE_VFORK=y
 CONFIG_ARCH_HAVE_MMU=y
 CONFIG_ARCH_NAND_HWECC=y
+# CONFIG_ARCH_HAVE_EXTCLK is not set
 # CONFIG_PAGING is not set
 # CONFIG_ARCH_IRQPRIO is not set
 CONFIG_ARCH_STACKDUMP=y
 # CONFIG_ENDIAN_BIG is not set
 # CONFIG_ARCH_IDLE_CUSTOM is not set
-# CONFIG_ARCH_HAVE_RAMFUNCS is not set
+CONFIG_ARCH_HAVE_RAMFUNCS=y
 CONFIG_ARCH_RAMFUNCS=y
 # CONFIG_ARCH_HAVE_RAMVECTORS is not set
 
@@ -337,6 +358,7 @@ CONFIG_SAMA5D3xEK_396MHZ=y
 # CONFIG_SAMA5D3xEK_528MHZ is not set
 CONFIG_SAMA5D3xEK_MT47H128M16RT=y
 # CONFIG_SAMA5D3xEK_MT47H64M16HR is not set
+# CONFIG_SAMA5D3xEK_NOREDLED is not set
 CONFIG_SAMA5D3xEK_AT25_AUTOMOUNT=y
 CONFIG_SAMA5D3xEK_AT25_FTL=y
 
@@ -358,9 +380,6 @@ CONFIG_MSEC_PER_TICK=10
 # CONFIG_SYSTEM_TIME64 is not set
 # CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
-CONFIG_START_YEAR=2013
-CONFIG_START_MONTH=9
-CONFIG_START_DAY=6
 CONFIG_MAX_WDOGPARMS=2
 CONFIG_PREALLOC_WDOGS=16
 CONFIG_PREALLOC_TIMERS=4
@@ -437,6 +456,7 @@ CONFIG_PTHREAD_STACK_DEFAULT=2048
 CONFIG_DISABLE_POLL=y
 CONFIG_DEV_NULL=y
 # CONFIG_DEV_ZERO is not set
+CONFIG_ARCH_HAVE_RNG=y
 CONFIG_DEV_RANDOM=y
 # CONFIG_LOOP is not set
 # CONFIG_RAMDISK is not set
@@ -455,6 +475,7 @@ CONFIG_RTC=y
 CONFIG_RTC_DATETIME=y
 # CONFIG_RTC_ALARM is not set
 # CONFIG_WATCHDOG is not set
+# CONFIG_TIMER is not set
 # CONFIG_ANALOG is not set
 # CONFIG_AUDIO_DEVICES is not set
 # CONFIG_VIDEO_DEVICES is not set
@@ -748,6 +769,7 @@ CONFIG_BUILTIN_PROXY_STACKSIZE=1024
 # CONFIG_EXAMPLES_BUTTONS is not set
 # CONFIG_EXAMPLES_CAN is not set
 # CONFIG_EXAMPLES_CONFIGDATA is not set
+# CONFIG_EXAMPLES_CPUHOG is not set
 # CONFIG_EXAMPLES_CXXTEST is not set
 # CONFIG_EXAMPLES_DHCPD is not set
 # CONFIG_EXAMPLES_ELF is not set
@@ -775,7 +797,6 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_NXLINES is not set
 # CONFIG_EXAMPLES_NXTEXT is not set
 # CONFIG_EXAMPLES_OSTEST is not set
-# CONFIG_EXAMPLES_PASHELLO is not set
 # CONFIG_EXAMPLES_PIPE is not set
 # CONFIG_EXAMPLES_POSIXSPAWN is not set
 # CONFIG_EXAMPLES_QENCODER is not set
@@ -783,6 +804,8 @@ CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
 # CONFIG_EXAMPLES_RGMP is not set
 # CONFIG_EXAMPLES_ROMFS is not set
 # CONFIG_EXAMPLES_SENDMAIL is not set
+# CONFIG_EXAMPLES_SERIALBLASTER is not set
+# CONFIG_EXAMPLES_SERIALRX is not set
 # CONFIG_EXAMPLES_SERLOOP is not set
 # CONFIG_EXAMPLES_SLCD is not set
 # CONFIG_EXAMPLES_SMART_TEST is not set
@@ -970,6 +993,10 @@ CONFIG_NSH_ARCHINIT=y
 CONFIG_SYSTEM_READLINE=y
 CONFIG_READLINE_ECHO=y
 
+#
+# P-Code Support
+#
+
 #
 # Power Off
 #