nuttx/nuttx-mirror
1
2
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2025-01-13 05:08:41 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Mostly cosmetic changes

Browse source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5344 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2012-11-13 15:50:38 +00:00
parent 46541cf0fa
commit 0b27df8f5c
43 changed files with 74 additions and 131 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Kconfig
View file

@ -45,22 +45,30 @@ choice
config WINDOWS_NATIVE
bool "Windows Native"
---help---
Build natively in a CMD.exe environment with Windows style paths (like C:\cgywin\home)
config WINDOWS_CYGWIN
bool "Cygwin"
- --help---
Build natively in a Cygwin environment with POSIX style paths (like /cygdrive/c/cgywin/home)
config WINDOWS_MSYS
bool "MSYS"
---help---
Build natively in a Cygwin environment with POSIX style paths (like /cygdrive/c/cgywin/home)
config WINDOWS_OTHER
bool "Other POSIX-like environment"
bool "Windows POSIX-like environment"
---help---
Build natively in another POSIX-like environment. Additional support may be necessary
endchoice
config WINDOWS_MKLINK
bool "Use mklink"
default y
depends on HOST_WINDOWS
depends on WINDOWS_NATIVE
---help---
Use the mklink command to set up symbolic links when NuttX is
configured. Otherwise, configuration directories will be copied to

9
arch/arm/src/lm3s/Kconfig
View file

@ -28,20 +28,25 @@ config ARCH_CHIP_LM3S8962
endchoice
choice
prompt "Toolchain"
default LM3S_BUILDROOT
prompt "Toolchain Selection"
default LM3S_BUILDROOT if !HOST_WINDOWS
default LM3S_CODESOURCERYW if HOST_WINDOWS
config LM3S_CODESOURCERYW
bool "CodeSourcery GNU toolchain under Windows"
depends on HOST_WINDOWS
config LM3S_CODESOURCERYL
bool "CodeSourcery GNU toolchain under Linux"
depends on HOST_LINUX
config LM3S_DEVKITARM
bool "devkitARM GNU toolchain"
depends on HOST_WINDOWS
config LM3S_BUILDROOT
bool "Buildroot"
depends on !WINDOWS_NATIVE
endchoice

17
arch/arm/src/lpc17xx/Kconfig
View file

@ -58,26 +58,33 @@ config ARCH_FAMILY_LPC176X
choice
prompt "Toolchain Selection"
default LPC17_CODESOURCERYW
default LPC17_BUILDROOT if !HOST_WINDOWS
default LPC17_CODESOURCERYW if HOST_WINDOWS
depends on ARCH_CHIP_LPC17XX
config LPC17_CODESOURCERYW
bool "CodeSourcery for Windows"
bool "CodeSourcery GNU toolchain under Windows"
depends on HOST_WINDOWS
config LPC17_CODESOURCERYL
bool "CodeSourcery for Linux"
bool "CodeSourcery GNU toolchain under Linux"
depends on HOST_LINUX
config LPC17_DEVKITARM
bool "DevkitARM (Windows)"
bool "devkitARM GNU toolchain"
depends on HOST_WINDOWS
config LPC17_BUILDROOT
bool "NuttX buildroot (Cygwin or Linux)"
bool "Buildroot"
depends on !WINDOWS_NATIVE
config LPC17_CODEREDW
bool "CodeRed for Windows"
depends on HOST_WINDOWS
config LPC17_CODEREDL
bool "CodeRed for Windows"
depends on HOST_LINUX
endchoice

15
arch/arm/src/lpc31xx/Kconfig
View file

