diff --git a/configs/sama5d3x-ek/README.txt b/configs/sama5d3x-ek/README.txt index 936c272e96c..6fb4b6e25bc 100644 --- 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. diff --git a/configs/sama5d3x-ek/demo/Make.defs b/configs/sama5d3x-ek/demo/Make.defs index 1a5bc29ad89..43874005298 100644 --- 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 diff --git a/configs/sama5d3x-ek/hello/Make.defs b/configs/sama5d3x-ek/hello/Make.defs index 3577ab4fc25..2accd8e8323 100644 --- 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 diff --git a/configs/sama5d3x-ek/norboot/Make.defs b/configs/sama5d3x-ek/norboot/Make.defs index eface1020a8..402ef121d73 100644 --- 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 diff --git a/configs/sama5d3x-ek/nsh/Make.defs b/configs/sama5d3x-ek/nsh/Make.defs index 1b22a40cb1c..31471bd2148 100644 --- 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 diff --git a/configs/sama5d3x-ek/nx/Make.defs b/configs/sama5d3x-ek/nx/Make.defs index 70f878c0d37..1f3a656d5d7 100644 --- 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 diff --git a/configs/sama5d3x-ek/nxwm/Make.defs b/configs/sama5d3x-ek/nxwm/Make.defs index 96c6d4ff16e..afdccdb1762 100644 --- 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 # # 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 diff --git a/configs/sama5d3x-ek/ostest/Make.defs b/configs/sama5d3x-ek/ostest/Make.defs index 749b24a7725..b10782dda4e 100644 --- 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 diff --git a/configs/sama5d3x-ek/ov2640/Make.defs b/configs/sama5d3x-ek/ov2640/Make.defs index f3aff660b82..f54cfb43389 100644 --- 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