diff --git a/configs/sama5d3x-ek/demo/Make.defs b/configs/sama5d3x-ek/demo/Make.defs
index c7537933790..1a5bc29ad89 100644
--- a/configs/sama5d3x-ek/demo/Make.defs
+++ b/configs/sama5d3x-ek/demo/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
 # configs/sama5d3x-ek/demo/Make.defs
 #
-#   Copyright (C) 2013 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2013-2014 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -44,7 +44,10 @@ ifeq ($(CONFIG_SAMA5_BOOT_SDRAM),y)
   LDSCRIPT = ddram.ld
 endif
 ifeq ($(CONFIG_SAMA5_BOOT_CS0FLASH),y)
-  LDSCRIPT = norflash.ld
+ifeq ($(CONFIG_BOOT_SDRAM_DATA),y)
+  LDSCRIPT = nor-ddram.ld
+else
+  LDSCRIPT = nor-isram.ld
 endif
 ifeq ($(CONFIG_SAMA5_BOOT_CS1FLASH),y)
 #  LDSCRIPT = cs1flash.ld
diff --git a/configs/sama5d3x-ek/hello/Make.defs b/configs/sama5d3x-ek/hello/Make.defs
index 7d53ca04036..3577ab4fc25 100644
--- a/configs/sama5d3x-ek/hello/Make.defs
+++ b/configs/sama5d3x-ek/hello/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
 # configs/sama5d3x-ek/hello/Make.defs
 #
-#   Copyright (C) 2013 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2013-2014 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -44,7 +44,11 @@ ifeq ($(CONFIG_SAMA5_BOOT_SDRAM),y)
   LDSCRIPT = ddram.ld
 endif
 ifeq ($(CONFIG_SAMA5_BOOT_CS0FLASH),y)
-  LDSCRIPT = norflash.ld
+ifeq ($(CONFIG_BOOT_SDRAM_DATA),y)
+  LDSCRIPT = nor-ddram.ld
+else
+  LDSCRIPT = nor-isram.ld
+endif
 endif
 ifeq ($(CONFIG_SAMA5_BOOT_CS1FLASH),y)
 #  LDSCRIPT = cs1flash.ld
diff --git a/configs/sama5d3x-ek/norboot/Make.defs b/configs/sama5d3x-ek/norboot/Make.defs
index 01bb08f7ab9..eface1020a8 100644
--- a/configs/sama5d3x-ek/norboot/Make.defs
+++ b/configs/sama5d3x-ek/norboot/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
 # configs/sama5d3x-ek/norboot/Make.defs
 #
-#   Copyright (C) 2013 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2013-2014 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -44,7 +44,11 @@ ifeq ($(CONFIG_SAMA5_BOOT_SDRAM),y)
   LDSCRIPT = ddram.ld
 endif
 ifeq ($(CONFIG_SAMA5_BOOT_CS0FLASH),y)
-  LDSCRIPT = norflash.ld
+ifeq ($(CONFIG_BOOT_SDRAM_DATA),y)
+  LDSCRIPT = nor-ddram.ld
+else
+  LDSCRIPT = nor-isram.ld
+endif
 endif
 ifeq ($(CONFIG_SAMA5_BOOT_CS1FLASH),y)
 #  LDSCRIPT = cs1flash.ld
diff --git a/configs/sama5d3x-ek/nsh/Make.defs b/configs/sama5d3x-ek/nsh/Make.defs
index dcc2a4731fd..1b22a40cb1c 100644
--- a/configs/sama5d3x-ek/nsh/Make.defs
+++ b/configs/sama5d3x-ek/nsh/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
 # configs/sama5d3x-ek/nsh/Make.defs
 #
-#   Copyright (C) 2013 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2013-2014 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -44,7 +44,11 @@ ifeq ($(CONFIG_SAMA5_BOOT_SDRAM),y)
   LDSCRIPT = ddram.ld
 endif
 ifeq ($(CONFIG_SAMA5_BOOT_CS0FLASH),y)
-  LDSCRIPT = norflash.ld
+ifeq ($(CONFIG_BOOT_SDRAM_DATA),y)
+  LDSCRIPT = nor-ddram.ld
+else
+  LDSCRIPT = nor-isram.ld
+endif
 endif
 ifeq ($(CONFIG_SAMA5_BOOT_CS1FLASH),y)
 #  LDSCRIPT = cs1flash.ld
diff --git a/configs/sama5d3x-ek/nx/Make.defs b/configs/sama5d3x-ek/nx/Make.defs
index 06e54dd9dbb..70f878c0d37 100644
--- a/configs/sama5d3x-ek/nx/Make.defs
+++ b/configs/sama5d3x-ek/nx/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
 # configs/sama5d3x-ek/nx/Make.defs
 #