@ -26,20 +26,25 @@ endchoice
choice
prompt "Toolchain Selection"
default LPC31_CODESOURCERYW
default LPC31_BUILDROOT if !HOST_WINDOWS
default LPC31_CODESOURCERYW if HOST_WINDOWS
depends on ARCH_CHIP_LPC31XX
config LPC31_CODESOURCERYW
bool "CodeSourcery for Windows"
bool "CodeSourcery GNU toolchain under Windows"
depends on HOST_WINDOWS
config LPC31_CODESOURCERYL
bool "CodeSourcery for Linux"
bool "CodeSourcery GNU toolchain under Linux"
depends on HOST_LINUX
config LPC31_DEVKITARM
bool "DevkitARM (Windows)"
bool "devkitARM GNU toolchain"
depends on HOST_WINDOWS
config LPC31_BUILDROOT
bool "NuttX buildroot (Cygwin or Linux)"
bool "Buildroot"
depends on !WINDOWS_NATIVE
endchoice

18
arch/arm/src/stm32/Kconfig
View file

@ -195,29 +195,37 @@ config STM32_STM32F40XX
choice
prompt "Toolchain Selection"
default STM32_CODESOURCERYW
default LPC31_BUILDROOT if !HOST_WINDOWS
default STM32_CODESOURCERYW if HOST_WINDOWS
depends on ARCH_CHIP_STM32
config STM32_CODESOURCERYW
bool "CodeSourcery for Windows"
bool "CodeSourcery GNU toolchain under Windows"
depends on HOST_WINDOWS
config STM32_CODESOURCERYL
bool "CodeSourcery for Linux"
bool "CodeSourcery GNU toolchain under Linux"
depends on HOST_LINUX
config STM32_ATOLLIC_LITE
bool "Atollic Lite for Windows"
depends on HOST_WINDOWS
config STM32_ATOLLIC_PRO
bool "Atollic Pro for Windows"
depends on HOST_WINDOWS
config STM32_DEVKITARM
bool "DevkitARM (Windows)"
bool "devkitARM GNU toolchain"
depends on HOST_WINDOWS
config STM32_RAISONANCE
bool "STMicro Raisonance for Windows"
depends on HOST_WINDOWS
config STM32_BUILDROOT
bool "NuttX buildroot (Cygwin or Linux)"
bool "Buildroot (Cygwin or Linux)"
depends on !WINDOWS_NATIVE
endchoice

3
configs/ea3131/README.txt
View file

@ -77,9 +77,6 @@ GNU Toolchain Options
because the dependencies are generated using Windows pathes which do not
work with the Cygwin make.
Support has been added for making dependencies with the windows-native toolchains.
That support can be enabled by modifying your Make.defs file as follows:
MKDEP = $(TOPDIR)/tools/mknulldeps.sh
NOTE 1: The CodeSourcery toolchain (2009q1) does not work with default optimization

3
configs/eagle100/README.txt
View file

@ -66,9 +66,6 @@ GNU Toolchain Options
because the dependencies are generated using Windows pathes which do not
work with the Cygwin make.
Support has been added for making dependencies with the CodeSourcery toolchain.
That support can be enabled by modifying your Make.defs file as follows:
MKDEP = $(TOPDIR)/tools/mknulldeps.sh
NOTE 1: The CodeSourcery toolchain (2009q1) does not work with default optimization

3
configs/ekk-lm3s9b96/README.txt
View file

@ -136,9 +136,6 @@ GNU Toolchain Options
because the dependencies are generated using Windows pathes which do not
work with the Cygwin make.
Support has been added for making dependencies with the windows-native toolchains.
That support can be enabled by modifying your Make.defs file as follows:
MKDEP = $(TOPDIR)/tools/mknulldeps.sh
NOTE 1: The CodeSourcery toolchain (2009q1) does not work with default optimization

3
configs/fire-stm32v2/README.txt
View file

@ -226,9 +226,6 @@ GNU Toolchain Options
because the dependencies are generated using Windows pathes which do not
work with the Cygwin make.
Support has been added for making dependencies with the windows-native toolchains.
That support can be enabled by modifying your Make.defs file as follows:
MKDEP = $(TOPDIR)/tools/mknulldeps.sh
The CodeSourcery Toolchain (2009q1)

3
configs/hymini-stm32v/README.txt
View file

