SAMA5 norboot configuration updates

2 files changed, 58 insertions, 11 deletions

diff --git a/nuttx/configs/sama5d3x-ek/README.txt b/nuttx/configs/sama5d3x-ek/README.txt
index f272b9557..9ea566752 100644
--- a/nuttx/configs/sama5d3x-ek/README.txt
+++ b/nuttx/configs/sama5d3x-ek/README.txt
@@ -353,7 +353,9 @@ Creating and Using NORBOOT
        cd <nuttx>
        make distclean
 
-  2. Install and build the norboot configuration:
+  2. Install and build the norboot configuration.  This steps will establish
+     the norboot configuration and setup the PATH variable in order to do
+     the build:
 
        cd tools
        ./configure.sh sama5d3x-ek/<subdir>
@@ -364,6 +366,17 @@ Creating and Using NORBOOT
      perform edits as necessary so that TOOLCHAIN_BIN is the correct path
      to the directory than holds your toolchain binaries.
 
+     NOTE:  Be aware that the default norboot also disables the watchdog.
+     Since you will not be able to re-enable the watchdog later, you may
+     need to set CONFIG_SAMA5_WDT=y in the NuttX configuration file.
+
+     Then make norboot:
+
+       make
+
+     This will result in an ELF binary called 'nuttx' and also HEX and
+     binary versions called 'nuttx.hex' and 'nuttx.bin'.
+
   3. Rename the binaries.  Since you will need two versions of NuttX:  this
      norboot version that runs in internal SRAM and another under test in
      NOR FLASH, I rename the resulting binary files so that they can be
@@ -402,9 +415,11 @@ Creating and Using NORBOOT
        (gdb) mon go                   # And jump into NOR flash
 
       The norboot program can also be configured to jump directly into
-      NOR FLASH without requiring the final halt and go, but since I
-      have been debugging the early boot sequence, the above sequence has
-      been most convenient for me.
+      NOR FLASH without requiring the final halt and go by setting
+      CONFIG_SAMA5_NOR_START=y in the NuttX configuration.  However,
+      since I have been debugging the early boot sequence, the above
+      sequence has been most convenient for me since it allows me to
+      step into the program in NOR.
 
     STATUS:
       2013-7-30:  I have been unable to execute this configuration from NOR
@@ -1401,9 +1416,20 @@ Configurations
     under debug control.
 
     NOTES:
+
     1. This program derives from the hello configuration.  All of the
        notes there apply to this configuration as well.
 
+    2. The default norboot program initializes the NOR memory,
+       displays a message and halts.  The norboot program can also be
+       configured to jump directly into NOR FLASH without requiring the
+       final halt and go by setting CONFIG_SAMA5_NOR_START=y in the
+       NuttX configuration.
+
+    3. Be aware that the default norboot also disables the watchdog.
+       Since you will not be able to re-enable the watchdog later, you may
+       need to set CONFIG_SAMA5_WDT=y in the NuttX configuration file.
+
     STATUS:
       2013-7-19:  This configuration (as do the others) run at 396MHz.
         The SAMA5D3 can run at 536MHz.  I still need to figure out the
diff --git a/nuttx/configs/sama5d3x-ek/norboot/defconfig b/nuttx/configs/sama5d3x-ek/norboot/defconfig
index 6545777af..0fe813ee0 100644
--- a/nuttx/configs/sama5d3x-ek/norboot/defconfig
+++ b/nuttx/configs/sama5d3x-ek/norboot/defconfig
@@ -43,6 +43,7 @@ CONFIG_RAW_BINARY=y
 # Debug Options
 #
 # CONFIG_DEBUG is not set
+CONFIG_ARCH_HAVE_STACKCHECK=y
 # CONFIG_DEBUG_SYMBOLS is not set
 
 #
@@ -88,6 +89,7 @@ CONFIG_ARCH_CHIP_SAMA5=y
 # CONFIG_ARCH_CORTEXM3 is not set
 # CONFIG_ARCH_CORTEXM4 is not set
 CONFIG_ARCH_CORTEXA5=y
+# CONFIG_ARCH_CORTEXA8 is not set
 CONFIG_ARCH_FAMILY="armv7-a"
 CONFIG_ARCH_CHIP="sama5"
 CONFIG_ARCH_HAVE_FPU=y
