SAMA5D3 Xplained: Has no NOR flash. Remove all NOR support from board configuration

21 files changed, 30 insertions, 1994 deletions

diff --git a/nuttx/arch/arm/src/sama5/Kconfig b/nuttx/arch/arm/src/sama5/Kconfig
index 553090cff..17808ebe6 100644
--- a/nuttx/arch/arm/src/sama5/Kconfig
+++ b/nuttx/arch/arm/src/sama5/Kconfig
@@ -3513,7 +3513,6 @@ config SAMA5_BOOT_ISRAM
 
 config SAMA5_BOOT_SDRAM
 	bool "Running from external SDRAM"
-	depends on SAMA5_DDRCS
 
 config SAMA5_BOOT_CS0FLASH
 	bool "Running in external FLASH CS0"
diff --git a/nuttx/arch/arm/src/sama5/sam_boot.c b/nuttx/arch/arm/src/sama5/sam_boot.c
index 8d15c646c..7ae187b14 100644
--- a/nuttx/arch/arm/src/sama5/sam_boot.c
+++ b/nuttx/arch/arm/src/sama5/sam_boot.c
@@ -140,13 +140,14 @@ static const struct section_mapping_s section_mapping[] =
    * I have found that in the test environments that I use, I cannot always
    * be assured of that physical address mapping.
    *
-   * So we do both here.  If we are exectuing from FLASH, then we provide
+   * So we do both here.  If we are executing from FLASH, then we provide
    * the MMU to map the physical address of FLASH to address 0x0000:0000;
    * if we are executing from the internal SRAM, then we trust the bootload
    * to setup the AXI MATRIX mapping.
    */
 
-#if defined(CONFIG_ARCH_LOWVECTORS) && !defined(CONFIG_SAMA5_BOOT_ISRAM)
+#if defined(CONFIG_ARCH_LOWVECTORS) && !defined(CONFIG_SAMA5_BOOT_ISRAM) && \
+   !defined(CONFIG_SAMA5_BOOT_SDRAM)
   { CONFIG_FLASH_VSTART,   0x00000000,
     MMU_ROMFLAGS,          1
   },
diff --git a/nuttx/configs/sama5d3-xplained/Kconfig b/nuttx/configs/sama5d3-xplained/Kconfig
index ce6623bd0..c0c542808 100644
--- a/nuttx/configs/sama5d3-xplained/Kconfig
+++ b/nuttx/configs/sama5d3-xplained/Kconfig
@@ -22,26 +22,6 @@ config SAMA5D3XPLAINED_MT47H64M16HR
 
 endchoice # SAMA5D3-Xplained DRAM Type
 
-config SAMA5D3XPLAINED_NOR_MAIN
-	bool "Build nor_main"
-	default n
-	depends on SAMA5_BOOT_ISRAM
-	---help---
-		nor_main is a tiny program that runs in ISRAM.  nor_main will enable
-		NOR flash then either (1) jump to the program in NOR flash or (2)
-		wait for you to break in with GDB to debug the NOR program.
-
-config SAMA5D3XPLAINED_NOR_START
-	bool "Start NOR program"
-	default n
-	depends on SAMA5D3XPLAINED_NOR_MAIN
-	---help---
-		The default behavior of the NOR boot program is to initialize the
-		NOR FLASH at CS0, then patiently wait for you to break into the
-		program with GDB.  An alternative behvior is enabled with this
-		option:  If SAMA5D3XPLAINED_NOR_START is defined, then it will not wait but
-		will, instead, immediately start the program in NOR FLASH.
-
 config SAMA5D3XPLAINED_NAND_AUTOMOUNT
 	bool "NAND FLASH auto-mount"
 	default n
diff --git a/nuttx/configs/sama5d3-xplained/README.txt b/nuttx/configs/sama5d3-xplained/README.txt
index bc6cf6df8..0e94c1664 100644
--- a/nuttx/configs/sama5d3-xplained/README.txt
+++ b/nuttx/configs/sama5d3-xplained/README.txt
@@ -58,7 +58,6 @@ Contents
   - NXFLAT Toolchain
   - Loading Code into SRAM with J-Link
   - Writing to FLASH using SAM-BA
-  - Creating and Using NORBOOT
   - Buttons and LEDs
   - Serial Console
   - Networking
@@ -324,105 +323,6 @@ Writing to FLASH using SAM-BA
        re-open the terminal emulator program.
     10. Power cycle the board.
 
-Creating and Using NORBOOT
-==========================
-
-  In order to have more control of debugging code that runs out of NOR FLASH,
-  I created the sama5d3-xplained/norboot configuration.  That configuration is
-  described below under "Configurations."
-
-  Here are some general instructions on how to build an use norboot:
-
-  Building:
-  1. Remove any old configurations (if applicable).
-
-       cd <nuttx>
-       make distclean
-
-  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 sama5d3-xplained/<subdir>
-       cd -
-       . ./setenv.sh
-
-     Before sourcing the setenv.sh file above, you should examine it and
-     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
-     distinguished:
-
-       mv nuttx norboot
-       mv nuttx.hex norboot.hex
-       mv nuttx.bin norboot.bin
-
-  4. Build your NOR configuration and write this into NOR FLASH.  Here, for
-     example, is how you would create the NSH NOR configuration:
-
-       cd <nuttx>
-       make distclean                 # Remove the norboot configuration
-       cd tools
-       ./configure.sh sama5d3-xplained/nsh # Establish the NSH configuration
-       cd -
-       make                           # Build the NSH configuration
-
-     Then use SAM-BA to write the nuttx.bin binary into NOR FLASH.  This
-     will involve holding the CS_BOOT button and power cycling to start
-     the ROM loader.  The SAM-BA serial connection will be on the device
-     USB port, not the debug USB port.  Follow the SAM-BA instruction to
-     write the nuttx.bin binary to NOR FLASH.
-
-   5. Restart the system without holding CS_BOOT to get back to the normal
-      debug setup.
-
-   6. Then start the J-Link GDB server and GDB.  In GDB, I do the following:
-
-       (gdb) mon reset                # Reset and halt the CPU
-       (gdb) load norboot             # Load norboot into internal SRAM
-       (gdb) mon go                   # Start norboot
-       (gdb) mon halt                 # Break in
-       (gdb) mon reg pc = 0x10000040  # Set the PC to NOR flash entry point
-       (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 by setting
-      CONFIG_SAMA5D3XPLAINED_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.
-
-   7. An option is to use the SAM-BA tool to write the NORBOOT image into
-      Serial FLASH.  Then, the system will boot from Serial FLASH by
-      copying the NORBOOT image in SRAM which will run and then start the
-      image in NOR FLASH automatically.  This is a very convenient usage!
-
-      NOTES: (1) There is jumper on the CM module that must be closed to
-      enable use of the AT25 Serial Flash.  (2) If using SAM-BA, make sure
-      that you load the NOR boot program into the boot area via the pull-
-      down menu.
-
-    STATUS:
-      2014-7-30:  I have been unable to execute these configurations from NOR
-        FLASH by closing the BMS jumper (J9).  As far as I can tell, this
-        jumper does nothing on my board???  So I have been using the norboot
-        configuration exclusively to start the program-under-test in NOR FLASH.
-
 Buttons and LEDs
 ================
 
@@ -1203,37 +1103,6 @@ USB High-Speed Host
   serial console.  However, the debug output will be asynchronous with the
   trace output and, hence, difficult to interpret.
 
-NOR FLASH Support
-=================
-
-  Most of these configurations execute out of CS0 NOR flash and can only be
-  loaded via SAM-BA.  These are the relevant configuration options the
-  define the NOR FLASH configuration:
-
-    CONFIG_SAMA5_BOOT_CS0FLASH=y            : Boot from FLASH on CS0
-    CONFIG_BOOT_RUNFROMFLASH=y              : Run in place on FLASH (vs copying to RAM)
-
-    CONFIG_SAMA5_EBICS0=y                   : Enable CS0 external memory
-    CONFIG_SAMA5_EBICS0_SIZE=134217728      : Memory size is 128KB
-    CONFIG_SAMA5_EBICS0_NOR=y               : Memory type is NOR FLASH
-
-    CONFIG_FLASH_START=0x10000000           : Physical FLASH start address
-    CONFIG_FLASH_VSTART=0x10000000          : Virtual FLASH start address
-    CONFIG_FLASH_SIZE=134217728             : FLASH size (again)
-
-    CONFIG_RAM_START=0x00300400             : Data stored after page table
-    CONFIG_RAM_VSTART=0x00300400
-    CONFIG_RAM_SIZE=114688                  : Available size of 128KB - 16KB for page table
-
-  NOTE:  In order to boot in this configuration, you need to close the BMS
-  jumper.
-
-  STATUS:  I have been unable to execute these configurations from NOR FLASH
-  by closing the BMS jumper (J9).  As far as I can tell, this jumper does
-  nothing on my board???  So I have been using the norboot configuration
-  exclusively to start the program-under-test in NOR FLASH (see the section
-  entitled "Creating and Using NORBOOT" above.)
-
 SDRAM Support
 =============
 
@@ -1392,18 +1261,7 @@ NAND Support
        entering any data on the DBG serial port.  I have not tried this.
        Instead, I just changed to boot from Serial Flash:
 
-    2. Booting from Serial Flash. The work around for this case is to put
-       the NORBOOT image into Serial FLASH.  Then, the system will boot from
-       Serial FLASH by copying the NORBOOT image in SRAM which will run and
-       then start the image in NOR FLASH.  See the discussion of the NORBOOT
-       configuration in the "Creating and Using NORBOOT" section above.
-
-       NOTE that there is jumper on the CM module that must be closed to enable
-       use of the AT25 Serial Flash.  Also, if you are using using SAM-BA,
-       make sure that you load the NOR boot program into the boot area via
-       the pull-down menu.
-
-    3. Unfortunately, there are no appropriate NAND file system in NuttX as
+    2. Unfortunately, there are no appropriate NAND file system in NuttX as
        of this writing.  The following sections discussion issues/problems
        with using NXFFS and FAT.
 
@@ -2085,10 +1943,6 @@ Watchdog Timer
   the WDT, we cannot disable the watchdog time if CONFIG_SAMA5_WDT=y.  So,
   be forewarned:  You have only 16 seconds to run your watchdog timer test!
 
-  NOTE:  If you are using the norboot program to run from FLASH as I did,
-  beware that the default version also disables the watchdog.  You will
-  need a special version of norboot with CONFIG_SAMA5_WDT=y.
-
 TRNG and /dev/random
 ====================
 
@@ -2457,11 +2311,6 @@ Configurations
   Summary:  Some of the descriptions below are long and wordy. Here is the
   concise summary of the available SAMA5D3-Xplained configurations:
 
-    norboot:
-      This is a little program to help debug of code in NOR flash.  I wrote
-      it because I don't yet understand how to get the SAMA5 to boot from
-      NOR FLASH.  See the description below and the section above entitled
-      "Creating and Using NORBOOT" for more information
     nsh:  This is another NSH configuration, not too different from the
       demo configuration.  The nsh configuration is, however, bare bones.
       It is the simplest possible NSH configuration and is useful as a
@@ -2472,39 +2321,6 @@ Configurations
 
   Now for the gory details:
 
-  norboot:
-    This is a little program to help debug of code in NOR flash.  It
-    does the following:
-
-    - It enables and configures NOR FLASH, then
-    - Waits for you to break in with GDB.
-
-    At that point, you can set the PC and begin executing from NOR FLASH
-    under debug control.  See the section entitled "Creating and Using
-    NORBOOT" above.
-
-    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_SAMA5D3XPLAINED_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.
-
-    4. If you put norboot on the Serial FLASH, you can automatically
-       boot to NOR on reset.  See the section "Creating and Using NORBOOT"
-       above.
-
-    STATUS:
-       See the To-Do list below
-
   nsh:
 
     This configuration directory provide the NuttShell (NSH).  There are
@@ -2536,9 +2352,8 @@ Configurations
        the warning in the section "Information Common to All Configurations"
        for further information.
 
-    3. This configuration executes out of CS0 NOR flash and can only
-       be loaded via SAM-BA.  The are the relevant configuration options
-       are provided above in the section entitled "NOR FLASH Support".
+    3. This configuration executes out of NAND flash and can only
+       be loaded via BareBox.
 
     4. This configuration has support for NSH built-in applications enabled.
        However, no built-in applications are selected in the base configuration.
@@ -2610,22 +2425,16 @@ To-Do List
 1) Currently the SAMA5Dx is running at 396MHz in these configurations.  This
    is because the timing for the PLLs, NOR FLASH, and SDRAM came from the
    Atmel NoOS sample code which runs at that rate.  The SAMA5Dx is capable
