SAMA5: Add a missing endif in a Make.defs that recently added; Several other cosmetic changes

2014-01-28 18:59:11 -06:00 · 2014-01-28 18:59:11 -06:00 · 374594ded3
commit 374594ded3
parent 6eee32c91d
9 changed files with 46 additions and 2 deletions
--- a/configs/sama5d3x-ek/README.txt
+++ b/configs/sama5d3x-ek/README.txt
@ -3140,7 +3140,10 @@ To-Do List
     Mem:     268430800       6864  268423936  268423936
     nsh>

-   This needs some further investigation and a little TLC.
+   Disabling debug and forcing either of the two debug outputs above also
+   eliminates the problem.  Replacing the debug output with a delay does
+   not solve the problem.  This needs some further investigation and a
+   little TLC.

 5) HSCMI TX DMA support is currently commented out.

--- a/configs/sama5d3x-ek/demo/Make.defs
+++ b/configs/sama5d3x-ek/demo/Make.defs
@ -40,21 +40,27 @@ include ${TOPDIR}$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-a$(DELIM)Toolch
 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
--- a/configs/sama5d3x-ek/hello/Make.defs
+++ b/configs/sama5d3x-ek/hello/Make.defs
@ -40,9 +40,11 @@ include ${TOPDIR}$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-a$(DELIM)Toolch
 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
@ -50,12 +52,15 @@ 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
--- a/configs/sama5d3x-ek/norboot/Make.defs
+++ b/configs/sama5d3x-ek/norboot/Make.defs
@ -40,9 +40,11 @@ include ${TOPDIR}$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-a$(DELIM)Toolch
 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
@ -50,12 +52,15 @@ 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
--- a/configs/sama5d3x-ek/nsh/Make.defs
+++ b/configs/sama5d3x-ek/nsh/Make.defs
@ -40,9 +40,11 @@ include ${TOPDIR}$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-a$(DELIM)Toolch
 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
@ -50,12 +52,15 @@ 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
--- a/configs/sama5d3x-ek/nx/Make.defs
+++ b/configs/sama5d3x-ek/nx/Make.defs
@ -40,9 +40,11 @@ include ${TOPDIR}$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-a$(DELIM)Toolch
 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
@ -50,12 +52,15 @@ 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
--- a/configs/sama5d3x-ek/nxwm/Make.defs
+++ b/configs/sama5d3x-ek/nxwm/Make.defs
@ -1,7 +1,7 @@
 ############################################################################
 # configs/sama5d3x-ek/nxwm/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
@ -40,9 +40,11 @@ include ${TOPDIR}$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-a$(DELIM)Toolch
 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
@ -50,12 +52,15 @@ 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
--- a/configs/sama5d3x-ek/ostest/Make.defs
+++ b/configs/sama5d3x-ek/ostest/Make.defs
@ -40,9 +40,11 @@ include ${TOPDIR}$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-a$(DELIM)Toolch
 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
@ -50,12 +52,15 @@ 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
--- a/configs/sama5d3x-ek/ov2640/Make.defs
+++ b/configs/sama5d3x-ek/ov2640/Make.defs
@ -40,9 +40,11 @@ include ${TOPDIR}$(DELIM)arch$(DELIM)arm$(DELIM)src$(DELIM)armv7-a$(DELIM)Toolch
 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
@ -50,12 +52,15 @@ 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