From c0c86da44c545bdfb5dab158431e81514a9a7751 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Mon, 17 Nov 2014 12:03:40 -0600
Subject: [PATCH] Change SAMA5D4-EK bridge configuration so that runs out of
 DRAM

---
 configs/sama5d4-ek/README.txt       |  3 ++
 configs/sama5d4-ek/bridge/defconfig | 55 +++++++++++++----------------
 2 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/configs/sama5d4-ek/README.txt b/configs/sama5d4-ek/README.txt
index f435df1b73..2cde57bab6 100644
--- a/configs/sama5d4-ek/README.txt
+++ b/configs/sama5d4-ek/README.txt
@@ -3668,6 +3668,9 @@ Configurations
        the warning in the section "Information Common to All Configurations"
        for further information.
 
+    3. This configuration executes from DRAM and must be loaded via some
+       bootloader.  I use DRAMBOOT as described above.
+
     STATUS:
 
       2014-11-17:  Configuration created.  Not yet verified.
diff --git a/configs/sama5d4-ek/bridge/defconfig b/configs/sama5d4-ek/bridge/defconfig
index 942de9903e..c5372b1937 100644
--- a/configs/sama5d4-ek/bridge/defconfig
+++ b/configs/sama5d4-ek/bridge/defconfig
@@ -218,7 +218,7 @@ CONFIG_SAMA5_EMAC1=y
 # CONFIG_SAMA5_TRNG is not set
 # CONFIG_SAMA5_ARM is not set
 # CONFIG_SAMA5_FUSE is not set
-CONFIG_SAMA5_MPDDRC=y
+# CONFIG_SAMA5_MPDDRC is not set
 # CONFIG_SAMA5_VDEC is not set
 # CONFIG_SAMA5_PIO_IRQ is not set
 
@@ -271,25 +271,20 @@ CONFIG_SAMA5_EMAC0_ISETH0=y
 #
 # External Memory Configuration
 #
-CONFIG_SAMA5_DDRCS=y
-CONFIG_SAMA5_DDRCS_SIZE=268435456
-# CONFIG_SAMA5_DDRCS_LPDDR1 is not set
-CONFIG_SAMA5_DDRCS_LPDDR2=y
 # CONFIG_SAMA5_EBICS0 is not set
 # CONFIG_SAMA5_EBICS1 is not set
 # CONFIG_SAMA5_EBICS2 is not set
 # CONFIG_SAMA5_EBICS3 is not set
 # CONFIG_SAMA5_HAVE_NAND is not set
 # CONFIG_SAMA5_HAVE_PMECC is not set
-CONFIG_SAMA5_BOOT_ISRAM=y
-# CONFIG_SAMA5_BOOT_SDRAM is not set
+# CONFIG_SAMA5_BOOT_ISRAM is not set
+CONFIG_SAMA5_BOOT_SDRAM=y
 
 #
 # Heap Configuration
 #
-CONFIG_SAMA5_DDRCS_HEAP=y
-CONFIG_SAMA5_DDRCS_HEAP_OFFSET=0
-CONFIG_SAMA5_DDRCS_HEAP_SIZE=0
+# CONFIG_SAMA5_ISRAM_HEAP is not set
+# CONFIG_SAMA5_DDRCS_RESERVE is not set
 
 #
 # Architecture Options
@@ -327,7 +322,7 @@ CONFIG_BOARD_LOOPSPERMSEC=65775
 # Interrupt options
 #
 CONFIG_ARCH_HAVE_INTERRUPTSTACK=y
-CONFIG_ARCH_INTERRUPTSTACK=0
+CONFIG_ARCH_INTERRUPTSTACK=2048
 # CONFIG_ARCH_HAVE_HIPRI_INTERRUPT is not set
 
 #
@@ -335,18 +330,17 @@ CONFIG_ARCH_INTERRUPTSTACK=0
 #
 # CONFIG_BOOT_RUNFROMEXTSRAM is not set
 # CONFIG_BOOT_RUNFROMFLASH is not set
-CONFIG_BOOT_RUNFROMISRAM=y
-# CONFIG_BOOT_RUNFROMSDRAM is not set
+# CONFIG_BOOT_RUNFROMISRAM is not set
+CONFIG_BOOT_RUNFROMSDRAM=y
 # CONFIG_BOOT_COPYTORAM is not set
 
 #
 # Boot Memory Configuration
 #
-CONFIG_RAM_START=0x00200000
-CONFIG_RAM_VSTART=0x00200000
-CONFIG_RAM_SIZE=114688
-CONFIG_ARCH_HAVE_SDRAM=y
-# CONFIG_BOOT_SDRAM_DATA is not set
+CONFIG_RAM_START=0x20000000
+CONFIG_RAM_VSTART=0x20000000
+CONFIG_RAM_SIZE=268435456
+# CONFIG_ARCH_HAVE_SDRAM is not set
 
 #
 # Board Selection