-   of running at 528MHz, however.  The setup for that configuration exists
-   in the Bareboard assembly language setup and should be incorporated.
-
-2) Most of these configurations execute from NOR FLASH. I have been unable
-   to execute these configurations from NOR FLASH by closing the BMS jumper
-   (J9).  As far as I can tell, this jumper does nothing on my board???  I
-   have been using the norboot configuration to start the program in NOR
-   FLASH (see just above).  See "Creating and Using NORBOOT" above.
+   of running at 536MHz, however.  The setup for that configuration exists
+   in the BareBox assembly language setup and should be incorporated.
 
-3) Neither USB OHCI nor EHCI support Isochronous endpoints.  Interrupt
+2) Neither USB OHCI nor EHCI support Isochronous endpoints.  Interrupt
    endpoint support in the EHCI driver is untested (but works in similar
    EHCI drivers).
 
-4) HSCMI TX DMA support is currently commented out.
+3) HSCMI TX DMA support is currently commented out.
 
-5) I believe that there is an issue when the internal AT25 FLASH is
+4) I believe that there is an issue when the internal AT25 FLASH is
    formatted by NuttX.  That format works fine with Linux, but does not
    appear to work with Windows.  Reformatting on Windows can resolve this.
    NOTE:  This is not a SAMA5Dx issue.
@@ -2634,20 +2443,20 @@ To-Do List
    formatting function (mkfatfs).  It is likely that these fixes will
    eliminate this issue, but that has not yet been verified.
 
-6) CAN testing has not yet been performed due to issues with cabling.  I
+5) CAN testing has not yet been performed due to issues with cabling.  I
    just do not have a good test bed (or sufficient CAN knowledge) for
    good CAN testing.
 
-7) The NxWM example does not work well.  This example was designed to work
+6) The NxWM example does not work well.  This example was designed to work
    with much smaller displays and does not look good or work well with the
    SAMA5D3-Xplained's 800x480 display.  See above for details.
 
-8) I have a Camera, but there is still no ISI driver.  I am not sure what to
+7) I have a Camera, but there is still no ISI driver.  I am not sure what to
    do with the camera.  NuttX needs something like V4L to provide the
    definition for what a camera driver is supposed to do.
 
    I will probably develop a test harness for ISI, but it is of only
    minimal value with no OS infrastructure to deal with images and video.
 
-9) GMAC has only been tested on a 10/100Base-T network.  I don't have a
+8) GMAC has only been tested on a 10/100Base-T network.  I don't have a
    1000Base-T network to support additional testing.
