diff --git a/arch/arm/src/sama5/sam_boot.c b/arch/arm/src/sama5/sam_boot.c
index 7ae187b1474..fa5b71fe609 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