diff --git a/ChangeLog b/ChangeLog
index b96246d196..635462d395 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7082,4 +7082,6 @@
 	* arch/arm/src/sama5/sam_hsmci_clkciv.c:  Remove HSCMI-related
 	  functions that did not belong in sam_pmc.c and give them their
 	  own file (2014-3-30).
+	* arch/arm/src/sama5/sam_boot.c:  Fix some backward conditional
+	  compilation (2014-3-30).
 
diff --git a/arch/arm/src/sama5/sam_boot.c b/arch/arm/src/sama5/sam_boot.c
index 7ae187b147..fa5b71fe60 100644
--- a/arch/arm/src/sama5/sam_boot.c
+++ b/arch/arm/src/sama5/sam_boot.c
@@ -209,13 +209,17 @@ static const struct section_mapping_s section_mapping[] =
 
 #ifdef CONFIG_SAMA5_DDRCS
 #ifdef CONFIG_SAMA5_BOOT_SDRAM
-  { SAM_DDRCS_PSECTION,    SAM_DDRCS_VSECTION,
-    MMU_STRONGLY_ORDERED,  SAM_DDRCS_NSECTIONS
-  },
-#else
+  /* Running out of SDRAM */
+
   { SAM_DDRCS_PSECTION,    SAM_DDRCS_VSECTION,
     SAM_DDRCS_MMUFLAGS,    SAM_DDRCS_NSECTIONS
   },
+#else
+  /* Running out of ISRAM or NOR FLASH */
+
+  { SAM_DDRCS_PSECTION,    SAM_DDRCS_VSECTION,
+    MMU_STRONGLY_ORDERED,  SAM_DDRCS_NSECTIONS
+  },
 #endif
 #endif
 
diff --git a/configs/sama5d3x-ek/README.txt b/configs/sama5d3x-ek/README.txt
index 48c8643a82..a48d2e87b3 100644
--- a/configs/sama5d3x-ek/README.txt
+++ b/configs/sama5d3x-ek/README.txt
@@ -2752,6 +2752,9 @@ Configurations
     STATUS:
        See the To-Do list below
 
+       2014-3-30: I some casual retesting, I am seeing some slow boot-
+                  up times and possible microSD card issues.  I will
+                  need to revisit this.
   hello:
 
     This configuration directory, performs the (almost) simplest of all