diff --git a/nuttx/configs/sama5d3-xplained/norboot/Make.defs b/nuttx/configs/sama5d3-xplained/norboot/Make.defs
deleted file mode 100644
index c9e67ca9f..000000000
--- a/nuttx/configs/sama5d3-xplained/norboot/Make.defs
+++ /dev/null
@@ -1,146 +0,0 @@
-############################################################################
-# configs/sama5d3-xplained/norboot/Make.defs
-#
-#   Copyright (C) 2014-2014 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-############################################################################
-
-include ${TOPDIR}/.config
-include ${TOPDIR}/tools/Config.mk
-include ${TOPDIR}$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-a$(DELIM)Toolchain.defs
-
-ifeq ($(CONFIG_SAMA5_BOOT_ISRAM),y)
-  LDSCRIPT = isram.ld
-endif
-
-ifeq ($(CONFIG_SAMA5_BOOT_SDRAM),y)
-  LDSCRIPT = ddram.ld
-endif
-
-ifeq ($(CONFIG_SAMA5_BOOT_CS0FLASH),y)
-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
-endif
-
-ifeq ($(CONFIG_SAMA5_BOOT_CS2FLASH),y)
-#  LDSCRIPT = cs2flash.ld
-endif
-
-ifeq ($(CONFIG_SAMA5_BOOT_CS3FLASH),y)
-#  LDSCRIPT = cs3flash.ld
-endif
-
-ifeq ($(WINTOOL),y)
-  # Windows-native toolchains
-  ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}"
-  ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}" -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include$(DELIM)cxx}"
-  ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)configs$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT)}"
-else
-  # Linux/Cygwin-native toolchain
-  ARCHINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include
-  ARCHXXINCLUDES = -I. -isystem $(TOPDIR)$(DELIM)include -isystem $(TOPDIR)$(DELIM)include$(DELIM)cxx
-  ARCHSCRIPT = -T$(TOPDIR)$(DELIM)configs$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)$(LDSCRIPT)
-endif
-
-CC = $(CROSSDEV)gcc
-CXX = $(CROSSDEV)g++
-CPP = $(CROSSDEV)gcc -E
-LD = $(CROSSDEV)ld
-AR = $(ARCROSSDEV)ar rcs
-NM = $(ARCROSSDEV)nm
-OBJCOPY = $(CROSSDEV)objcopy
-OBJDUMP = $(CROSSDEV)objdump
-
-ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
-  ARCHOPTIMIZATION = -g
-endif
-
-ifneq ($(CONFIG_DEBUG_NOOPT),y)
-  ARCHOPTIMIZATION += $(MAXOPTIMIZATION) -fno-strict-aliasing -fno-strength-reduce -fomit-frame-pointer
-endif
-
-ARCHCPUFLAGS = -mcpu=cortex-a5 -mfpu=vfpv4-d16
-ARCHCFLAGS = -fno-builtin
-ARCHCXXFLAGS = -fno-builtin -fno-exceptions -fno-rtti
-ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow
-ARCHWARNINGSXX = -Wall -Wshadow
-ARCHDEFINES =
-ARCHPICFLAGS = -fpic -msingle-pic-base -mpic-register=r10
-
-CFLAGS = $(ARCHCFLAGS) $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
-CPICFLAGS = $(ARCHPICFLAGS) $(CFLAGS)
-CXXFLAGS = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(ARCHXXINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe
-CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
-CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
-AFLAGS = $(CFLAGS) -D__ASSEMBLY__
-
-NXFLATLDFLAGS1 = -r -d -warn-common
-NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)$(DELIM)binfmt$(DELIM)libnxflat$(DELIM)gnu-nxflat-pcrel.ld -no-check-sections
-LDNXFLATFLAGS = -e main -s 2048
-
-OBJEXT = .o
-LIBEXT = .a
-EXEEXT =
-
-ifneq ($(CROSSDEV),arm-nuttx-elf-)
-  LDFLAGS += -nostartfiles -nodefaultlibs
-endif
-ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
-  LDFLAGS += -g
-endif
-
-HOSTCC = gcc
-HOSTINCLUDES = -I.
-HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -g -pipe
-HOSTLDFLAGS =
-ifeq ($(CONFIG_HOST_WINDOWS),y)
-  HOSTEXEEXT = .exe
-else
-  HOSTEXEEXT =
-endif
-
-ifeq ($(WINTOOL),y)
-  # Windows-native host tools
-  DIRLINK = $(TOPDIR)$(DELIM)tools$(DELIM)copydir.sh
-  DIRUNLINK = $(TOPDIR)$(DELIM)tools$(DELIM)unlink.sh
-  MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mknulldeps.sh
-else
-  # Linux/Cygwin-native host tools 
-  MKDEP = $(TOPDIR)$(DELIM)tools$(DELIM)mkdeps$(HOSTEXEEXT)
-endif
-
diff --git a/nuttx/configs/sama5d3-xplained/norboot/defconfig b/nuttx/configs/sama5d3-xplained/norboot/defconfig
deleted file mode 100644
index c935b4873..000000000
--- a/nuttx/configs/sama5d3-xplained/norboot/defconfig
+++ /dev/null
@@ -1,736 +0,0 @@
-#
-# Automatically generated file; DO NOT EDIT.
-# Nuttx/ Configuration
-#
-
-#
-# Build Setup
-#
-# CONFIG_EXPERIMENTAL is not set
-# CONFIG_DEFAULT_SMALL is not set
-# CONFIG_HOST_LINUX is not set
-# CONFIG_HOST_OSX is not set
-CONFIG_HOST_WINDOWS=y
-# CONFIG_HOST_OTHER is not set
-# CONFIG_WINDOWS_NATIVE is not set
-CONFIG_WINDOWS_CYGWIN=y
-# CONFIG_WINDOWS_MSYS is not set
-# CONFIG_WINDOWS_OTHER is not set
-
-#
-# Build Configuration
-#
-# CONFIG_APPS_DIR="../apps"
-# CONFIG_BUILD_2PASS is not set
-
-#
-# Binary Output Formats
-#
-# CONFIG_RRLOAD_BINARY is not set
-CONFIG_INTELHEX_BINARY=y
-# CONFIG_MOTOROLA_SREC is not set
-CONFIG_RAW_BINARY=y
-
-#
-# Customize Header Files
-#
-# CONFIG_ARCH_STDINT_H is not set
-# CONFIG_ARCH_STDBOOL_H is not set
-# CONFIG_ARCH_MATH_H is not set
-# CONFIG_ARCH_FLOAT_H is not set
-# CONFIG_ARCH_STDARG_H is not set
-
-#
-# Debug Options
-#
-# CONFIG_DEBUG is not set
-CONFIG_ARCH_HAVE_STACKCHECK=y
-# CONFIG_ARCH_HAVE_HEAPCHECK is not set
-# CONFIG_DEBUG_SYMBOLS is not set
-CONFIG_ARCH_HAVE_CUSTOMOPT=y
-# CONFIG_DEBUG_NOOPT is not set
-# CONFIG_DEBUG_CUSTOMOPT is not set
-CONFIG_DEBUG_FULLOPT=y
-
-#
-# System Type
-#
-# CONFIG_ARCH_8051 is not set
-CONFIG_ARCH_ARM=y
-# CONFIG_ARCH_AVR is not set
-# CONFIG_ARCH_HC is not set
-# CONFIG_ARCH_MIPS is not set
-# CONFIG_ARCH_RGMP is not set
-# CONFIG_ARCH_SH is not set
-# CONFIG_ARCH_SIM is not set
-# CONFIG_ARCH_X86 is not set
-# CONFIG_ARCH_Z16 is not set
-# CONFIG_ARCH_Z80 is not set
-CONFIG_ARCH="arm"
-
-#
-# ARM Options
-#
-# CONFIG_ARCH_CHIP_A1X is not set
-# CONFIG_ARCH_CHIP_C5471 is not set
-# CONFIG_ARCH_CHIP_CALYPSO is not set
-# CONFIG_ARCH_CHIP_DM320 is not set
-# CONFIG_ARCH_CHIP_IMX is not set
-# CONFIG_ARCH_CHIP_KINETIS is not set
-# CONFIG_ARCH_CHIP_KL is not set
-# CONFIG_ARCH_CHIP_LM is not set
-# CONFIG_ARCH_CHIP_TIVA is not set
-# CONFIG_ARCH_CHIP_LPC17XX is not set
-# CONFIG_ARCH_CHIP_LPC214X is not set
-# CONFIG_ARCH_CHIP_LPC2378 is not set
-# CONFIG_ARCH_CHIP_LPC31XX is not set
-# CONFIG_ARCH_CHIP_LPC43XX is not set
-# CONFIG_ARCH_CHIP_NUC1XX is not set
-CONFIG_ARCH_CHIP_SAMA5=y
-# CONFIG_ARCH_CHIP_SAMD is not set
-# CONFIG_ARCH_CHIP_SAM34 is not set
-# CONFIG_ARCH_CHIP_STM32 is not set
-# CONFIG_ARCH_CHIP_STR71X is not set
-# CONFIG_ARCH_ARM7TDMI is not set
-# CONFIG_ARCH_ARM926EJS is not set
-# CONFIG_ARCH_ARM920T is not set
-# CONFIG_ARCH_CORTEXM0 is not set
-# 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
-CONFIG_ARCH_FPU=y
-# CONFIG_ARCH_HAVE_MPU is not set
-CONFIG_ARCH_HAVE_LOWVECTORS=y
-CONFIG_ARCH_LOWVECTORS=y
-# CONFIG_ARCH_ROMPGTABLE is not set
-
-#
-# ARMv7-A Configuration Options
-#
-# CONFIG_ARMV7A_TOOLCHAIN_BUILDROOT is not set
-CONFIG_ARMV7A_TOOLCHAIN_CODESOURCERYW=y
-# CONFIG_ARMV7A_TOOLCHAIN_DEVKITARM is not set
-# CONFIG_ARMV7A_TOOLCHAIN_GNU_EABIL is not set
-# CONFIG_ARMV7A_TOOLCHAIN_GNU_EABIW is not set
-# CONFIG_ARMV7A_TOOLCHAIN_GNU_OABI is not set
-
-#
-# SAMA5 Configuration Options
-#
-CONFIG_SAMA5_HAVE_UART0=y
-CONFIG_SAMA5_HAVE_UART1=y
-CONFIG_SAMA5_HAVE_CAN0=y
-CONFIG_SAMA5_HAVE_CAN1=y
-CONFIG_SAMA5_HAVE_LCDC=y
-CONFIG_SAMA5_HAVE_GMAC=y
-CONFIG_SAMA5_HAVE_EMAC=y
-CONFIG_SAMA5_HAVE_HSMCI2=y
-CONFIG_SAMA5_HAVE_TC1=y
-# CONFIG_ARCH_CHIP_ATSAMA5D31 is not set
-# CONFIG_ARCH_CHIP_ATSAMA5D33 is not set
-# CONFIG_ARCH_CHIP_ATSAMA5D34 is not set
-# CONFIG_ARCH_CHIP_ATSAMA5D35 is not set
-CONFIG_ARCH_CHIP_ATSAMA5D36=y
-
-#
-# SAMA5 Peripheral Support
-#
-# 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
-# CONFIG_SAMA5_USART3 is not set
-# CONFIG_SAMA5_TWI0 is not set
-# CONFIG_SAMA5_TWI1 is not set
-# 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
-# CONFIG_SAMA5_DMAC1 is not set
-# 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_CAN0 is not set
-# CONFIG_SAMA5_CAN1 is not set
-# CONFIG_SAMA5_SHA is not set
-# CONFIG_SAMA5_AES is not set
-# CONFIG_SAMA5_TDES is not set
-# CONFIG_SAMA5_TRNG is not set
-# CONFIG_SAMA5_ARM is not set
-# CONFIG_SAMA5_FUSE is not set
-# CONFIG_SAMA5_MPDDRC is not set
-# CONFIG_SAMA5_PIO_IRQ is not set
-
-#
-# External Memory Configuration
-#
-CONFIG_SAMA5_EBICS0=y
-CONFIG_SAMA5_EBICS0_SIZE=134217728
-# CONFIG_SAMA5_EBICS0_SRAM is not set
-# CONFIG_SAMA5_EBICS0_PSRAM is not set
-# CONFIG_SAMA5_EBICS0_PROM is not set
-# CONFIG_SAMA5_EBICS0_EEPROM is not set
-# CONFIG_SAMA5_EBICS0_EPROM is not set
-# CONFIG_SAMA5_EBICS0_LCD is not set
-CONFIG_SAMA5_EBICS0_NOR=y
-# 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_CS0FLASH is not set
-
-#
-# Heap Configuration
-#
-
-#
-# Architecture Options
-#
-# CONFIG_ARCH_NOINTC is not set
-# CONFIG_ARCH_VECNOTIRQ is not set
-# CONFIG_ARCH_DMA is not set
-CONFIG_ARCH_HAVE_IRQPRIO=y
-# CONFIG_CUSTOM_STACK is not set
-# CONFIG_ADDRENV is not set
-CONFIG_ARCH_HAVE_VFORK=y
-CONFIG_ARCH_HAVE_MMU=y
-CONFIG_ARCH_NAND_HWECC=y
-# CONFIG_PAGING is not set
-CONFIG_ARCH_IRQPRIO=y
-CONFIG_ARCH_STACKDUMP=y
-# CONFIG_ENDIAN_BIG is not set
-# CONFIG_ARCH_IDLE_CUSTOM is not set
-# CONFIG_ARCH_HAVE_RAMFUNCS is not set
-# CONFIG_ARCH_HAVE_RAMVECTORS is not set
-
-#
-# Board Settings
-#
-CONFIG_BOARD_LOOPSPERMSEC=49341
-# CONFIG_ARCH_CALIBRATION is not set
-
-#
-# Interrupt options
-#
-CONFIG_ARCH_HAVE_INTERRUPTSTACK=y
-CONFIG_ARCH_INTERRUPTSTACK=0
-# CONFIG_ARCH_HAVE_HIPRI_INTERRUPT is not set
-
-#
-# Boot options
-#
-# CONFIG_BOOT_RUNFROMEXTSRAM is not set
-# CONFIG_BOOT_RUNFROMFLASH is not set
-CONFIG_BOOT_RUNFROMISRAM=y
-# CONFIG_BOOT_RUNFROMSDRAM is not set
-# CONFIG_BOOT_COPYTORAM is not set
-
-#
-# Boot Memory Configuration
-#
-CONFIG_RAM_START=0x00300000
-CONFIG_RAM_VSTART=0x00300000
-CONFIG_RAM_SIZE=114688
-# CONFIG_ARCH_HAVE_SDRAM is not set
-
-#
-# Board Selection
-#
-CONFIG_ARCH_BOARD_SAMA5D3_XPLAINED=y
-# CONFIG_ARCH_BOARD_CUSTOM is not set
-CONFIG_ARCH_BOARD="sama5d3-xplained"
-
-#
-# Common Board Options
-#
-CONFIG_ARCH_HAVE_LEDS=y
-CONFIG_ARCH_LEDS=y
-CONFIG_ARCH_HAVE_BUTTONS=y
-# CONFIG_ARCH_BUTTONS is not set
-CONFIG_ARCH_HAVE_IRQBUTTONS=y
-
-#
-# Board-Specific Options
-#
-CONFIG_SAMA5D3XPLAINED_NOR_MAIN=y
-# CONFIG_SAMA5D3XPLAINED_NOR_START is not set
-
-#
-# RTOS Features
-#
-# CONFIG_BOARD_INITIALIZE is not set
-CONFIG_MSEC_PER_TICK=10
-# CONFIG_SYSTEM_TIME64 is not set
-CONFIG_RR_INTERVAL=200
-# CONFIG_SCHED_CPULOAD is not set
-# CONFIG_SCHED_INSTRUMENTATION is not set
-CONFIG_TASK_NAME_SIZE=0
-# CONFIG_SCHED_HAVE_PARENT is not set
-# CONFIG_JULIAN_TIME is not set
-CONFIG_START_YEAR=2014
-CONFIG_START_MONTH=7
-CONFIG_START_DAY=29
-CONFIG_DEV_CONSOLE=y
-# CONFIG_MUTEX_TYPES is not set
-# CONFIG_PRIORITY_INHERITANCE is not set
-# CONFIG_FDCLONE_DISABLE is not set
-# CONFIG_FDCLONE_STDIO is not set
-CONFIG_SDCLONE_DISABLE=y
-CONFIG_SCHED_WAITPID=y
-# CONFIG_SCHED_STARTHOOK is not set
-# CONFIG_SCHED_ATEXIT is not set
-# CONFIG_SCHED_ONEXIT is not set
-CONFIG_USER_ENTRYPOINT="nor_main"
-CONFIG_DISABLE_OS_API=y
-# CONFIG_DISABLE_CLOCK is not set
-# CONFIG_DISABLE_POSIX_TIMERS is not set
-# CONFIG_DISABLE_PTHREAD is not set
-# CONFIG_DISABLE_SIGNALS is not set
-# CONFIG_DISABLE_MQUEUE is not set
-CONFIG_DISABLE_ENVIRON=y
-
-#
-# Signal Numbers
-#
-CONFIG_SIG_SIGUSR1=1
-CONFIG_SIG_SIGUSR2=2
-CONFIG_SIG_SIGALARM=3
-CONFIG_SIG_SIGCONDTIMEDOUT=16
-
-#
-# Sizes of configurable things (0 disables)
-#
-CONFIG_MAX_TASKS=16
-CONFIG_MAX_TASK_ARGS=4
-CONFIG_NPTHREAD_KEYS=4
-CONFIG_NFILE_DESCRIPTORS=8
-CONFIG_NFILE_STREAMS=8
-CONFIG_NAME_MAX=32
-CONFIG_PREALLOC_MQ_MSGS=4
-CONFIG_MQ_MAXMSGSIZE=32
-CONFIG_MAX_WDOGPARMS=2
-CONFIG_PREALLOC_WDOGS=4
-CONFIG_PREALLOC_TIMERS=4
-
-#
-# Stack and heap information
-#
-CONFIG_IDLETHREAD_STACKSIZE=1024
-CONFIG_USERMAIN_STACKSIZE=2048
-CONFIG_PTHREAD_STACK_MIN=256
-CONFIG_PTHREAD_STACK_DEFAULT=2048
-
-#
-# Device Drivers
-#
-CONFIG_DISABLE_POLL=y
-CONFIG_DEV_NULL=y
-# CONFIG_DEV_ZERO is not set
-# CONFIG_LOOP is not set
-# CONFIG_RAMDISK is not set
-# CONFIG_CAN is not set
-# CONFIG_ARCH_HAVE_PWM_PULSECOUNT is not set
-# CONFIG_PWM is not set
-# CONFIG_ARCH_HAVE_I2CRESET is not set
-# CONFIG_I2C is not set
-# CONFIG_SPI is not set
-# CONFIG_I2S is not set
-# CONFIG_RTC is not set
-# CONFIG_WATCHDOG is not set
-# CONFIG_ANALOG is not set
-# CONFIG_AUDIO_DEVICES is not set
-# CONFIG_VIDEO_DEVICES is not set
-# CONFIG_BCH is not set
-# CONFIG_INPUT is not set
-# CONFIG_LCD is not set
-# CONFIG_MMCSD is not set
-# CONFIG_MTD is not set
-# CONFIG_PIPES is not set
-# CONFIG_PM is not set
-# CONFIG_POWER is not set
-# CONFIG_SENSORS is not set
-# CONFIG_SERCOMM_CONSOLE is not set
-CONFIG_SERIAL=y
-CONFIG_DEV_LOWCONSOLE=y
-# CONFIG_16550_UART is not set
-# CONFIG_ARCH_HAVE_UART is not set
-# CONFIG_ARCH_HAVE_UART0 is not set
-# CONFIG_ARCH_HAVE_UART1 is not set
-# CONFIG_ARCH_HAVE_UART2 is not set
-# CONFIG_ARCH_HAVE_UART3 is not set
-# CONFIG_ARCH_HAVE_UART4 is not set
-# CONFIG_ARCH_HAVE_UART5 is not set
-# CONFIG_ARCH_HAVE_UART6 is not set
-# CONFIG_ARCH_HAVE_UART7 is not set
-# CONFIG_ARCH_HAVE_UART8 is not set
-# CONFIG_ARCH_HAVE_SCI0 is not set
-# CONFIG_ARCH_HAVE_SCI1 is not set
-# CONFIG_ARCH_HAVE_USART0 is not set
-CONFIG_ARCH_HAVE_USART1=y
-# CONFIG_ARCH_HAVE_USART2 is not set
-# CONFIG_ARCH_HAVE_USART3 is not set
-# CONFIG_ARCH_HAVE_USART4 is not set
-# CONFIG_ARCH_HAVE_USART5 is not set
-# CONFIG_ARCH_HAVE_USART6 is not set
-# CONFIG_ARCH_HAVE_USART7 is not set
-# CONFIG_ARCH_HAVE_USART8 is not set
-
-#
-# USART Configuration
-#
-CONFIG_USART1_ISUART=y
-CONFIG_MCU_SERIAL=y
-CONFIG_USART1_SERIAL_CONSOLE=y
-# CONFIG_NO_SERIAL_CONSOLE is not set
-
-#
-# USART1 Configuration
-#
-CONFIG_USART1_RXBUFSIZE=256
-CONFIG_USART1_TXBUFSIZE=256
-CONFIG_USART1_BAUD=115200
-CONFIG_USART1_BITS=8
-CONFIG_USART1_PARITY=0
-CONFIG_USART1_2STOP=0
-# CONFIG_USART1_IFLOWCONTROL is not set
-# CONFIG_USART1_OFLOWCONTROL is not set
-# CONFIG_SERIAL_IFLOWCONTROL is not set
-# CONFIG_SERIAL_OFLOWCONTROL is not set
-# CONFIG_USBDEV is not set
-# CONFIG_USBHOST is not set
-# CONFIG_WIRELESS is not set
-
-#
-# System Logging Device Options
-#
-
-#
-# System Logging
-#
-# CONFIG_RAMLOG is not set
-
-#
-# Networking Support
-#
-# CONFIG_ARCH_HAVE_NET is not set
-# CONFIG_ARCH_HAVE_PHY is not set
-# CONFIG_NET is not set
-
-#
-# File Systems
-#
-
-#
-# File system configuration
-#
-CONFIG_DISABLE_MOUNTPOINT=y
-# CONFIG_DISABLE_PSEUDOFS_OPERATIONS is not set
-# CONFIG_FS_READABLE is not set
-# CONFIG_FS_WRITABLE is not set
-# CONFIG_FS_RAMMAP is not set
-# CONFIG_FS_PROCFS is not set
-
-#
-# System Logging
-#
-# CONFIG_SYSLOG_ENABLE is not set
-# CONFIG_SYSLOG is not set
-
-#
-# Graphics Support
-#
-# CONFIG_NX is not set
-
-#
-# Memory Management
-#
-# CONFIG_MM_MULTIHEAP is not set
-# CONFIG_MM_SMALL is not set
-CONFIG_MM_REGIONS=1
-# CONFIG_ARCH_HAVE_HEAP2 is not set
-# CONFIG_GRAN is not set
-
-#
-# Audio Support
-#
-# CONFIG_AUDIO is not set
-
-#
-# Binary Formats
-#
-# CONFIG_BINFMT_DISABLE is not set
-# CONFIG_NXFLAT is not set
-# CONFIG_ELF is not set
-# CONFIG_BUILTIN is not set
-# CONFIG_PIC is not set
-CONFIG_SYMTAB_ORDEREDBYNAME=y
-
-#
-# Library Routines
-#
-
-#
-# Standard C Library Options
-#
-CONFIG_STDIO_BUFFER_SIZE=64
-CONFIG_STDIO_LINEBUFFER=y
-CONFIG_NUNGET_CHARS=2
-# CONFIG_LIBM is not set
-# CONFIG_NOPRINTF_FIELDWIDTH is not set
-# CONFIG_LIBC_FLOATINGPOINT is not set
-CONFIG_LIB_RAND_ORDER=1
-# CONFIG_EOL_IS_CR is not set
-# CONFIG_EOL_IS_LF is not set
-# CONFIG_EOL_IS_BOTH_CRLF is not set
-CONFIG_EOL_IS_EITHER_CRLF=y
-# CONFIG_LIBC_EXECFUNCS is not set
-CONFIG_POSIX_SPAWN_PROXY_STACKSIZE=1024
-CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=2048
-# CONFIG_LIBC_STRERROR is not set
-# CONFIG_LIBC_PERROR_STDOUT is not set
-CONFIG_ARCH_LOWPUTC=y
-CONFIG_LIB_SENDFILE_BUFSIZE=512
-# CONFIG_ARCH_ROMGETC is not set
-# CONFIG_ARCH_OPTIMIZED_FUNCTIONS is not set
-
-#
-# Non-standard Library Support
-#
-# CONFIG_SCHED_WORKQUEUE is not set
-# CONFIG_LIB_KBDCODEC is not set
-# CONFIG_LIB_SLCDCODEC is not set
-
-#
-# Basic CXX Support
-#
-# CONFIG_C99_BOOL8 is not set
-# CONFIG_HAVE_CXX is not set
-
-#
-# Application Configuration
-#
-
-#
-# Built-In Applications
-#
-
-#
-# Examples
-#
-# CONFIG_EXAMPLES_BUTTONS is not set
-# CONFIG_EXAMPLES_CAN is not set
-# CONFIG_EXAMPLES_CONFIGDATA is not set
-# CONFIG_EXAMPLES_DHCPD is not set
-# CONFIG_EXAMPLES_ELF is not set
-# CONFIG_EXAMPLES_FTPC is not set
-# CONFIG_EXAMPLES_FTPD is not set
-CONFIG_EXAMPLES_HELLO=y
-# CONFIG_EXAMPLES_HELLOXX is not set
-# CONFIG_EXAMPLES_JSON is not set
-# CONFIG_EXAMPLES_HIDKBD is not set
-# CONFIG_EXAMPLES_KEYPADTEST is not set
-# CONFIG_EXAMPLES_IGMP is not set
-# CONFIG_EXAMPLES_MM is not set
-# CONFIG_EXAMPLES_MODBUS is not set
-# CONFIG_EXAMPLES_MOUNT is not set
-# CONFIG_EXAMPLES_NRF24L01TERM is not set
-# CONFIG_EXAMPLES_NSH is not set
-# CONFIG_EXAMPLES_NULL is not set
-# CONFIG_EXAMPLES_NX is not set
-# CONFIG_EXAMPLES_NXCONSOLE is not set
-# CONFIG_EXAMPLES_NXFFS is not set
-# CONFIG_EXAMPLES_NXFLAT is not set
-# CONFIG_EXAMPLES_NXHELLO is not set
-# CONFIG_EXAMPLES_NXIMAGE is not set
-# CONFIG_EXAMPLES_NXLINES is not set
-# CONFIG_EXAMPLES_NXTEXT is not set
-# CONFIG_EXAMPLES_OSTEST is not set
-# CONFIG_EXAMPLES_PASHELLO is not set
-# CONFIG_EXAMPLES_PIPE is not set
-# CONFIG_EXAMPLES_POLL is not set
-# CONFIG_EXAMPLES_POSIXSPAWN is not set
-# CONFIG_EXAMPLES_QENCODER is not set
-# CONFIG_EXAMPLES_RGMP is not set
-# CONFIG_EXAMPLES_ROMFS is not set
-# CONFIG_EXAMPLES_SENDMAIL is not set
-# CONFIG_EXAMPLES_SERLOOP is not set
-# CONFIG_EXAMPLES_SLCD is not set
-# CONFIG_EXAMPLES_SMART is not set
-# CONFIG_EXAMPLES_TCPECHO is not set
-# CONFIG_EXAMPLES_TELNETD is not set
-# CONFIG_EXAMPLES_THTTPD is not set
-# CONFIG_EXAMPLES_TIFF is not set
-# CONFIG_EXAMPLES_TOUCHSCREEN is not set
-# CONFIG_EXAMPLES_UDP is not set
-# CONFIG_EXAMPLES_UIP is not set
-# CONFIG_EXAMPLES_USBSERIAL is not set
-# CONFIG_EXAMPLES_USBTERM is not set
-# CONFIG_EXAMPLES_WATCHDOG is not set
-
-#
-# Graphics Support
-#
-# CONFIG_TIFF is not set
-
-#
-# Interpreters
-#
-# CONFIG_INTERPRETERS_FICL is not set
-# CONFIG_INTERPRETERS_PCODE is not set
-
-#
-# Network Utilities
-#
-
-#
-# Networking Utilities
-#
-# CONFIG_NETUTILS_CODECS is not set
-# CONFIG_NETUTILS_DHCPD is not set
-# CONFIG_NETUTILS_FTPC is not set
-# CONFIG_NETUTILS_FTPD is not set
-# CONFIG_NETUTILS_JSON is not set
-# CONFIG_NETUTILS_SMTP is not set
-# CONFIG_NETUTILS_TFTPC is not set
-# CONFIG_NETUTILS_THTTPD is not set
-# CONFIG_NETUTILS_UIPLIB is not set
-# CONFIG_NETUTILS_WEBCLIENT is not set
-
-#
-# FreeModBus
-#
-# CONFIG_MODBUS is not set
-
-#
-# NSH Library
-#
-# CONFIG_NSH_LIBRARY is not set
-
-#
-# NxWidgets/NxWM
-#
-
-#
-# Platform-specific Support
-#
-# CONFIG_PLATFORM_CONFIGDATA is not set
-
-#
-# System Libraries and NSH Add-Ons
-#
-
-#
-# Custom Free Memory Command
-#
-# CONFIG_SYSTEM_FREE is not set
-
-#
-# EMACS-like Command Line Editor
-#
-# CONFIG_SYSTEM_CLE is not set
-
-#
-# FLASH Program Installation
-#
-# CONFIG_SYSTEM_INSTALL is not set
-
-#
-# FLASH Erase-all Command
-#
-
-#
-# I2C tool
-#
-
-#
-# INI File Parser
-#
-# CONFIG_SYSTEM_INIFILE is not set
-
-#
-# NxPlayer media player library / command Line
-#
-# CONFIG_SYSTEM_NXPLAYER is not set
-
-#
-# RAM test
-#
-# CONFIG_SYSTEM_RAMTEST is not set
-
-#
-# readline()
-#
-# CONFIG_SYSTEM_READLINE is not set
-
-#
-# Power Off
-#
-# CONFIG_SYSTEM_POWEROFF is not set
-
-#
-# RAMTRON
-#
-# CONFIG_SYSTEM_RAMTRON is not set
-
-#
-# SD Card
-#
-# CONFIG_SYSTEM_SDCARD is not set
-
-#
-# Sysinfo
-#
-# CONFIG_SYSTEM_SYSINFO is not set
-
-#
-# VI Work-Alike Editor
-#
-# CONFIG_SYSTEM_VI is not set
-
-#
-# Stack Monitor
-#
-
-#
-# USB CDC/ACM Device Commands
-#
-
-#
-# USB Composite Device Commands
-#
-
-#
-# USB Mass Storage Device Commands
-#
-
-#
-# USB Monitor
-#
-
-#
-# Zmodem Commands
-#
-# CONFIG_SYSTEM_ZMODEM is not set
diff --git a/nuttx/configs/sama5d3-xplained/norboot/setenv.sh b/nuttx/configs/sama5d3-xplained/norboot/setenv.sh
deleted file mode 100755
index 51f65864f..000000000
--- a/nuttx/configs/sama5d3-xplained/norboot/setenv.sh
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/bash
-# configs/sama5d3-xplained/norboot/setenv.sh
-#
-#   Copyright (C) 2014 Gregory Nutt. All rights reserved.
-#   Author: Gregory Nutt <gnutt@nuttx.org>
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in
-#    the documentation and/or other materials provided with the
-#    distribution.
-# 3. Neither the name NuttX nor the names of its contributors may be
-#    used to endorse or promote products derived from this software
-#    without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
-# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-
-if [ "$_" = "$0" ] ; then
-  echo "You must source this script, not run it!" 1>&2
-  exit 1
-fi
-
-WD=`pwd`
-if [ ! -x "setenv.sh" ]; then
-  echo "This script must be executed from the top-level NuttX build directory"
-  exit 1
-fi
-
-if [ -z "${PATH_ORIG}" ]; then
-  export PATH_ORIG="${PATH}"
-fi
-
-# This is the Cygwin path to the location where I installed the Atmel GCC
-# toolchain under Windows.  You will also have to edit this if you install
-# this toolchain in any other location
-#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/Atmel/Atmel Toolchain/ARM GCC/Native/4.7.3.99/arm-gnu-toolchain/bin"
-
-# This is the Cygwin path to the location where I installed the CodeSourcery
-# toolchain under windows.  You will also have to edit this if you install
-# the CodeSourcery toolchain in any other location
-#export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery G++ Lite/bin"
-export TOOLCHAIN_BIN="/cygdrive/c/Program Files (x86)/CodeSourcery/Sourcery_CodeBench_Lite_for_ARM_EABI/bin"
-
-# These are the Cygwin paths to the locations where I installed the Atollic
-# toolchain under windows.  You will also have to edit this if you install
-# the Atollic toolchain in any other location.  /usr/bin is added before
-# the Atollic bin path because there is are binaries named gcc.exe and g++.exe
-# at those locations as well.
-#export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for ARM Pro 2.3.0/ARMTools/bin"
-#export TOOLCHAIN_BIN="/usr/bin:/cygdrive/c/Program Files (x86)/Atollic/TrueSTUDIO for STMicroelectronics STM32 Lite 2.3.0/ARMTools/bin"
-
-# This is the Cygwin path to the location where I build the buildroot
-# toolchain.
-#export TOOLCHAIN_BIN="${WD}/../misc/buildroot/build_arm/staging_dir/bin"
-
-# Add the path to the toolchain to the PATH varialble
-export PATH="${TOOLCHAIN_BIN}:/sbin:/usr/sbin:${PATH_ORIG}"
-
-echo "PATH : ${PATH}"
diff --git a/nuttx/configs/sama5d3-xplained/nsh/Make.defs b/nuttx/configs/sama5d3-xplained/nsh/Make.defs
index 59f0fd0b6..7320653fe 100644
--- a/nuttx/configs/sama5d3-xplained/nsh/Make.defs
+++ b/nuttx/configs/sama5d3-xplained/nsh/Make.defs
@@ -45,26 +45,6 @@ ifeq ($(CONFIG_SAMA5_BOOT_SDRAM),y)
   LDSCRIPT = ddram.ld
 endif
 
