diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-03-11 20:26:55 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2013-03-11 20:26:55 +0000 |
commit | 569561d0b8bbf208837ed267a59b5c8152b278d7 (patch) | |
tree | a811a5b1a1418ff45417d02863d5fcc2ffaa8b25 /nuttx/configs/sam3u-ek | |
parent | 3578c60ae17a31fef6486ba5c3a2f97b899fb243 (diff) | |
download | px4-nuttx-569561d0b8bbf208837ed267a59b5c8152b278d7.tar.gz px4-nuttx-569561d0b8bbf208837ed267a59b5c8152b278d7.tar.bz2 px4-nuttx-569561d0b8bbf208837ed267a59b5c8152b278d7.zip |
Reorganize some AT91SAM3U files; Add an NSH kernel build configuration to the WaveSahhare Open1788 board
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5732 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/configs/sam3u-ek')
-rw-r--r-- | nuttx/configs/sam3u-ek/README.txt | 4 | ||||
-rw-r--r-- | nuttx/configs/sam3u-ek/kernel/Makefile | 4 | ||||
-rw-r--r-- | nuttx/configs/sam3u-ek/kernel/up_userspace.c | 2 | ||||
-rw-r--r-- | nuttx/configs/sam3u-ek/knsh/Make.defs | 4 | ||||
-rwxr-xr-x | nuttx/configs/sam3u-ek/scripts/kernel-space.ld (renamed from nuttx/configs/sam3u-ek/scripts/user.ld) | 4 | ||||
-rw-r--r-- | nuttx/configs/sam3u-ek/scripts/user-space.ld (renamed from nuttx/configs/sam3u-ek/scripts/kernel.ld) | 4 |
6 files changed, 11 insertions, 11 deletions
diff --git a/nuttx/configs/sam3u-ek/README.txt b/nuttx/configs/sam3u-ek/README.txt index d89293100..c5daedbe7 100644 --- a/nuttx/configs/sam3u-ek/README.txt +++ b/nuttx/configs/sam3u-ek/README.txt @@ -386,10 +386,10 @@ must be is one of the following: This is required because in the normal case (just 'make'), make will create all dependencies then execute the pass1 and pass2 targets. But this example, pass2 depends on auto-generatd files produced during pass1. - This specall make command ('make pass1 pass2') will make the dependencies + This special make command ('make pass1 pass2') will make the dependencies separately for each pass. - At there end of the build, there four files will top-level build + At the end of the build, there four files will top-level build directory: nuttx_user.elf - The pass1 ELF file diff --git a/nuttx/configs/sam3u-ek/kernel/Makefile b/nuttx/configs/sam3u-ek/kernel/Makefile index 8cc3ec670..b58bb118c 100644 --- a/nuttx/configs/sam3u-ek/kernel/Makefile +++ b/nuttx/configs/sam3u-ek/kernel/Makefile @@ -50,11 +50,11 @@ ENTRYPT = $(patsubst "%",%,$(CONFIG_USER_ENTRYPOINT)) ifeq ($(WINTOOL),y) # Windows-native toolchains USER_LIBPATHS = ${shell for path in $(USERLIBS); do dir=`dirname $(TOPDIR)$(DELIM)$$path`;echo "-L\"`cygpath -w $$dir`\"";done} - USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)configs$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel.ld}" + USER_LDSCRIPT = -T "${shell cygpath -w $(TOPDIR)$(DELIM)configs$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld}" else # Linux/Cygwin-native toolchain USER_LIBPATHS = $(addprefix -L$(TOPDIR)$(DELIM),$(dir $(USERLIBS))) - USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)configs$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)kernel.ld + USER_LDSCRIPT = -T$(TOPDIR)$(DELIM)configs$(DELIM)$(CONFIG_ARCH_BOARD)$(DELIM)scripts$(DELIM)user-space.ld endif USER_LDFLAGS = --undefined=$(ENTRYPT) --entry=$(ENTRYPT) $(USER_LDSCRIPT) diff --git a/nuttx/configs/sam3u-ek/kernel/up_userspace.c b/nuttx/configs/sam3u-ek/kernel/up_userspace.c index abccd5afc..e148b135c 100644 --- a/nuttx/configs/sam3u-ek/kernel/up_userspace.c +++ b/nuttx/configs/sam3u-ek/kernel/up_userspace.c @@ -57,7 +57,7 @@ #endif #if CONFIG_NUTTX_USERSPACE != 0x00090000 -# error "CONFIG_NUTTX_USERSPACE must be 0x00090000 to match kernel.ld" +# error "CONFIG_NUTTX_USERSPACE must be 0x00090000 to match user-space.ld" #endif /**************************************************************************** diff --git a/nuttx/configs/sam3u-ek/knsh/Make.defs b/nuttx/configs/sam3u-ek/knsh/Make.defs index fc140472c..ac74d2fdb 100644 --- a/nuttx/configs/sam3u-ek/knsh/Make.defs +++ b/nuttx/configs/sam3u-ek/knsh/Make.defs @@ -44,14 +44,14 @@ ifeq ($(WINTOOL),y) MKDEP = $(TOPDIR)/tools/mknulldeps.sh ARCHINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" ARCHXXINCLUDES = -I. -isystem "${shell cygpath -w $(TOPDIR)/include}" -isystem "${shell cygpath -w $(TOPDIR)/include/cxx}" - ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/user.ld}" + ARCHSCRIPT = -T "${shell cygpath -w $(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/kernel-space.ld}" MAXOPTIMIZATION = -O2 else # Linux/Cygwin-native toolchain MKDEP = $(TOPDIR)/tools/mkdeps.sh ARCHINCLUDES = -I. -isystem $(TOPDIR)/include ARCHXXINCLUDES = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx - ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/user.ld + ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/scripts/kernel-space.ld endif CC = $(CROSSDEV)gcc diff --git a/nuttx/configs/sam3u-ek/scripts/user.ld b/nuttx/configs/sam3u-ek/scripts/kernel-space.ld index fb82d679b..8a6f1a344 100755 --- a/nuttx/configs/sam3u-ek/scripts/user.ld +++ b/nuttx/configs/sam3u-ek/scripts/kernel-space.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/sam3u-ek/scripts/ld.script + * configs/sam3u-ek/scripts/kernel-space.ld * * Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> @@ -42,7 +42,7 @@ * * For MPU support, the kernel-mode NuttX section is assumed to be 64Kb of * FLASH and 4Kb of SRAM. That, of course, can be optimized as needed (See - * also configs/sam3u-ek/kernel/kernel.ld. + * also configs/sam3u-ek/scripts/user-space.ld). */ MEMORY diff --git a/nuttx/configs/sam3u-ek/scripts/kernel.ld b/nuttx/configs/sam3u-ek/scripts/user-space.ld index 34c5d53cf..d187ed40c 100644 --- a/nuttx/configs/sam3u-ek/scripts/kernel.ld +++ b/nuttx/configs/sam3u-ek/scripts/user-space.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * configs/sam3u-ek/scripts/kernel.ld + * configs/sam3u-ek/scripts/user-space.ld * * Copyright (C) 2011, 2013 Gregory Nutt. All rights reserved. * Author: Gregory Nutt <gnutt@nuttx.org> @@ -42,7 +42,7 @@ * * For MPU support, the kernel-mode NuttX section is assumed to be 64Kb of * FLASH and 4Kb of SRAM. That, of course, can be optimized as needed (See - * also configs/sam3u-ek/knsh/ld.script + * also configs/sam3u-ek/scripts/kernel-space.ld). */ MEMORY |