diff options
| author | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2011-04-11 22:27:00 +0000 |
|---|---|---|
| committer | patacongo <patacongo@7fd9a85b-ad96-42d3-883c-3090e2eb8679> | 2011-04-11 22:27:00 +0000 |
| commit | 6616f146dcaf395ba61395ad1e30aa2ef5631cd8 (patch) | |
| tree | cc5767c6d3fe11680928e24f8cd524791f227d76 | |
| parent | 9621d42aaf12440dd4b678b33be4dcf483f297e9 (diff) | |
Correct an error in the top-level Makefile introduced in 6.1
git-svn-id: https://nuttx.svn.sourceforge.net/svnroot/nuttx/trunk@3492 7fd9a85b-ad96-42d3-883c-3090e2eb8679
| -rw-r--r-- | nuttx/ChangeLog | 7 | ||||
| -rw-r--r-- | nuttx/Documentation/NuttX.html | 8 | ||||
| -rw-r--r-- | nuttx/Makefile | 22 |
3 files changed, 21 insertions, 16 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 662d4ec340..b5d6d71d3c 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -1666,5 +1666,12 @@ 6.2 2011-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> + * arch/arm/src/lpc17xx/lpc17_gpioint.c: Correct errors in logic that maps + and IRQ number into a register bit number. + * Makefile: Fix an error introduced in the top-level Makefile in NuttX-6.1. + This error only shows up if you have a /tftpboot directory. Then the + make will fail with an obscure error about not being able to stat pass2. + + diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html index f072201b23..141b279295 100644 --- a/nuttx/Documentation/NuttX.html +++ b/nuttx/Documentation/NuttX.html @@ -867,7 +867,7 @@ </li> <li> A binfs file system. - This is a tiny psuedo file system that lets named appliations to be viewed and accessed in NSH under the <code>/bin</code> directory. + This is a tiny psuedo file system that lets named appliations to be viewed and accessed in NSH under the <code>/bin</code> directory. </li> <li> An I2C-based driver for the LIS331DL MEMS motion sensor (Contributed by Uros Platise). @@ -2199,6 +2199,12 @@ buildroot-1.9 2011-02-10 <spudmonkey@racsa.co.cr> <ul><pre> nuttx-6.2 2011-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> + * arch/arm/src/lpc17xx/lpc17_gpioint.c: Correct errors in logic that maps + and IRQ number into a register bit number. + * Makefile: Fix an error introduced in the top-level Makefile in NuttX-6.1. + This error only shows up if you have a /tftpboot directory. Then the + make will fail with an obscure error about not being able to stat pass2. + apps-6.1 2011-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> pascal-2.1 2011-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> diff --git a/nuttx/Makefile b/nuttx/Makefile index b203ebde35..af09e5eda2 100644 --- a/nuttx/Makefile +++ b/nuttx/Makefile @@ -44,14 +44,6 @@ DIRLINK = $(TOPDIR)/tools/link.sh DIRUNLINK = $(TOPDIR)/tools/unlink.sh endif -# This is the final executable - -ifeq ($(WINTOOL),y) - NUTTX = "${shell cygpath -w $(TOPDIR)/nuttx}" -else - NUTTX = $(TOPDIR)/nuttx -endif - # This define is passed as EXTRADEFINES for kernel-mode builds. It is also passed # during PASS1 (but not PASS2) context and depend targets. @@ -251,7 +243,7 @@ ifeq ($(CONFIG_NX),y) NUTTXLIBS += graphics/libgraphics$(LIBEXT) endif -# This is the name of the final target +# This is the name of the final target (relative to the top level directorty) BIN = nuttx$(EXEEXT) @@ -404,22 +396,22 @@ pass2deps: context pass2dep $(NUTTXLIBS) pass2: pass2deps @$(MAKE) -C $(ARCH_SRC) TOPDIR="$(TOPDIR)" EXTRA_OBJS="$(EXTRA_OBJS)" LINKLIBS="$(NUTTXLIBS)" EXTRADEFINES=$(KDEFINE) $(BIN) @if [ -w /tftpboot ] ; then \ - cp -f $(TOPDIR)/$@ /tftpboot/$@.${CONFIG_ARCH}; \ + cp -f $(BIN) /tftpboot/$(BIN).${CONFIG_ARCH}; \ fi ifeq ($(CONFIG_RRLOAD_BINARY),y) - @$(TOPDIR)/tools/mkimage.sh --Prefix $(CROSSDEV) $(TOPDIR)/$@ $(TOPDIR)/$@.rr + @$(TOPDIR)/tools/mkimage.sh --Prefix $(CROSSDEV) $(BIN) $(BIN).rr @if [ -w /tftpboot ] ; then \ - cp -f $(TOPDIR)/$@.rr /tftpboot/$@.rr.${CONFIG_ARCH}; \ + cp -f $(BIN).rr /tftpboot/$\(BIN).rr.$(CONFIG_ARCH); \ fi endif ifeq ($(CONFIG_INTELHEX_BINARY),y) - @$(OBJCOPY) $(OBJCOPYARGS) -O ihex $(NUTTX)$(EXEEXT) $(NUTTX)$(EXEEXT).ihx + @$(OBJCOPY) $(OBJCOPYARGS) -O ihex $(BIN) $(BIN).ihx endif ifeq ($(CONFIG_MOTOROLA_SREC),y) - @$(OBJCOPY) $(OBJCOPYARGS) -O srec $(NUTTX)$(EXEEXT) $(NUTTX)$(EXEEXT).srec + @$(OBJCOPY) $(OBJCOPYARGS) -O srec $(BIN) $(BIN).srec endif ifeq ($(CONFIG_RAW_BINARY),y) - @$(OBJCOPY) $(OBJCOPYARGS) -O binary $(NUTTX)$(EXEEXT) $(NUTTX)$(EXEEXT).bin + @$(OBJCOPY) $(OBJCOPYARGS) -O binary $(BIN) $(BIN).bin endif # In the normal case, all pass1 and pass2 dependencies are created then pass1 |