-ifeq ($(CONFIG_SAMA5_BOOT_CS0FLASH),y)
-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
-endif
-
-ifeq ($(CONFIG_SAMA5_BOOT_CS2FLASH),y)
-#  LDSCRIPT = cs2flash.ld
-endif
-
-ifeq ($(CONFIG_SAMA5_BOOT_CS3FLASH),y)
-#  LDSCRIPT = cs3flash.ld
-endif
-
 ifeq ($(WINTOOL),y)
   # Windows-native toolchains
   ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)$(DELIM)include}"
diff --git a/nuttx/configs/sama5d3-xplained/nsh/defconfig b/nuttx/configs/sama5d3-xplained/nsh/defconfig
index 71f1f3d89..95a81b5d1 100644
--- a/nuttx/configs/sama5d3-xplained/nsh/defconfig
+++ b/nuttx/configs/sama5d3-xplained/nsh/defconfig
@@ -185,22 +185,14 @@ CONFIG_SAMA5_USART1=y
 #
 # External Memory Configuration
 #
-CONFIG_SAMA5_EBICS0=y
-CONFIG_SAMA5_EBICS0_SIZE=134217728
-# CONFIG_SAMA5_EBICS0_SRAM is not set
-# CONFIG_SAMA5_EBICS0_PSRAM is not set
-# CONFIG_SAMA5_EBICS0_PROM is not set
-# CONFIG_SAMA5_EBICS0_EEPROM is not set
-# CONFIG_SAMA5_EBICS0_EPROM is not set
-# CONFIG_SAMA5_EBICS0_LCD is not set
-CONFIG_SAMA5_EBICS0_NOR=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 is not set
-CONFIG_SAMA5_BOOT_CS0FLASH=y
+CONFIG_SAMA5_BOOT_SDRAM=y
 
 #
 # Heap Configuration