@ -80,9 +80,6 @@ GNU Toolchain Options
because the dependencies are generated using Windows pathes which do not
work with the Cygwin make.
Support has been added for making dependencies with the windows-native toolchains.
That support can be enabled by modifying your Make.defs file as follows:
MKDEP = $(TOPDIR)/tools/mknulldeps.sh
NOTE 1: The CodeSourcery toolchain (2009q1) does not work with default optimization

3
configs/kwikstik-k40/README.txt
View file

@ -204,9 +204,6 @@ GNU Toolchain Options
because the dependencies are generated using Windows pathes which do not
work with the Cygwin make.
Support has been added for making dependencies with the windows-native toolchains.
That support can be enabled by modifying your Make.defs file as follows:
MKDEP = $(TOPDIR)/tools/mknulldeps.sh
NOTE 1: The CodeSourcery toolchain (2009q1) does not work with default optimization

3
configs/lincoln60/README.txt
View file

@ -104,9 +104,6 @@ GNU Toolchain Options
because the dependencies are generated using Windows pathes which do not
work with the Cygwin make.
Support has been added for making dependencies with the windows-native toolchains.
That support can be enabled by modifying your Make.defs file as follows:
MKDEP = $(TOPDIR)/tools/mknulldeps.sh
NOTE 1: The CodeSourcery toolchain (2009q1) does not work with default optimization

3
configs/lm3s6432-s2e/README.txt
View file

@ -131,9 +131,6 @@ GNU Toolchain Options
because the dependencies are generated using Windows pathes which do not
work with the Cygwin make.
Support has been added for making dependencies with the windows-native toolchains.
That support can be enabled by modifying your Make.defs file as follows:
MKDEP = $(TOPDIR)/tools/mknulldeps.sh
NOTE 1: The CodeSourcery toolchain (2009q1) does not work with default optimization

3
configs/lm3s6965-ek/README.txt
View file

@ -160,9 +160,6 @@ GNU Toolchain Options
because the dependencies are generated using Windows pathes which do not
work with the Cygwin make.
Support has been added for making dependencies with the windows-native toolchains.
That support can be enabled by modifying your Make.defs file as follows:
MKDEP = $(TOPDIR)/tools/mknulldeps.sh
NOTE 1: The CodeSourcery toolchain (2009q1) does not work with default optimization

3
configs/lm3s8962-ek/README.txt
View file

@ -160,9 +160,6 @@ GNU Toolchain Options
because the dependencies are generated using Windows pathes which do not
work with the Cygwin make.
Support has been added for making dependencies with the windows-native toolchains.
That support can be enabled by modifying your Make.defs file as follows:
MKDEP = $(TOPDIR)/tools/mknulldeps.sh
NOTE 1: The CodeSourcery toolchain (2009q1) does not work with default optimization

3
configs/lpc4330-xplorer/README.txt
View file

@ -185,9 +185,6 @@ GNU Toolchain Options
because the dependencies are generated using Windows pathes which do not
work with the Cygwin make.
Support has been added for making dependencies with the windows-native toolchains.
That support can be enabled by modifying your Make.defs file as follows:
MKDEP = $(TOPDIR)/tools/mknulldeps.sh
The CodeSourcery Toolchain (2009q1)

3
configs/lpcxpresso-lpc1768/README.txt
View file

@ -288,9 +288,6 @@ GNU Toolchain Options
because the dependencies are generated using Windows pathes which do not
work with the Cygwin make.
Support has been added for making dependencies with the windows-native toolchains.
That support can be enabled by modifying your Make.defs file as follows:
MKDEP = $(TOPDIR)/tools/mknulldeps.sh
NOTE 1: The CodeSourcery toolchain (2009q1) does not work with default optimization

3
configs/mbed/README.txt
View file

@ -74,9 +74,6 @@ GNU Toolchain Options
because the dependencies are generated using Windows pathes which do not
work with the Cygwin make.
Support has been added for making dependencies with the windows-native toolchains.
That support can be enabled by modifying your Make.defs file as follows:
MKDEP = $(TOPDIR)/tools/mknulldeps.sh
NOTE 1: The CodeSourcery toolchain (2009q1) does not work with default optimization