@@ -367,15 +361,12 @@ CONFIG_ARCH_HAVE_IRQBUTTONS=y
 #
 # Board-Specific Options
 #
-CONFIG_SAMA5D4_MB_REVC=y
-# CONFIG_SAMA5D4_MB_REVE is not set
+# CONFIG_SAMA5D4_MB_REVC is not set
+CONFIG_SAMA5D4_MB_REVE=y
 # CONFIG_SAMA5D4EK_384MHZ is not set
 # CONFIG_SAMA5D4EK_396MHZ is not set
 CONFIG_SAMA5D4EK_528MHZ=y
-CONFIG_SAMA5D4EK_MT47H128M16RT=y
-# CONFIG_SAMA5D4EK_MT47H64M16HR is not set
-# CONFIG_SAMA5D4EK_DRAM_MAIN is not set
-# CONFIG_SAMA5D4EK_AT25_MAIN is not set
+CONFIG_SAMA5D4EK_DRAM_BOOT=y
 # CONFIG_SAMA5D4EK_SLOWCLOCK is not set
 
 #
@@ -386,7 +377,7 @@ CONFIG_DISABLE_OS_API=y
 # CONFIG_DISABLE_PTHREAD is not set
 # CONFIG_DISABLE_SIGNALS is not set
 # CONFIG_DISABLE_MQUEUE is not set
-CONFIG_DISABLE_ENVIRON=y
+# CONFIG_DISABLE_ENVIRON is not set
 
 #
 # Clocks and Timers
@@ -398,11 +389,11 @@ CONFIG_USEC_PER_TICK=10000
 # CONFIG_CLOCK_MONOTONIC is not set
 # CONFIG_JULIAN_TIME is not set
 CONFIG_START_YEAR=2014
-CONFIG_START_MONTH=7
-CONFIG_START_DAY=31
+CONFIG_START_MONTH=11
+CONFIG_START_DAY=17
 CONFIG_MAX_WDOGPARMS=2
-CONFIG_PREALLOC_WDOGS=16
-CONFIG_WDOG_INTRESERVE=2
+CONFIG_PREALLOC_WDOGS=32
+CONFIG_WDOG_INTRESERVE=4
 CONFIG_PREALLOC_TIMERS=4
 
 #
@@ -483,7 +474,7 @@ CONFIG_PTHREAD_STACK_DEFAULT=2048
 #
 # Device Drivers
 #
-CONFIG_DISABLE_POLL=y
+# CONFIG_DISABLE_POLL is not set
 CONFIG_DEV_NULL=y
 # CONFIG_DEV_ZERO is not set
 # CONFIG_LOOP is not set
@@ -588,6 +579,7 @@ CONFIG_ARCH_HAVE_USART3=y
 CONFIG_USART3_ISUART=y
 CONFIG_MCU_SERIAL=y
 CONFIG_STANDARD_SERIAL=y
+CONFIG_SERIAL_NPOLLWAITERS=2
 # CONFIG_ARCH_HAVE_SERIAL_TERMIOS is not set
 CONFIG_USART3_SERIAL_CONSOLE=y
 # CONFIG_OTHER_SERIAL_CONSOLE is not set
@@ -769,6 +761,7 @@ CONFIG_MM_REGIONS=1
 # Binary Loader
 #
 # CONFIG_BINFMT_DISABLE is not set
+# CONFIG_BINFMT_EXEPATH is not set
 # CONFIG_NXFLAT is not set
 # CONFIG_ELF is not set
 CONFIG_BUILTIN=y
@@ -785,6 +778,7 @@ CONFIG_SYMTAB_ORDEREDBYNAME=y
 CONFIG_STDIO_BUFFER_SIZE=64
 CONFIG_STDIO_LINEBUFFER=y
 CONFIG_NUNGET_CHARS=2
+CONFIG_LIB_HOMEDIR="/"
 # CONFIG_LIBM is not set
 # CONFIG_NOPRINTF_FIELDWIDTH is not set
 # CONFIG_LIBC_FLOATINGPOINT is not set
@@ -801,6 +795,7 @@ CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048
 CONFIG_LIBC_TMPDIR="/tmp"
 CONFIG_LIBC_MAX_TMPFILE=32
 CONFIG_ARCH_LOWPUTC=y
+# CONFIG_LIBC_LOCALTIME is not set
 CONFIG_LIB_SENDFILE_BUFSIZE=512
 # CONFIG_ARCH_ROMGETC is not set
 # CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set