@@ -244,20 +236,17 @@ CONFIG_ARCH_INTERRUPTSTACK=2048
 # Boot options
 #
 # CONFIG_BOOT_RUNFROMEXTSRAM is not set
-CONFIG_BOOT_RUNFROMFLASH=y
+# CONFIG_BOOT_RUNFROMFLASH is not set
 # CONFIG_BOOT_RUNFROMISRAM is not set
-# CONFIG_BOOT_RUNFROMSDRAM is not set
+CONFIG_BOOT_RUNFROMSDRAM=y
 # CONFIG_BOOT_COPYTORAM is not set
 
 #
 # Boot Memory Configuration
 #
-CONFIG_RAM_START=0x00304000
-CONFIG_RAM_VSTART=0x00304000
-CONFIG_RAM_SIZE=114688
-CONFIG_FLASH_START=0x10000000
-CONFIG_FLASH_VSTART=0x10000000
-CONFIG_FLASH_SIZE=134217728
+CONFIG_RAM_START=0x20000000
+CONFIG_RAM_VSTART=0x20000000
+CONFIG_RAM_SIZE=268435456
 # CONFIG_ARCH_HAVE_SDRAM is not set
 
 #
diff --git a/nuttx/configs/sama5d3-xplained/scripts/ddram.ld b/nuttx/configs/sama5d3-xplained/scripts/ddram.ld
index 96e343239..84a52de51 100644
--- a/nuttx/configs/sama5d3-xplained/scripts/ddram.ld
+++ b/nuttx/configs/sama5d3-xplained/scripts/ddram.ld
@@ -33,8 +33,8 @@
  *
  ****************************************************************************/
 
