From 087feacd1d4ad183b8c9b81a1c664ebfea1278e1 Mon Sep 17 00:00:00 2001
From: patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>
Date: Mon, 11 Apr 2011 22:27:00 +0000
Subject: Correct an error in the top-level Makefile introduced in 6.1

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3492 42af7a65-404d-4744-a932-0658087f49c3
---
 nuttx/ChangeLog                |  7 +++++++
 nuttx/Documentation/NuttX.html |  8 +++++++-
 nuttx/Makefile                 | 22 +++++++---------------
 3 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog
index 662d4ec34..b5d6d71d3 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 f072201b2..141b27929 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 &lt;spudmonkey@racsa.co.cr&gt;
 <ul><pre>
 nuttx-6.2 2011-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
 
+    * 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 &lt;spudmonkey@racsa.co.cr&gt;
 
 pascal-2.1 2011-xx-xx Gregory Nutt &lt;spudmonkey@racsa.co.cr&gt;
diff --git a/nuttx/Makefile b/nuttx/Makefile
index b203ebde3..af09e5eda 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
-- 
cgit v1.2.3