3
configs/mcu123-lpc214x/README.txt
View file

@ -72,9 +72,6 @@ GNU Toolchain Options
because the dependencies are generated using Windows pathes which do not
work with the Cygwin make.
Support has been added for making dependencies with the CodeSourcery toolchain.
That support can be enabled by modifying your Make.defs file as follows:
MKDEP = $(TOPDIR)/tools/mknulldeps.sh
NOTE 1: The CodeSourcery toolchain (2009q1) may not work with default optimization

4
configs/micropendous3/README.txt
View file

@ -265,10 +265,6 @@ Windows Native Toolchains
is because the dependencies are generated using Windows pathes which do
not work with the Cygwin make.
Support has been added for making dependencies with the windows-native
toolchains. That support can be enabled by modifying your Make.defs
file as follows:
MKDEP = $(TOPDIR)/tools/mknulldeps.sh
An additional issue with the WinAVR toolchain, in particular, is that it

3
configs/mirtoo/README.txt
View file

@ -448,9 +448,6 @@ Toolchains
because the dependencies are generated using Windows pathes which do not
work with the Cygwin make.
Support has been added for making dependencies with the windows-native toolchains.
That support can be enabled by modifying your Make.defs file as follows:
MKDEP = $(TOPDIR)/tools/mknulldeps.sh
Loading NuttX with ICD3

3
configs/ntosd-dm320/README.txt
View file

@ -96,9 +96,6 @@ GNU Toolchain Options
because the dependencies are generated using Windows pathes which do not
work with the Cygwin make.
Support has been added for making dependencies with the windows-native toolchains.
That support can be enabled by modifying your Make.defs file as follows:
MKDEP = $(TOPDIR)/tools/mknulldeps.sh
NOTE 1: The CodeSourcery toolchain (2009q1) does not work with default optimization

3
configs/nucleus2g/README.txt
View file

@ -134,9 +134,6 @@ GNU Toolchain Options
because the dependencies are generated using Windows pathes which do not
work with the Cygwin make.
Support has been added for making dependencies with the windows-native toolchains.
That support can be enabled by modifying your Make.defs file as follows:
MKDEP = $(TOPDIR)/tools/mknulldeps.sh
NOTE 1: The CodeSourcery toolchain (2009q1) does not work with default optimization

3
configs/olimex-lpc1766stk/README.txt
View file

@ -222,9 +222,6 @@ GNU Toolchain Options
because the dependencies are generated using Windows pathes which do not
work with the Cygwin make.
Support has been added for making dependencies with the windows-native toolchains.
That support can be enabled by modifying your Make.defs file as follows:
MKDEP = $(TOPDIR)/tools/mknulldeps.sh
NOTE 1: The CodeSourcery toolchain (2009q1) does not work with default optimization

3
configs/olimex-strp711/README.txt
View file

@ -157,9 +157,6 @@ GNU Toolchain Options
because the dependencies are generated using Windows pathes which do not
work with the Cygwin make.
Support has been added for making dependencies with the CodeSourcery toolchain.
That support can be enabled by modifying your Make.defs file as follows:
MKDEP = $(TOPDIR)/tools/mknulldeps.sh
NOTE 1: The CodeSourcery toolchain (2009q1) may not work with default optimization

3
configs/pcblogic-pic32mx/README.txt
View file

@ -276,9 +276,6 @@ Toolchains
because the dependencies are generated using Windows pathes which do not
work with the Cygwin make.
Support has been added for making dependencies with the windows-native toolchains.
That support can be enabled by modifying your Make.defs file as follows:
MKDEP = $(TOPDIR)/tools/mknulldeps.sh
Loading NuttX with PICkit2

3
configs/pic32-starterkit/README.txt
View file

@ -493,9 +493,6 @@ Toolchains
because the dependencies are generated using Windows pathes which do not
work with the Cygwin make.
Support has been added for making dependencies with the windows-native toolchains.
That support can be enabled by modifying your Make.defs file as follows:
MKDEP = $(TOPDIR)/tools/mknulldeps.sh
Powering the Board