-/* The SAMA5D3 has 128 KB of ISRAM beginning at virtual address 0x0030:0000.
- * This memory configuration, however, loads into the 64 MB SDRAM on board
+/* The SAMA5D36 has 128 KB of ISRAM beginning at virtual address 0x0030:0000.
+ * This memory configuration, however, loads into the 256 MB SDRAM on board
  * the SAMA5D3-Xplained which lies at 0x2000:0000
  *
  * Vectors in low memory are assumed and 16KB of ISRAM is reserved at the
@@ -44,7 +44,7 @@
 MEMORY
 {
 	isram (W!RX) : ORIGIN = 0x300000, LENGTH = 128K - 16K
-	sdram (W!RX) : ORIGIN = 0x20000000, LENGTH = 64M
+	sdram (W!RX) : ORIGIN = 0x20000000, LENGTH = 256M
 }
 
 OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
diff --git a/nuttx/configs/sama5d3-xplained/scripts/isram.ld b/nuttx/configs/sama5d3-xplained/scripts/isram.ld
index 473cd6b21..dae430c30 100644
--- a/nuttx/configs/sama5d3-xplained/scripts/isram.ld
+++ b/nuttx/configs/sama5d3-xplained/scripts/isram.ld
@@ -33,7 +33,7 @@
  *
  ****************************************************************************/
 
-/* The SAMA5D3 has 128 KB of ISRAM beginning at virtual address 0x0030:0000.
+/* The SAMA5D36 has 128 KB of ISRAM beginning at virtual address 0x0030:0000.
  *
  * Vectors in low memory are assumed and 16KB of ISRAM is reserved at the
  * high end of ISRAM for the page table.
diff --git a/nuttx/configs/sama5d3-xplained/scripts/nor-ddram.ld b/nuttx/configs/sama5d3-xplained/scripts/nor-ddram.ld
deleted file mode 100644
index f74d7bcf5..000000000
--- a/nuttx/configs/sama5d3-xplained/scripts/nor-ddram.ld
+++ /dev/null
@@ -1,131 +0,0 @@
-/****************************************************************************
- * configs/sama5d3-xplained/scripts/nor-ddram.ld
- *
- *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <gnutt@nuttx.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name NuttX nor the names of its contributors may be
- *    used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ****************************************************************************/
-
-/* The SAMA5D3-Xplained has 128MB of NOR flash at CS0 (0x1000:0000).  In this
- * configuration, the .text and a copy of the .data section will be loaded
- * into NOR flash.  NuttX .data, .bss, the IDLE stack, and the primary
- * heap will be allocated in SRAM.  The SAMA5D3 has 128 KB of ISRAM beginning
- * at virtual address 0x0030:0000.
- *
- * The SAMA5D3 has 128 KB of ISRAM beginning at virtual address 0x0030:0000
- * And 256Mb of SDRAm at address 0x2000:0000.  This script assumes ISRAM used
- * only for the page table.  All variables are retained in SDRAM.
- *
- * Vectors in low memory are assumed to reside at the beginning of NOR flash.
- */
-
-MEMORY
-{
-	norflash (W!RX) : ORIGIN = 0x10000000, LENGTH = 128M
-	isram    (WR)   : ORIGIN = 0x00304000, LENGTH = 128K - 16K
-	sdram    (W!RX) : ORIGIN = 0x20000000, LENGTH = 256K
-}
-
-OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
-OUTPUT_ARCH(arm)
-ENTRY(entry)
-ENTRY(_stext)
-
-SECTIONS
-{
-	.text : {
-		_stext = ABSOLUTE(.);
-		*(.vectors)
-		*(.text .text.*)
-		*(.fixup)
-		*(.gnu.warning)
-		*(.rodata .rodata.*)
-		*(.gnu.linkonce.t.*)
-		*(.glue_7)
-		*(.glue_7t)
-		*(.got)
-		*(.gcc_except_table)
-		*(.gnu.linkonce.r.*)
-		*(.ARM.extab*)
-		*(.gnu.linkonce.armextab.*)
-		_etext = ABSOLUTE(.);
-	} > norflash
-
-	.init_section : {
-		_sinit = ABSOLUTE(.);
-		*(.init_array .init_array.*)
-		_einit = ABSOLUTE(.);
-	} > norflash
-
-	.ARM.extab : {
-		*(.ARM.extab*)
-	} > norflash
-
-	/* .ARM.exidx is sorted, so has to go in its own output section.  */
-
-	PROVIDE_HIDDEN (__exidx_start = .);
-	.ARM.exidx :
-	{
-		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
-	} > norflash
-	PROVIDE_HIDDEN (__exidx_end = .);
-
-	.data : {
-		_sdata = ABSOLUTE(.);
-		*(.data .data.*)
-		*(.gnu.linkonce.d.*)
-		CONSTRUCTORS
-		_edata = ABSOLUTE(.);
-	} > sdram AT > norflash
-
-	_eronly = LOADADDR(.data);
-
-	.bss : {
-		_sbss = ABSOLUTE(.);
-		*(.bss .bss.*)
-		*(.gnu.linkonce.b.*)
-		*(COMMON)
-		_ebss = ABSOLUTE(.);
-	} > sdram
-
-	/* Stabs debugging sections. */
-	.stab 0 : { *(.stab) }
-	.stabstr 0 : { *(.stabstr) }
-	.stab.excl 0 : { *(.stab.excl) }
-	.stab.exclstr 0 : { *(.stab.exclstr) }
-	.stab.index 0 : { *(.stab.index) }
-	.stab.indexstr 0 : { *(.stab.indexstr) }
-	.comment 0 : { *(.comment) }
-	.debug_abbrev 0 : { *(.debug_abbrev) }
-	.debug_info 0 : { *(.debug_info) }
-	.debug_line 0 : { *(.debug_line) }
-	.debug_pubnames 0 : { *(.debug_pubnames) }
-	.debug_aranges 0 : { *(.debug_aranges) }
-}
diff --git a/nuttx/configs/sama5d3-xplained/scripts/nor-isram.ld b/nuttx/configs/sama5d3-xplained/scripts/nor-isram.ld
deleted file mode 100644
index 486624b04..000000000
--- a/nuttx/configs/sama5d3-xplained/scripts/nor-isram.ld
+++ /dev/null
@@ -1,127 +0,0 @@
-/****************************************************************************
- * configs/sama5d3-xplained/scripts/nor-isram.ld
- *
- *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <gnutt@nuttx.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name NuttX nor the names of its contributors may be
- *    used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ****************************************************************************/
-
-/* The SAMA5D3-Xplained has 128MB of NOR flash at CS0 (0x1000:0000).  In this
- * configuration, the .text and a copy of the .data section will be loaded
- * into NOR flash.  NuttX .data, .bss, the IDLE stack, and the primary
- * heap will be allocated in SRAM.  The SAMA5D3 has 128 KB of ISRAM beginning
- * at virtual address 0x0030:0000.
- *
- * Vectors in low memory are assumed to reside at the beginning of NOR flash
- * 16KB of ISRAM is reserved at the beginning of ISRAM for the page table.
- */
-
-MEMORY
-{
-	norflash (W!RX) : ORIGIN = 0x10000000, LENGTH = 128M
-	isram    (WR)   : ORIGIN = 0x00304000, LENGTH = 128K - 16K
-}
-
-OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
-OUTPUT_ARCH(arm)
-ENTRY(entry)
-ENTRY(_stext)
-
-SECTIONS
-{
-	.text : {
-		_stext = ABSOLUTE(.);
-		*(.vectors)
-		*(.text .text.*)
-		*(.fixup)
-		*(.gnu.warning)
-		*(.rodata .rodata.*)
-		*(.gnu.linkonce.t.*)
-		*(.glue_7)
-		*(.glue_7t)
-		*(.got)
-		*(.gcc_except_table)
-		*(.gnu.linkonce.r.*)
-		*(.ARM.extab*)
-		*(.gnu.linkonce.armextab.*)
-		_etext = ABSOLUTE(.);
-	} > norflash
-
-	.init_section : {
-		_sinit = ABSOLUTE(.);
-		*(.init_array .init_array.*)
-		_einit = ABSOLUTE(.);
-	} > norflash
-
-	.ARM.extab : {
-		*(.ARM.extab*)
-	} > norflash
-
-	/* .ARM.exidx is sorted, so has to go in its own output section.  */
-
-	PROVIDE_HIDDEN (__exidx_start = .);
-	.ARM.exidx :
-	{
-		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
-	} > norflash
-	PROVIDE_HIDDEN (__exidx_end = .);
-
-	.data : {
-		_sdata = ABSOLUTE(.);
-		*(.data .data.*)
-		*(.gnu.linkonce.d.*)
-		CONSTRUCTORS
-		_edata = ABSOLUTE(.);
-	} > isram AT > norflash
-
-	_eronly = LOADADDR(.data);
-
-	.bss : {
-		_sbss = ABSOLUTE(.);
-		*(.bss .bss.*)
-		*(.gnu.linkonce.b.*)
-		*(COMMON)
-		_ebss = ABSOLUTE(.);
-	} > isram
-
-	/* Stabs debugging sections. */
-	.stab 0 : { *(.stab) }
-	.stabstr 0 : { *(.stabstr) }
-	.stab.excl 0 : { *(.stab.excl) }
-	.stab.exclstr 0 : { *(.stab.exclstr) }
-	.stab.index 0 : { *(.stab.index) }
-	.stab.indexstr 0 : { *(.stab.indexstr) }
-	.comment 0 : { *(.comment) }
-	.debug_abbrev 0 : { *(.debug_abbrev) }
-	.debug_info 0 : { *(.debug_info) }
-	.debug_line 0 : { *(.debug_line) }
-	.debug_pubnames 0 : { *(.debug_pubnames) }
-	.debug_aranges 0 : { *(.debug_aranges) }
-}
diff --git a/nuttx/configs/sama5d3-xplained/scripts/pg-sram.ld b/nuttx/configs/sama5d3-xplained/scripts/pg-sram.ld
deleted file mode 100644
index 1c961b9ca..000000000
--- a/nuttx/configs/sama5d3-xplained/scripts/pg-sram.ld
+++ /dev/null
@@ -1,158 +0,0 @@
-/****************************************************************************
- * configs/sama5d3-xplained/scripts/pg-isram.ld
- *
- *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <gnutt@nuttx.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name NuttX nor the names of its contributors may be
- *    used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ****************************************************************************/
-
-/* The SAMA5D3 has 128 KB of ISRAM beginning at virtual address 0x0030:0000.
- * The .text vitual address space begins at the same location as the physical
- * address space:  0x0030:0000.  The virtual space is broken up into three
- * regions:
- *
- *                                           PHYSICAL         VIRTUAL
- *   NAME    DESCRIPTION                 SIZE    START    SIZE    START
- *  -------- -------------------------- ----- ----------- ------- -----------
- *   locked  Pages locked in memory.     40KB 0x0030:0000  40KB   0x0030:0000
- *   paged   Pages in nonvolatile store. 48KB 0x0030:a000  48KB   0x0030:a000
- *   data    .data/.bss/heap.            24KB 0x0031:6000  24KB   0x0031:6000
- *           Reserved for page table     16KB 0x0031:c000  16KB   0x0031:c000
- *  -------- -------------------------- ----- ----------- ------- -----------
- *                                      128KB 0x0032 0000 128KB   0x0032 0000
- *
- * These region sizes must match the size in pages specified for each region
- * in the NuttX configuration file:  CONFIG_PAGING_NLOCKED, CONFIG_PAGING_NVPAGED,
- * and CONFIG_PAGING_NDATA.
- *
- * NOTE 1: The locked region is should be big here so that you can enable lots of
- * debug output without overflowing the locked region.  32KB would probably be
- * plenty if this were a real, optimized application.
- *
- * NOTE 2: Different compilers will compile the code to different sizes.  If you
- * get a link time error saying that the locked region is full, you may have to
- * re-organize this memory layout (here and in defconfig) to make the locked
- * region even bigger.
- *
- * NOTE 3: Vectors in low memory are assumed and 16KB of ISRAM is reserved at
- * the high end of ISRAM for the page table (?).
- */
-
-MEMORY
-{
-    locked (rx) : ORIGIN = 0x00300000, LENGTH = 40K
-    paged  (rx) : ORIGIN = 0x0030a000, LENGTH = 48K
-    data   (rw) : ORIGIN = 0x00316000, LENGTH = 24K
-}
-
-OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
-OUTPUT_ARCH(arm)
-ENTRY(entry)
-ENTRY(_stext)
-
-SECTIONS
-{
-	.locked : {
-		_slocked = ABSOLUTE(.);
-		*(.vectors)
-		up_head.o locked.r (.text .text.*)
-		up_head.o locked.r (.fixup)
-		up_head.o locked.r (.gnu.warning)
-		up_head.o locked.r (.rodata .rodata.*)
-		up_head.o locked.r (.gnu.linkonce.t.*)
-		up_head.o locked.r (.glue_7)
-		up_head.o locked.r (.glue_7t)
-		up_head.o locked.r (.got)
-		up_head.o locked.r (.gcc_except_table)
-		up_head.o locked.r (.gnu.linkonce.r.*)
-		_elocked = ABSOLUTE(.);
-	} >locked
-
-	.init_section : {
-		_sinit = ABSOLUTE(.);
-		*(.init_array .init_array.*)
-		_einit = ABSOLUTE(.);
-	} > locked
-
-	/* .ARM.exidx is sorted, so has to go in its own output section.  */
-
-	PROVIDE_HIDDEN (__exidx_start = .);
-	.ARM.exidx :
-	{
-		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
-	} > isram
-	PROVIDE_HIDDEN (__exidx_end = .);
-
-	.paged : {
-		_spaged = ABSOLUTE(.);
-		*(.text .text.*)
-		*(.fixup)
-		*(.gnu.warning)
-		*(.rodata .rodata.*)
-		*(.gnu.linkonce.t.*)
-		*(.glue_7)
-		*(.glue_7t)
-		*(.got)
-		*(.gcc_except_table)
-		*(.gnu.linkonce.r.*)
-		*(.ARM.extab*)
-		*(.gnu.linkonce.armextab.*)
-		_epaged = ABSOLUTE(.);
-	} > paged
-
-	.data : {
-		_sdata = ABSOLUTE(.);
-		*(.data .data.*)
-		*(.gnu.linkonce.d.*)
-		CONSTRUCTORS
-		_edata = ABSOLUTE(.);
-	} > data AT > locked
-
-	.bss : {
-		_sbss = ABSOLUTE(.);
-		*(.bss .bss.*)
-		*(.gnu.linkonce.b.*)
-		*(COMMON)
-		_ebss = ABSOLUTE(.);
-	} > data
-					/* Stabs debugging sections.	*/
-	.stab 0 : { *(.stab) }
-	.stabstr 0 : { *(.stabstr) }
-	.stab.excl 0 : { *(.stab.excl) }
-	.stab.exclstr 0 : { *(.stab.exclstr) }
-	.stab.index 0 : { *(.stab.index) }
-	.stab.indexstr 0 : { *(.stab.indexstr) }
-	.comment 0 : { *(.comment) }
-	.debug_abbrev 0 : { *(.debug_abbrev) }
-	.debug_info 0 : { *(.debug_info) }
-	.debug_line 0 : { *(.debug_line) }
-	.debug_pubnames 0 : { *(.debug_pubnames) }
-	.debug_aranges 0 : { *(.debug_aranges) }
-}
diff --git a/nuttx/configs/sama5d3-xplained/src/Makefile b/nuttx/configs/sama5d3-xplained/src/Makefile
index 7872db7ac..6262b7c5e 100644
--- a/nuttx/configs/sama5d3-xplained/src/Makefile
+++ b/nuttx/configs/sama5d3-xplained/src/Makefile
@@ -58,18 +58,10 @@ ifeq ($(CONFIG_SAMA5_DDRCS),y)
 CSRCS += sam_sdram.c
 endif
 
