sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More build fixes

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3406 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2011-03-20 19:30:39 +00:00
parent d20645c178
commit c7c2752d5c
11 changed files with 22 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
configs/README.txt
View File

@ -171,12 +171,9 @@ defconfig -- This is a configuration file similar to the Linux
CONFIG_APP_DIR - Identifies the directory that builds the
application to link with NuttX. This symbol must be assigned
to the path to the application build directory *relative* to
the NuttX top build direcory. As an an example, there are
several example applicatins in the NuttX examples/ sub-directory.
To use one of these example applications, say nsh, you would
set CONFIG_APP_DIR=examples/nsh. If you had an application
directory and the NuttX directory both within another directory
like this:
the NuttX top build direcory. If you had an application
directory and the NuttX directory each in separate directory
trees like this:
build
|-nuttx
@ -202,7 +199,7 @@ defconfig -- This is a configuration file similar to the Linux
This is only done when you change the NuttX configuration.
- depend. Make or update the application build dependencies.
When this application is invoked it will receive the setting TOPDIR< like:
When this application is invoked it will receive the setting TOPDIR like:
$(MAKE) -C $(CONFIG_APP_DIR) TOPDIR="$(TOPDIR)" <target>

9
configs/ea3131/locked/Makefile
View File

@ -41,7 +41,16 @@
PASS1_SRCDIR = arch/$(CONFIG_ARCH)/src
PASS1_BOARDDIR = $(PASS1_SRCDIR)/board
PASS1_LIBBOARD = $(PASS1_BOARDDIR)/libboard$(LIBEXT)
# Where is the application library?
ifneq ($(CONFIG_APP_DIR),)
PASS1_LIBAPP = $(CONFIG_APP_DIR)/libapp$(LIBEXT)
else
ifneq ($(APPDIR),)
PASS1_LIBAPP = $(APPDIR)/libapps$(LIBEXT)
endif
endif
# Remove the application library (libapp) from the list of libraries. Add
# the boad library (liboard)

2
configs/ea3131/src/Makefile
View File

@ -59,7 +59,7 @@ endif
ifeq ($(CONFIG_PAGING),y)
CSRCS += up_fillpage.c
endif
ifeq ($(CONFIG_APP_DIR),examples/usbstorage)
ifeq ($(CONFIG_USBSTRG),y)
CSRCS += up_usbstrg.c
endif
COBJS = $(CSRCS:.c=$(OBJEXT))

2
configs/mbed/src/Makefile
View File

@ -42,7 +42,7 @@ CSRCS = up_boot.c up_leds.c
ifeq ($(CONFIG_NSH_ARCHINIT),y)
CSRCS += up_nsh.c
endif
ifeq ($(CONFIG_APP_DIR),examples/usbstorage)
ifeq ($(CONFIG_USBSTRG),y)
CSRCS += up_usbstrg.c
endif

2
configs/mcu123-lpc214x/src/Makefile
View File

@ -51,7 +51,7 @@ CSRCS = up_spi.c up_leds.c
ifeq ($(CONFIG_NSH_ARCHINIT),y)
CSRCS += up_nsh.c
endif
ifeq ($(CONFIG_APP_DIR),examples/usbstorage)
ifeq ($(CONFIG_USBSTRG),y)
CSRCS += up_usbstrg.c
endif

2
configs/nucleus2g/src/Makefile
View File

@ -42,7 +42,7 @@ CSRCS = up_boot.c up_leds.c up_ssp.c
ifeq ($(CONFIG_NSH_ARCHINIT),y)
CSRCS += up_nsh.c
endif
ifeq ($(CONFIG_APP_DIR),examples/usbstorage)
ifeq ($(CONFIG_USBSTRG),y)
CSRCS += up_usbstrg.c
endif

2
configs/olimex-lpc1766stk/src/Makefile
View File

@ -42,7 +42,7 @@ CSRCS = up_boot.c up_leds.c up_ssp.c
ifeq ($(CONFIG_NSH_ARCHINIT),y)
CSRCS += up_nsh.c
endif
ifeq ($(CONFIG_APP_DIR),examples/usbstorage)
ifeq ($(CONFIG_USBSTRG),y)
CSRCS += up_usbstrg.c
endif
ifeq ($(CONFIG_NX_LCDDRIVER),y)

2
configs/sam3u-ek/src/Makefile
View File

@ -47,7 +47,7 @@ endif
ifeq ($(CONFIG_SAM3U_HSMCI),y)
CSRCS += up_mmcsd.c
endif
ifeq ($(CONFIG_APP_DIR),examples/usbstorage)
ifeq ($(CONFIG_USBSTRG),y)
CSRCS += up_usbstrg.c
endif
COBJS = $(CSRCS:.c=$(OBJEXT))

2
configs/sim/nx/defconfig-x11
View File

@ -121,7 +121,7 @@ CONFIG_SIM_FBBPP=32
# desciptors by task_create() when a new task is started. If
# set, all sockets will appear to be closed in the new task.
#
CONFIG_APP_DIR=examples/nx
#CONFIG_APP_DIR=
CONFIG_DEBUG=y
CONFIG_DEBUG_VERBOSE=y
CONFIG_DEBUG_SYMBOLS=n

2
configs/stm3210e-eval/src/Makefile
View File

@ -46,7 +46,7 @@ CSRCS = up_boot.c up_leds.c up_buttons.c up_spi.c up_usbdev.c \
ifeq ($(CONFIG_NSH_ARCHINIT),y)
CSRCS += up_nsh.c
endif
ifeq ($(CONFIG_APP_DIR),examples/usbstorage)
ifeq ($(CONFIG_USBSTRG),y)
CSRCS += up_usbstrg.c
endif
COBJS = $(CSRCS:.c=$(OBJEXT))

2
configs/vsn/src/Makefile
View File

@ -49,7 +49,7 @@ CSRCS = sysclock.c boot.c leds.c buttons.c spi.c \
ifeq ($(CONFIG_NSH_ARCHINIT),y)
CSRCS += nsh.c
endif
ifeq ($(CONFIG_APP_DIR),examples/usbstorage)
ifeq ($(CONFIG_USBSTRG),y)
CSRCS += usbstrg.c
endif
COBJS = $(CSRCS:.c=$(OBJEXT))