3
configs/pic32mx7mmb/README.txt
View file

@ -261,9 +261,6 @@ Toolchains
because the dependencies are generated using Windows pathes which do not
work with the Cygwin make.
Support has been added for making dependencies with the windows-native toolchains.
That support can be enabled by modifying your Make.defs file as follows:
MKDEP = $(TOPDIR)/tools/mknulldeps.sh
Powering the Board

3
configs/sam3u-ek/README.txt
View file

@ -75,9 +75,6 @@ GNU Toolchain Options
because the dependencies are generated using Windows pathes which do not
work with the Cygwin make.
Support has been added for making dependencies with the windows-native toolchains.
That support can be enabled by modifying your Make.defs file as follows:
MKDEP = $(TOPDIR)/tools/mknulldeps.sh
NOTE 1: The CodeSourcery toolchain (2009q1) does not work with default optimization

3
configs/shenzhou/README.txt
View file

@ -249,9 +249,6 @@ GNU Toolchain Options
because the dependencies are generated using Windows pathes which do not
work with the Cygwin make.
Support has been added for making dependencies with the windows-native toolchains.
That support can be enabled by modifying your Make.defs file as follows:
MKDEP = $(TOPDIR)/tools/mknulldeps.sh
The CodeSourcery Toolchain (2009q1)

3
configs/stm3210e-eval/README.txt
View file

@ -83,9 +83,6 @@ GNU Toolchain Options
because the dependencies are generated using Windows pathes which do not
work with the Cygwin make.
Support has been added for making dependencies with the windows-native toolchains.
That support can be enabled by modifying your Make.defs file as follows:
MKDEP = $(TOPDIR)/tools/mknulldeps.sh
NOTE 1: The CodeSourcery toolchain (2009q1) does not work with default optimization

3
configs/stm3220g-eval/README.txt
View file

@ -89,9 +89,6 @@ GNU Toolchain Options
because the dependencies are generated using Windows pathes which do not
work with the Cygwin make.
Support has been added for making dependencies with the windows-native toolchains.
That support can be enabled by modifying your Make.defs file as follows:
MKDEP = $(TOPDIR)/tools/mknulldeps.sh
The CodeSourcery Toolchain (2009q1)

3
configs/stm3240g-eval/README.txt
View file

@ -91,9 +91,6 @@ GNU Toolchain Options
because the dependencies are generated using Windows pathes which do not
work with the Cygwin make.
Support has been added for making dependencies with the windows-native toolchains.
That support can be enabled by modifying your Make.defs file as follows:
MKDEP = $(TOPDIR)/tools/mknulldeps.sh
The CodeSourcery Toolchain (2009q1)

3
configs/stm32f100rc_generic/README.txt
View file

@ -85,9 +85,6 @@ GNU Toolchain Options
because the dependencies are generated using Windows pathes which do not
work with the Cygwin make.
Support has been added for making dependencies with the windows-native toolchains.
That support can be enabled by modifying your Make.defs file as follows:
MKDEP = $(TOPDIR)/tools/mknulldeps.sh
The CodeSourcery Toolchain (2009q1)

3
configs/stm32f4discovery/README.txt
View file

@ -89,9 +89,6 @@ GNU Toolchain Options
because the dependencies are generated using Windows pathes which do not
work with the Cygwin make.
Support has been added for making dependencies with the windows-native toolchains.
That support can be enabled by modifying your Make.defs file as follows:
MKDEP = $(TOPDIR)/tools/mknulldeps.sh
The CodeSourcery Toolchain (2009q1)

5
configs/stm32f4discovery/ostest/Make.defs
View file

@ -172,4 +172,9 @@ HOSTCC = gcc
HOSTINCLUDES = -I.
HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -g -pipe
HOSTLDFLAGS =
ifeq ($(CONFIG_HOST_WINDOWS),y)
HOSTEXEEXT = .exe
else
HOSTEXEEXT =
endif

3
configs/sure-pic32mx/README.txt
View file