-ifeq ($(CONFIG_SAMA5_EBICS0_NOR),y)
-CSRCS += sam_norflash.c
-endif
-
 ifeq ($(CONFIG_SAMA5_EBICS3_NAND),y)
 CSRCS += sam_nandflash.c
 endif
 
-ifeq ($(CONFIG_SAMA5D3XPLAINED_NOR_MAIN),y)
-CSRCS += nor_main.c
-endif
-
 ifeq ($(CONFIG_MTD_AT25),y)
 ifeq ($(CONFIG_SAMA5_SPI0),y)
 CSRCS += sam_at25.c
diff --git a/nuttx/configs/sama5d3-xplained/src/nor_main.c b/nuttx/configs/sama5d3-xplained/src/nor_main.c
deleted file mode 100644
index 2c7120475..000000000
--- a/nuttx/configs/sama5d3-xplained/src/nor_main.c
+++ /dev/null
@@ -1,195 +0,0 @@
-/*****************************************************************************
- * configs/sama5d3-xplained/src/nor_main.c
- *
- *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <gnutt@nuttx.org>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name NuttX nor the names of its contributors may be
- *    used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <stdio.h>
-#include <debug.h>
-
-#include <arch/irq.h>
-
-#include "up_arch.h"
-#include "mmu.h"
-#include "cache.h"
-
-#include "sam_periphclks.h"
-#include "chip/sam_hsmc.h"
-#include "chip/sam_matrix.h"
-#include "chip/sam_aximx.h"
-
-#include "sama5d3-xplained.h"
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-#define NOR_ENTRY ((nor_entry_t)SAM_EBICS0_VSECTION)
-
-/****************************************************************************
- * Private Types
- ****************************************************************************/
-
-typedef void (*nor_entry_t)(void);
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: nor_main
- *
- * Description:
- *   nor_main is a tiny program that runs in ISRAM.  nor_main will enable
- *   NOR flash then jump to the program in NOR flash
- *
- ****************************************************************************/
-
-int nor_main(int argc, char *argv)
-{
-  uint32_t regval;
-
-#ifdef CONFIG_SAMA5D3XPLAINED_NOR_START
-  printf("Configuring and booting from NOR FLASH on CS0\n");
-#else
-  printf("Configuring NOR FLASH on CS0 and halting\n");
-#endif
-
-  /* Make sure that the SMC peripheral is enabled (But of course it is... we
-   * are executing from NOR FLASH now).
-   */
-
-  sam_hsmc_enableclk();
-
-  /* The SAMA5D3-Xplained has 118MB of 16-bit NOR FLASH at CS0.  The NOR FLASH
-   * has already been configured by the first level ROM bootloader... we
-   * simply need to modify the timing here.
-   */
-
-  regval = HSMC_SETUP_NWE_SETUP(1) |  HSMC_SETUP_NCS_WRSETUP(0) |
-           HSMC_SETUP_NRD_SETUP(2) | HSMC_SETUP_NCS_RDSETUP(0);
-  putreg32(regval, SAM_HSMC_SETUP(HSMC_CS0));
-
-  regval = HSMC_PULSE_NWE_PULSE(10) | HSMC_PULSE_NCS_WRPULSE(10) |
-           HSMC_PULSE_NRD_PULSE(11) | HSMC_PULSE_NCS_RDPULSE(11);
-  putreg32(regval, SAM_HSMC_PULSE(HSMC_CS0));
-
-  regval = HSMC_CYCLE_NWE_CYCLE(11) | HSMC_CYCLE_NRD_CYCLE(14);
-  putreg32(regval, SAM_HSMC_CYCLE(HSMC_CS0));
-
-  regval = HSMC_TIMINGS_TCLR(0) | HSMC_TIMINGS_TADL(0) |
-           HSMC_TIMINGS_TAR(0) | HSMC_TIMINGS_TRR(0) |
-           HSMC_TIMINGS_TWB(0) | HSMC_TIMINGS_RBNSEL(0);
-  putreg32(regval, SAM_HSMC_TIMINGS(HSMC_CS0));
-
-  regval = HSMC_MODE_READMODE | HSMC_MODE_WRITEMODE |
-           HSMC_MODE_EXNWMODE_DISABLED | HSMC_MODE_BIT_16 |
-           HSMC_MODE_TDFCYCLES(1);
-  putreg32(regval, SAM_HSMC_MODE(HSMC_CS0));
-
-  /* Interrupts must be disabled through the following.  In this configuration,
-   * there should only be timer interrupts.  Your NuttX configuration must use
-   * CONFIG_SERIAL_LOWCONSOLE=y or printf() will hang when the interrupts
-   * are disabled!
-   */
-
-  (void)irqsave();
-
-  /* Disable MATRIX write protection */
-
-#if 0 /* Disabled on reset */
-  putreg32(MATRIX_WPMR_WPKEY, SAM_MATRIX_WPMR);
-#endif
-
-  /* Set remap state 1.
-   *
-   *   Boot state:    ROM is seen at address 0x00000000
-   *   Remap State 0: SRAM is seen at address 0x00000000 (through AHB slave
-   *                  interface) instead of ROM.
-   *   Remap State 1: HEBI is seen at address 0x00000000 (through AHB slave
-   *                  interface) instead of ROM for external boot.
-   *
-   * REVISIT:  This does not work.  No matter what I do, the internal
-   * SRAM is always visible at address zero.  I am missing something.
-   */
-
-  putreg32(MATRIX_MRCR_RCB0, SAM_MATRIX_MRCR);   /* Enable remap */
-  putreg32(AXIMX_REMAP_REMAP1, SAM_AXIMX_REMAP); /* Remap HEBI */
-
-  /* Restore MATRIX write protection */
-
-#if 0 /* Disabled on reset */
-  putreg32(MATRIX_WPMR_WPKEY | MATRIX_WPMR_WPEN, SAM_MATRIX_WPMR);
-#endif
-
-  /* Disable the caches and the MMU.  Disabling the MMU should be safe here
-   * because there is a 1-to-1 identity mapping between the physical and
-   * virtual addressing.
-   */
-
-  /* NOTE:  This generates crashes and lots of error, but does leave the
-   * system in the proper state to run from NOR:  very ugly but usable.
-   * Better than the alternative.
-   */
-
-  cp15_disable_mmu();
-  cp15_disable_caches();
-
-  /* Invalidate caches and TLBs */
-
-  cp15_invalidate_icache();
-  cp15_invalidate_dcache_all();
-  cp15_invalidate_tlbs();
-
-#ifdef CONFIG_SAMA5D3XPLAINED_NOR_START
-  /* Then jump into NOR flash */
-
-  NOR_ENTRY();
-
-#else
-  /* Or just wait patiently for the user to break in with GDB. */
-
-  for (;;);
-#endif
-
-  return 0; /* We should not get here in either case */
-}
diff --git a/nuttx/configs/sama5d3-xplained/src/sam_autoleds.c b/nuttx/configs/sama5d3-xplained/src/sam_autoleds.c
index 73429e816..4e5e08fa0 100644
--- a/nuttx/configs/sama5d3-xplained/src/sam_autoleds.c
+++ b/nuttx/configs/sama5d3-xplained/src/sam_autoleds.c
@@ -64,7 +64,7 @@
  *   LED_IDLE          N/A MCU is is sleep mode         Not used
  *
  * Thus if the blue LED is statically on, NuttX has successfully booted and
