Add option to indicatet that data is retained in SDRAM

15 files changed, 71 insertions, 21 deletions

diff --git a/nuttx/arch/Kconfig b/nuttx/arch/Kconfig
index 36b04dc10..983950d64 100644
--- a/nuttx/arch/Kconfig
+++ b/nuttx/arch/Kconfig
@@ -139,6 +139,11 @@ config ARCH_HAVE_VFORK
 
 config ARCH_HAVE_MMU
 	bool
+	default n
+
+config ARCH_NAND_HWECC
+	bool
+	default n
 
 config ARCH_IRQPRIO
 	bool "Prioritized interrupt support"
@@ -428,4 +433,19 @@ config FLASH_SIZE
 		refers to the FLASH that you link program code into.
 
 endif # BOOT_RUNFROMFLASH && ARCH_HAVE_MMU
+
+config ARCH_HAVE_SDRAM
+	bool
+	default n
+
+config BOOT_SDRAM_DATA
+	bool "Data in SDRAM"
+	default n
+	depends on ARCH_HAVE_SDRAM
+	---help---
+		This selection should be set if data lies in SDRAM (vs. SRAM).  In
+		that case, the initialization sequence is a little different:  SDRAM
+		must be configured before before the .data and .bss sections can be
+		initialized.
+
 endmenu # Boot Memory Configuration
diff --git a/nuttx/arch/arm/Kconfig b/nuttx/arch/arm/Kconfig
index 0e721697f..53a82f8e5 100644
--- a/nuttx/arch/arm/Kconfig
+++ b/nuttx/arch/arm/Kconfig
@@ -16,6 +16,7 @@ config ARCH_CHIP_A1X
 	select ARCH_HAVE_FPU
 	select ARCH_HAVE_MMU
 	select ARCH_HAVE_LOWVECTORS
+	select ARCH_HAVE_SDRAM
 	select BOOT_RUNFROMSDRAM
 	---help---
 		Allwinner A1X family: A10, A10S (A12), A13 (ARM Cortex-A8)
diff --git a/nuttx/arch/arm/src/lpc17xx/Kconfig b/nuttx/arch/arm/src/lpc17xx/Kconfig
index 31fbc1a8a..20b4b37e6 100644
--- a/nuttx/arch/arm/src/lpc17xx/Kconfig
+++ b/nuttx/arch/arm/src/lpc17xx/Kconfig
@@ -374,6 +374,7 @@ config LPC17_EXTDRAM
 	bool "Configure external DRAM"
 	default n
 	depends on ARCH_HAVE_EXTDRAM
+	select ARCH_HAVE_SDRAM
 	---help---
 		Configure external DRAM memory and, if applicable, map then external
 		DRAM into the memory map.
diff --git a/nuttx/arch/arm/src/lpc31xx/Kconfig b/nuttx/arch/arm/src/lpc31xx/Kconfig
index cde565a2a..135519699 100644
--- a/nuttx/arch/arm/src/lpc31xx/Kconfig
+++ b/nuttx/arch/arm/src/lpc31xx/Kconfig
@@ -104,6 +104,7 @@ config LPC31_EXTDRAM
 	bool "Configure external DRAM"
 	default n
 	depends on ARCH_HAVE_EXTDRAM
+	select ARCH_HAVE_SDRAM
 	---help---
 		Configure external DRAM memory and, if applicable, map then external
 		DRAM into the memory map.
diff --git a/nuttx/arch/arm/src/sam34/Kconfig b/nuttx/arch/arm/src/sam34/Kconfig
index 77cc639c2..c3b49472a 100644
--- a/nuttx/arch/arm/src/sam34/Kconfig
+++ b/nuttx/arch/arm/src/sam34/Kconfig
@@ -720,6 +720,7 @@ config SAM34_EXTDRAM
 	bool "Configure external DRAM"
 	default n
 	depends on ARCH_HAVE_EXTDRAM
+	select ARCH_HAVE_SDRAM
 	---help---
 		Configure external DRAM memory and, if applicable, map then external
 		DRAM into the memory map.
diff --git a/nuttx/configs/sama5d3x-ek/demo/Make.defs b/nuttx/configs/sama5d3x-ek/demo/Make.defs
index c75379337..1a5bc29ad 100644
--- a/nuttx/configs/sama5d3x-ek/demo/Make.defs
+++ b/nuttx/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/nuttx/configs/sama5d3x-ek/hello/Make.defs b/nuttx/configs/sama5d3x-ek/hello/Make.defs
index 7d53ca040..3577ab4fc 100644
--- a/nuttx/configs/sama5d3x-ek/hello/Make.defs
+++ b/nuttx/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/nuttx/configs/sama5d3x-ek/norboot/Make.defs b/nuttx/configs/sama5d3x-ek/norboot/Make.defs
index 01bb08f7a..eface1020 100644
--- a/nuttx/configs/sama5d3x-ek/norboot/Make.defs
+++ b/nuttx/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/nuttx/configs/sama5d3x-ek/nsh/Make.defs b/nuttx/configs/sama5d3x-ek/nsh/Make.defs
index dcc2a4731..1b22a40cb 100644
--- a/nuttx/configs/sama5d3x-ek/nsh/Make.defs
+++ b/nuttx/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/nuttx/configs/sama5d3x-ek/nx/Make.defs b/nuttx/configs/sama5d3x-ek/nx/Make.defs
index 06e54dd9d..70f878c0d 100644
--- a/nuttx/configs/sama5d3x-ek/nx/Make.defs
+++ b/nuttx/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/nuttx/configs/sama5d3x-ek/nxwm/Make.defs b/nuttx/configs/sama5d3x-ek/nxwm/Make.defs
index 357d2b605..96c6d4ff1 100644
--- a/nuttx/configs/sama5d3x-ek/nxwm/Make.defs
+++ b/nuttx/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/nuttx/configs/sama5d3x-ek/ostest/Make.defs b/nuttx/configs/sama5d3x-ek/ostest/Make.defs
index 56e4fcdad..749b24a77 100644
--- a/nuttx/configs/sama5d3x-ek/ostest/Make.defs
+++ b/nuttx/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/nuttx/configs/sama5d3x-ek/ov2640/Make.defs b/nuttx/configs/sama5d3x-ek/ov2640/Make.defs
index 629aacad9..f3aff660b 100644
--- a/nuttx/configs/sama5d3x-ek/ov2640/Make.defs
+++ b/nuttx/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/nuttx/configs/sama5d3x-ek/scripts/norflash.ld b/nuttx/configs/sama5d3x-ek/scripts/nor-isram.ld
index 9fb738ccb..ef6c05e7f 100644
--- a/nuttx/configs/sama5d3x-ek/scripts/norflash.ld
+++ b/nuttx/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>
diff --git a/nuttx/drivers/mtd/Kconfig b/nuttx/drivers/mtd/Kconfig
index c4bb65461..a036d0355 100644
--- a/nuttx/drivers/mtd/Kconfig
+++ b/nuttx/drivers/mtd/Kconfig
@@ -85,11 +85,6 @@ config MTD_CONFIG_ERASEDVALUE
 
 comment "MTD Device Drivers"
 
-
-config ARCH_NAND_HWECC
-	bool
-	default n
-
 menuconfig MTD_NAND
 	bool "MTD NAND support"
 	default n