-#   Copyright (C) 2013 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2013-2014 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -44,7 +44,11 @@ ifeq ($(CONFIG_SAMA5_BOOT_SDRAM),y)
   LDSCRIPT = ddram.ld
 endif
 ifeq ($(CONFIG_SAMA5_BOOT_CS0FLASH),y)
-  LDSCRIPT = norflash.ld
+ifeq ($(CONFIG_BOOT_SDRAM_DATA),y)
+  LDSCRIPT = nor-ddram.ld
+else
+  LDSCRIPT = nor-isram.ld
+endif
 endif
 ifeq ($(CONFIG_SAMA5_BOOT_CS1FLASH),y)
 #  LDSCRIPT = cs1flash.ld
diff --git a/configs/sama5d3x-ek/nxwm/Make.defs b/configs/sama5d3x-ek/nxwm/Make.defs
index 357d2b60500..96c6d4ff16e 100644
--- a/configs/sama5d3x-ek/nxwm/Make.defs
+++ b/configs/sama5d3x-ek/nxwm/Make.defs
@@ -44,7 +44,11 @@ ifeq ($(CONFIG_SAMA5_BOOT_SDRAM),y)
   LDSCRIPT = ddram.ld
 endif
 ifeq ($(CONFIG_SAMA5_BOOT_CS0FLASH),y)
-  LDSCRIPT = norflash.ld
+ifeq ($(CONFIG_BOOT_SDRAM_DATA),y)
+  LDSCRIPT = nor-ddram.ld
+else
+  LDSCRIPT = nor-isram.ld
+endif
 endif
 ifeq ($(CONFIG_SAMA5_BOOT_CS1FLASH),y)
 #  LDSCRIPT = cs1flash.ld
diff --git a/configs/sama5d3x-ek/ostest/Make.defs b/configs/sama5d3x-ek/ostest/Make.defs
index 56e4fcdad31..749b24a7725 100644
--- a/configs/sama5d3x-ek/ostest/Make.defs
+++ b/configs/sama5d3x-ek/ostest/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
 # configs/sama5d3x-ek/ostest/Make.defs
 #
-#   Copyright (C) 2013 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2013-2014 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -44,7 +44,11 @@ ifeq ($(CONFIG_SAMA5_BOOT_SDRAM),y)
   LDSCRIPT = ddram.ld
 endif
 ifeq ($(CONFIG_SAMA5_BOOT_CS0FLASH),y)
-  LDSCRIPT = norflash.ld
+ifeq ($(CONFIG_BOOT_SDRAM_DATA),y)
+  LDSCRIPT = nor-ddram.ld
+else
+  LDSCRIPT = nor-isram.ld
+endif
 endif
 ifeq ($(CONFIG_SAMA5_BOOT_CS1FLASH),y)
 #  LDSCRIPT = cs1flash.ld
diff --git a/configs/sama5d3x-ek/ov2640/Make.defs b/configs/sama5d3x-ek/ov2640/Make.defs
index 629aacad9ac..f3aff660b82 100644
--- a/configs/sama5d3x-ek/ov2640/Make.defs
+++ b/configs/sama5d3x-ek/ov2640/Make.defs
@@ -1,7 +1,7 @@
 ############################################################################
 # configs/sama5d3x-ek/ov2640/Make.defs
 #
-#   Copyright (C) 2013 Gregory Nutt. All rights reserved.
+#   Copyright (C) 2013-2014 Gregory Nutt. All rights reserved.
 #   Author: Gregory Nutt <gnutt@nuttx.org>
 #
 # Redistribution and use in source and binary forms, with or without
@@ -44,7 +44,11 @@ ifeq ($(CONFIG_SAMA5_BOOT_SDRAM),y)
   LDSCRIPT = ddram.ld
 endif
 ifeq ($(CONFIG_SAMA5_BOOT_CS0FLASH),y)
-  LDSCRIPT = norflash.ld
+ifeq ($(CONFIG_BOOT_SDRAM_DATA),y)
+  LDSCRIPT = nor-ddram.ld
+else
+  LDSCRIPT = nor-isram.ld
+endif
 endif
 ifeq ($(CONFIG_SAMA5_BOOT_CS1FLASH),y)
 #  LDSCRIPT = cs1flash.ld
diff --git a/configs/sama5d3x-ek/scripts/norflash.ld b/configs/sama5d3x-ek/scripts/nor-isram.ld
similarity index 98%
rename from configs/sama5d3x-ek/scripts/norflash.ld
rename to configs/sama5d3x-ek/scripts/nor-isram.ld
index 9fb738ccb41..ef6c05e7f4e 100644
--- a/configs/sama5d3x-ek/scripts/norflash.ld
+++ b/configs/sama5d3x-ek/scripts/nor-isram.ld
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/sama5d3x-ek/scripts/norflash.ld
+ * configs/sama5d3x-ek/scripts/nor-isram.ld
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>