diff --git a/configs/samv71-xult/nsh/defconfig b/configs/samv71-xult/nsh/defconfig
index 2d9cfed8a52..d3407be2b65 100644
--- a/configs/samv71-xult/nsh/defconfig
+++ b/configs/samv71-xult/nsh/defconfig
@@ -110,7 +110,9 @@ CONFIG_ARCH_CHIP="samv7"
 CONFIG_ARCH_HAVE_CMNVECTOR=y
 CONFIG_ARMV7M_CMNVECTOR=y
 # CONFIG_ARMV7M_LAZYFPU is not set
-# CONFIG_ARCH_HAVE_FPU is not set
+CONFIG_ARCH_HAVE_FPU=y
+CONFIG_ARCH_HAVE_DPFPU=y
+# CONFIG_ARCH_FPU is not set
 # CONFIG_ARMV7M_MPU is not set
 
 #
@@ -120,6 +122,10 @@ CONFIG_ARMV7M_HAVE_ICACHE=y
 CONFIG_ARMV7M_HAVE_DCACHE=y
 # CONFIG_ARMV7M_ICACHE is not set
 # CONFIG_ARMV7M_DCACHE is not set
+CONFIG_ARMV7M_HAVE_ITCM=y
+CONFIG_ARMV7M_HAVE_DTCM=y
+# CONFIG_ARMV7M_ITCM is not set
+# CONFIG_ARMV7M_DTCM is not set
 # CONFIG_ARMV7M_TOOLCHAIN_ATOLLIC is not set
 # CONFIG_ARMV7M_TOOLCHAIN_BUILDROOT is not set
 # CONFIG_ARMV7M_TOOLCHAIN_CODEREDW is not set
diff --git a/configs/samv71-xult/scripts/flash.ld b/configs/samv71-xult/scripts/flash.ld
index 8a56f78e1b5..38c283b0956 100644
--- a/configs/samv71-xult/scripts/flash.ld
+++ b/configs/samv71-xult/scripts/flash.ld
@@ -34,11 +34,14 @@
  ****************************************************************************/
 
 /* The SAMV71Q21 has 2048Kb of FLASH beginning at address 0x0400:0000 and
- * 384Kb of SRAM beginining at 0x2000:0000
+ * 384Kb of SRAM beginining at 0x2040:0000
  *
  * When booting from FLASH, FLASH memory is aliased to address 0x0000:0000
  * where the code expects to begin execution by jumping to the entry point in
- * the 0x0800:0000 address range.
+ * the 0x0400:0000 address range (Assuming that ITCM is not enable).
+ *
+ * NOTE: that the DTCM address of 0x2000:0000 is used for SRAM.  If DTCM is
+ * disabled, then the accesses will actually occur on the AHB bus.
  */
 
 MEMORY
diff --git a/configs/samv71-xult/scripts/memory.ld b/configs/samv71-xult/scripts/memory.ld
index 4ca6c50e35e..fe54e9e5910 100644
--- a/configs/samv71-xult/scripts/memory.ld
+++ b/configs/samv71-xult/scripts/memory.ld
@@ -34,11 +34,14 @@
  ****************************************************************************/
 
 /* The SAMV71Q21 has 2048Kb of FLASH beginning at address 0x0400:0000 and
- * 384Kb of SRAM beginining at 0x2000:0000
+ * 384Kb of SRAM beginining at 0x2040:0000
  *
  * When booting from FLASH, FLASH memory is aliased to address 0x0000:0000
  * where the code expects to begin execution by jumping to the entry point in
- * the 0x0800:0000 address range.
+ * the 0x0400:0000 address range.
+ *
+ * NOTE: that the DTCM address of 0x2000:0000 is used for SRAM.  If DTCM is
+ * disabled, then the accesses will actually occur on the AHB bus.
  *
  * The user space partition will be spanned with a single region of size
  * 2**n bytes.  The alignment of the user-space region must be the same.