@@ -112,6 +114,15 @@ CONFIG_ARMV7A_TOOLCHAIN_CODESOURCERYW=y
 #
 # ATSAMA5 Configuration Options
 #
+# CONFIG_SAMA5_HAVE_UART0 is not set
+# CONFIG_SAMA5_HAVE_UART1 is not set
+# CONFIG_SAMA5_HAVE_CAN0 is not set
+# CONFIG_SAMA5_HAVE_CAN1 is not set
+CONFIG_SAMA5_HAVE_LCDC=y
+CONFIG_SAMA5_HAVE_GMAC=y
+# CONFIG_SAMA5_HAVE_EMAC is not set
+# CONFIG_SAMA5_HAVE_HSMCI2 is not set
+# CONFIG_SAMA5_HAVE_TC1 is not set
 # CONFIG_ARCH_CHIP_ATSAMA5D31 is not set
 CONFIG_ARCH_CHIP_ATSAMA5D33=y
 # CONFIG_ARCH_CHIP_ATSAMA5D34 is not set
@@ -123,10 +134,9 @@ CONFIG_ARCH_CHIP_ATSAMA5D33=y
 # CONFIG_SAMA5_DBGU is not set
 # CONFIG_SAMA5_PIT is not set
 # CONFIG_SAMA5_WDT is not set
+# CONFIG_SAMA5_RTC is not set
 CONFIG_SAMA5_HSMC=y
 # CONFIG_SAMA5_SMD is not set
-# CONFIG_SAMA5_UART0 is not set
-# CONFIG_SAMA5_UART1 is not set
 # CONFIG_SAMA5_USART0 is not set
 CONFIG_SAMA5_USART1=y
 # CONFIG_SAMA5_USART2 is not set
@@ -136,11 +146,9 @@ CONFIG_SAMA5_USART1=y
 # CONFIG_SAMA5_TWI2 is not set
 # CONFIG_SAMA5_HSMCI0 is not set
 # CONFIG_SAMA5_HSMCI1 is not set
-# CONFIG_SAMA5_HSMCI2 is not set
 # CONFIG_SAMA5_SPI0 is not set
 # CONFIG_SAMA5_SPI1 is not set
 # CONFIG_SAMA5_TC0 is not set
-# CONFIG_SAMA5_TC1 is not set
 # CONFIG_SAMA5_PWM is not set
 # CONFIG_SAMA5_ADC is not set
 # CONFIG_SAMA5_DMAC0 is not set
@@ -148,7 +156,6 @@ CONFIG_SAMA5_USART1=y
 # CONFIG_SAMA5_UHPHS is not set
 # CONFIG_SAMA5_UDPHS is not set
 # CONFIG_SAMA5_GMAC is not set
-# CONFIG_SAMA5_EMAC is not set
 # CONFIG_SAMA5_LCDC is not set
 # CONFIG_SAMA5_ISI is not set
 # CONFIG_SAMA5_SSC0 is not set
@@ -479,7 +486,6 @@ CONFIG_LIB_SENDFILE_BUFSIZE=512
 #
 # CONFIG_EXAMPLES_BUTTONS is not set
 # CONFIG_EXAMPLES_CAN is not set
-# CONFIG_SYSTEM_COMPOSITE is not set
 # CONFIG_EXAMPLES_DHCPD is not set
 # CONFIG_EXAMPLES_ELF is not set
 # CONFIG_EXAMPLES_FTPC is not set
@@ -525,7 +531,6 @@ CONFIG_EXAMPLES_HELLO=y
 # CONFIG_EXAMPLES_UDP is not set
 # CONFIG_EXAMPLES_UIP is not set
 # CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_SYSTEM_USBMSC is not set
 # CONFIG_EXAMPLES_USBTERM is not set
 # CONFIG_EXAMPLES_WATCHDOG is not set
 
@@ -580,6 +585,14 @@ CONFIG_EXAMPLES_HELLO=y
 #
 
 #
+# USB CDC/ACM Device Commands
+#
+
+#
+# USB Composite Device Commands
+#
+
+#
 # Custom Free Memory Command
 #
 # CONFIG_SYSTEM_FREE is not set
@@ -632,6 +645,14 @@ CONFIG_EXAMPLES_HELLO=y
 #
 
 #
+# Stack Monitor
+#
+
+#
+# USB Mass Storage Device Commands
+#
+
+#
 # Zmodem Commands
 #
 # CONFIG_SYSTEM_ZMODEM is not set