- * is, apparently, running normmally.  If the red is flashing at
+ * is, apparently, running normally.  If the red is flashing at
  * approximately 2Hz, then a fatal error has been detected and the system
  * has halted.
  */
diff --git a/nuttx/configs/sama5d3-xplained/src/sam_nandflash.c b/nuttx/configs/sama5d3-xplained/src/sam_nandflash.c
index 19572b075..270b3624d 100644
--- a/nuttx/configs/sama5d3-xplained/src/sam_nandflash.c
+++ b/nuttx/configs/sama5d3-xplained/src/sam_nandflash.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/sama5d3-xplained/src/sam_norflash.c
+ * configs/sama5d3-xplained/src/sam_nandflash.c
  *
  *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>
diff --git a/nuttx/configs/sama5d3-xplained/src/sam_norflash.c b/nuttx/configs/sama5d3-xplained/src/sam_norflash.c
deleted file mode 100644
index 871461a5a..000000000
--- a/nuttx/configs/sama5d3-xplained/src/sam_norflash.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/****************************************************************************
- * configs/sama5d3-xplained/src/sam_norflash.c
- *
- *   Copyright (C) 2014 Gregory Nutt. All rights reserved.
- *   Author: Gregory Nutt <gnutt@nuttx.org>
- *
- * Most of this file derives from Atmel sample code for the SAMA5D3-Xplained
- * board.  That sample code has licensing that is compatible with the NuttX
- * modified BSD license:
- *
- *   Copyright (c) 2012, Atmel Corporation
- *   All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- * 3. Neither the name NuttX nor Atmel nor the names of its contributors may
- *    be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
- * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
- * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- *
- ****************************************************************************/
-
-/****************************************************************************
- * Included Files
- ****************************************************************************/
-
-#include <nuttx/config.h>
-
-#include <debug.h>
-
-#include "up_arch.h"
-#include "sam_periphclks.h"
-#include "chip/sam_hsmc.h"
-
-#include "sama5d3-xplained.h"
-
-#ifdef CONFIG_SAMA5_BOOT_CS0FLASH
-
-/****************************************************************************
- * Pre-processor Definitions
- ****************************************************************************/
-
-/****************************************************************************
- * Private Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Public Functions
- ****************************************************************************/
-
-/****************************************************************************
- * Name: board_norflash_config
- *
- * Description:
- *   If CONFIG_SAMA5_BOOT_CS0FLASH, then the system is boot directly off
- *   CS0 NOR FLASH.  In this case, we assume that we get here from the
- *   primary boot loader under these conditions:
- *
- *     "If BMS signal is tied to 0, BMS_BIT is read at 1.  The ROM Code
- *      allows execution of the code contained into the memory connected to
- *      Chip Select 0 of the External Bus Interface.
- *
- *     "To achieve that, the following sequence is preformed by the ROM
- *      Code:
- *
- *        - The main clock is the on-chip 12 MHz RC oscillator,
- *        - The Static Memory Controller is configured with timing allowing
- *          code execution inCS0 external memory at 12 MHz
- *        - AXI matrix is configured to remap EBI CS0 address at 0x0
- *        - 0x0 is loaded in the Program Counter register
- *
- *     "The user software in the external memory must perform the next
- *      operation in order to complete the clocks and SMC timings
- *      configuration to run at a higher clock frequency:
- *
- *        - Enable the 32768 Hz oscillator if best accuracy is needed
- *        - Reprogram the SMC setup, cycle, hold, mode timing registers
- *          for EBI CS0, to adapt them to the new clock
- *        - Program the PMC (Main Oscillator Enable or Bypass mode)
- *        - Program and Start the PLL
- *        - Switch the system clock to the new value"
- *
- *   This function provides the board-specific implementation of the logic
- *   to reprogram the SMC.
- *
- ****************************************************************************/
-
-void board_norflash_config(void)
-{
-  uint32_t regval;
-
-  /* Make sure that the SMC peripheral is enabled (But of course it is... we
-   * are executing from NOR FLASH now).
-   */
-
-  sam_hsmc_enableclk();
-
-  /* The SAMA5D3-Xplained has 118MB of 16-bit NOR FLASH at CS0.  The NOR FLASH
-   * has already been configured by the first level ROM bootloader... we
-   * simply need to modify the timing here.
-   */
-
-  regval = HSMC_SETUP_NWE_SETUP(1) |  HSMC_SETUP_NCS_WRSETUP(0) |
-           HSMC_SETUP_NRD_SETUP(2) | HSMC_SETUP_NCS_RDSETUP(0);
-  putreg32(regval, SAM_HSMC_SETUP(HSMC_CS0));
-
-  regval = HSMC_PULSE_NWE_PULSE(10) | HSMC_PULSE_NCS_WRPULSE(10) |
-           HSMC_PULSE_NRD_PULSE(11) | HSMC_PULSE_NCS_RDPULSE(11);
-  putreg32(regval, SAM_HSMC_PULSE(HSMC_CS0));
-
-  regval = HSMC_CYCLE_NWE_CYCLE(11) | HSMC_CYCLE_NRD_CYCLE(14);
-  putreg32(regval, SAM_HSMC_CYCLE(HSMC_CS0));
-
-  regval = HSMC_TIMINGS_TCLR(0) | HSMC_TIMINGS_TADL(0) |
-           HSMC_TIMINGS_TAR(0) | HSMC_TIMINGS_TRR(0) |
-           HSMC_TIMINGS_TWB(0) | HSMC_TIMINGS_RBNSEL(0);
-  putreg32(regval, SAM_HSMC_TIMINGS(HSMC_CS0));
-
-  regval = HSMC_MODE_READMODE | HSMC_MODE_WRITEMODE |
-           HSMC_MODE_EXNWMODE_DISABLED | HSMC_MODE_BIT_16 |
-           HSMC_MODE_TDFCYCLES(1);
-  putreg32(regval, SAM_HSMC_MODE(HSMC_CS0));
-}
-
-#endif /* CONFIG_SAMA5_BOOT_CS0FLASH */
diff --git a/nuttx/configs/sama5d3x-ek/src/sam_autoleds.c b/nuttx/configs/sama5d3x-ek/src/sam_autoleds.c
index f0a5da5b7..ef255f4d3 100644
--- a/nuttx/configs/sama5d3x-ek/src/sam_autoleds.c
+++ b/nuttx/configs/sama5d3x-ek/src/sam_autoleds.c
@@ -64,7 +64,7 @@
  *   LED_IDLE          N/A MCU is is sleep mode         Not used
  *
  * Thus if the blue LED is statically on, NuttX has successfully booted and
- * is, apparently, running normmally.  If the red is flashing at
+ * is, apparently, running normally.  If the red is flashing at
  * approximately 2Hz, then a fatal error has been detected and the system
  * has halted.
  */
diff --git a/nuttx/configs/sama5d3x-ek/src/sam_nandflash.c b/nuttx/configs/sama5d3x-ek/src/sam_nandflash.c
index 6346f5d4d..8a620dcd1 100644
--- a/nuttx/configs/sama5d3x-ek/src/sam_nandflash.c
+++ b/nuttx/configs/sama5d3x-ek/src/sam_nandflash.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * configs/sama5d3x-ek/src/sam_norflash.c
+ * configs/sama5d3x-ek/src/sam_nandflash.c
  *
  *   Copyright (C) 2013 Gregory Nutt. All rights reserved.
  *   Author: Gregory Nutt <gnutt@nuttx.org>