From e02413fa17a054e67386311b15889ae7239dca56 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Tue, 28 Jan 2014 18:59:11 -0600 Subject: SAMA5: Add a missing endif in a Make.defs that recently added; Several other cosmetic changes --- misc/tools/README.txt | 15 +++++++++++++++ nuttx/COPYING | 4 ++-- nuttx/TODO | 6 ++++++ nuttx/configs/sama5d3x-ek/README.txt | 5 ++++- nuttx/configs/sama5d3x-ek/demo/Make.defs | 6 ++++++ nuttx/configs/sama5d3x-ek/hello/Make.defs | 5 +++++ nuttx/configs/sama5d3x-ek/norboot/Make.defs | 5 +++++ nuttx/configs/sama5d3x-ek/nsh/Make.defs | 5 +++++ nuttx/configs/sama5d3x-ek/nx/Make.defs | 5 +++++ nuttx/configs/sama5d3x-ek/nxwm/Make.defs | 7 ++++++- nuttx/configs/sama5d3x-ek/ostest/Make.defs | 5 +++++ nuttx/configs/sama5d3x-ek/ov2640/Make.defs | 5 +++++ 12 files changed, 69 insertions(+), 4 deletions(-) diff --git a/misc/tools/README.txt b/misc/tools/README.txt index 163918ad7..b8de6f605 100644 --- a/misc/tools/README.txt +++ b/misc/tools/README.txt @@ -157,6 +157,21 @@ There two known solutions to this: LD_RUN_PATH=/usr/local/lib make make install +I have also been told that some people see this error until they re-boot, then it +just goes away. + +gperf +----- + + "I am getting an error when configuring the kconfig-frontends-3.12.0.0 package. + Using command + + ./configure --enable-mconf + + "It says it 'configure: error: can not find gperf'" + + If you see this, make sure that the gperf package is installed. + kconfig-frontends for Windows ----------------------------- diff --git a/nuttx/COPYING b/nuttx/COPYING index f8d5284ab..39c1fadc1 100644 --- a/nuttx/COPYING +++ b/nuttx/COPYING @@ -12,7 +12,7 @@ NuttX License for NuttX in general (authorship of individual files may vary): /************************************************************************* * - * Copyright (C) 2007-2012 Gregory Nutt. All rights reserved. + * Copyright (C) 2007-2014 Gregory Nutt. All rights reserved. * Author: Gregory Nutt * * Redistribution and use in source and binary forms, with or without @@ -241,6 +241,6 @@ drivers/video/ov2640 from other projects with conflicting licenses: Linux and ArduCAM. Those both have GPL licenses. I am not sure if it is proper or not to lift the content of those tables and still retain this BSD license. I am guessing - so, but I am not copyright attorney so you should use this driver in + so, but I am not a copyright attorney so you should use this driver in products at your own risk. \ No newline at end of file diff --git a/nuttx/TODO b/nuttx/TODO index bdeef40d1..22aa548fb 100644 --- a/nuttx/TODO +++ b/nuttx/TODO @@ -34,6 +34,7 @@ nuttx/ (0) ARM/LPC43x (arch/arm/src/lpc43xx/) (3) ARM/STR71x (arch/arm/src/str71x/) (3) ARM/LM3S6918 (arch/arm/src/lm/) + (x) ARM/SAMA5D3 ((arch/arm/src/sama5/) (5) ARM/STM32 (arch/arm/src/stm32/) (3) AVR (arch/avr) (0) Intel x86 (arch/x86) @@ -1792,6 +1793,11 @@ o ARM/LM3S6918 (arch/arm/src/lm/) likely cause is probably a stack overflow, not a hard sofware bug. Priority: Probably Low +o ARM/SAMA5D3 ((arch/arm/src/sama5/) + ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + + Issues related to the SAMA5D3 port are in configs/sama5d3x-ek/README.txt. + o ARM/STM32 (arch/arm/src/stm32/) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/nuttx/configs/sama5d3x-ek/README.txt b/nuttx/configs/sama5d3x-ek/README.txt index 936c272e9..6fb4b6e25 100644 --- a/nuttx/configs/sama5d3x-ek/README.txt +++ b/nuttx/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/nuttx/configs/sama5d3x-ek/demo/Make.defs b/nuttx/configs/sama5d3x-ek/demo/Make.defs index 1a5bc29ad..438740052 100644 --- a/nuttx/configs/sama5d3x-ek/demo/Make.defs +++ b/nuttx/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/nuttx/configs/sama5d3x-ek/hello/Make.defs b/nuttx/configs/sama5d3x-ek/hello/Make.defs index 3577ab4fc..2accd8e83 100644 --- a/nuttx/configs/sama5d3x-ek/hello/Make.defs +++ b/nuttx/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/nuttx/configs/sama5d3x-ek/norboot/Make.defs b/nuttx/configs/sama5d3x-ek/norboot/Make.defs index eface1020..402ef121d 100644 --- a/nuttx/configs/sama5d3x-ek/norboot/Make.defs +++ b/nuttx/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/nuttx/configs/sama5d3x-ek/nsh/Make.defs b/nuttx/configs/sama5d3x-ek/nsh/Make.defs index 1b22a40cb..31471bd21 100644 --- a/nuttx/configs/sama5d3x-ek/nsh/Make.defs +++ b/nuttx/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/nuttx/configs/sama5d3x-ek/nx/Make.defs b/nuttx/configs/sama5d3x-ek/nx/Make.defs index 70f878c0d..1f3a656d5 100644 --- a/nuttx/configs/sama5d3x-ek/nx/Make.defs +++ b/nuttx/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/nuttx/configs/sama5d3x-ek/nxwm/Make.defs b/nuttx/configs/sama5d3x-ek/nxwm/Make.defs index 96c6d4ff1..afdccdb17 100644 --- a/nuttx/configs/sama5d3x-ek/nxwm/Make.defs +++ b/nuttx/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/nuttx/configs/sama5d3x-ek/ostest/Make.defs b/nuttx/configs/sama5d3x-ek/ostest/Make.defs index 749b24a77..b10782dda 100644 --- a/nuttx/configs/sama5d3x-ek/ostest/Make.defs +++ b/nuttx/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/nuttx/configs/sama5d3x-ek/ov2640/Make.defs b/nuttx/configs/sama5d3x-ek/ov2640/Make.defs index f3aff660b..f54cfb433 100644 --- a/nuttx/configs/sama5d3x-ek/ov2640/Make.defs +++ b/nuttx/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 -- cgit v1.2.3