@ -342,9 +342,6 @@ Toolchains
because the dependencies are generated using Windows pathes which do not
work with the Cygwin make.
Support has been added for making dependencies with the windows-native toolchains.
That support can be enabled by modifying your Make.defs file as follows:
MKDEP = $(TOPDIR)/tools/mknulldeps.sh
Loading NuttX with PICkit2

4
configs/teensy/README.txt
View file

@ -268,10 +268,6 @@ Windows Native Toolchains
is because the dependencies are generated using Windows pathes which do
not work with the Cygwin make.
Support has been added for making dependencies with the windows-native
toolchains. That support can be enabled by modifying your Make.defs
file as follows:
MKDEP = $(TOPDIR)/tools/mknulldeps.sh
An additional issue with the WinAVR toolchain, in particular, is that it

3
configs/twr-k60n512/README.txt
View file

@ -341,9 +341,6 @@ GNU Toolchain Options
because the dependencies are generated using Windows pathes which do not
work with the Cygwin make.
Support has been added for making dependencies with the windows-native toolchains.
That support can be enabled by modifying your Make.defs file as follows:
MKDEP = $(TOPDIR)/tools/mknulldeps.sh
NOTE 1: The CodeSourcery toolchain (2009q1) does not work with default optimization

3
configs/ubw32/README.txt
View file

@ -287,9 +287,6 @@ Toolchains
because the dependencies are generated using Windows pathes which do not
work with the Cygwin make.
Support has been added for making dependencies with the windows-native toolchains.
That support can be enabled by modifying your Make.defs file as follows:
MKDEP = $(TOPDIR)/tools/mknulldeps.sh
Loading NuttX with PICkit2

3
configs/vsn/README.txt
View file

@ -80,9 +80,6 @@ GNU Toolchain Options
because the dependencies are generated using Windows pathes which do not
work with the Cygwin make.
Support has been added for making dependencies with the windows-native toolchains.
That support can be enabled by modifying your Make.defs file as follows:
MKDEP = $(TOPDIR)/tools/mknulldeps.sh
NOTE 1: The CodeSourcery toolchain (2009q1) does not work with default optimization

19
tools/README.txt
View file

@ -290,11 +290,17 @@ mknulldeps.sh
The mknulldeps.sh is a stub script that does essentially nothing.
NOTE: The mkdep.* files are undergoing change. mkdeps.sh is a bash
NOTE: The mk*deps.* files are undergoing change. mkdeps.sh is a bash
script that produces dependencies well for POSIX style hosts (e..g.,
Linux and Cygwin). It does not work well for mixed environments with
a Windows toolchain running in a POSIX style environemnt (hence, the
mknulldeps.sh script).
mknulldeps.sh script). And, of course, cannot be used in a Windows
nativ environment.
[mkdeps.sh does have an option, --winpath, that purports to convert
the dependencies generated by a Windows toolchain to POSIX format.
However, that is not being used and mostly likely does not cover
all of the conversion cases.]
mkdeps.bat is a simple port of the bash script to run in a Windows
command shell. However, it does not work well either because some
@ -302,8 +308,13 @@ mknulldeps.sh
by the CMD.exe shell.
mkdeps.c generates mkdeps (on Linux) or mkdeps.exe (on Windows).
This C version should solve all of the issues. However, this verison
is still under-development.
However, this verison is still under-development. It works well in
the all POSIX environment or in the all Windows environment but also
does not work well in mixed POSIX environment with a Windows toolchain.
In that case, there are still issues with the conversion of things like
'c:\Program Files' to 'c:program files' by bash. Those issues may,
eventually be solvable but for now continue to use mknulldeps.sh in
that mixed environment.
define.sh

3
tools/mkdeps.c
View file

@ -396,7 +396,8 @@ static void do_dependency(const char *file, char separator)
ret = system(command);
if (ret != 0)
{
fprintf(stderr, "ERROR: ssystem(%s) failed\n", command);
fprintf(stderr, "ERROR: system failed: %s\n", strerror(errno));
fprintf(stderr, " command: %s\n", command);
exit(EXIT_FAILURE);
}