diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-10-11 14:34:18 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2011-10-11 14:34:18 +0000 |
commit | 7155446ba1a312a61d55d0c6dab9cc621112d743 (patch) | |
tree | 677c539705d20fd877b92c8138ee4af937199e3a | |
parent | ef5a403a600202cc899811ad933c70cc2df08d4b (diff) | |
download | px4-nuttx-7155446ba1a312a61d55d0c6dab9cc621112d743.tar.gz px4-nuttx-7155446ba1a312a61d55d0c6dab9cc621112d743.tar.bz2 px4-nuttx-7155446ba1a312a61d55d0c6dab9cc621112d743.zip |
Fix sim/nsh2 build
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4039 42af7a65-404d-4744-a932-0658087f49c3
-rw-r--r-- | nuttx/ChangeLog | 3 | ||||
-rw-r--r-- | nuttx/Documentation/NuttX.html | 43 | ||||
-rw-r--r-- | nuttx/arch/sim/src/Makefile | 15 | ||||
-rw-r--r-- | nuttx/configs/pic32-starterkit/README.txt | 3 |
4 files changed, 52 insertions, 12 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 137fd2d9e..f7ee10ddd 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -2160,4 +2160,5 @@ closes a read-only file. This is because it calls flush() which will fail on read-only files. No harm is done other that a bad value is returned. - + * arch/sim/src/Makefile: Correct build issue for sim/nsh2 target. Old + libboard.a was not being cleaned. diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html index 0543c87b3..56c90ef44 100644 --- a/nuttx/Documentation/NuttX.html +++ b/nuttx/Documentation/NuttX.html @@ -994,7 +994,11 @@ </tr> </table> -<p>The short story (Number of ports follow in parentheses. Follow the links for the details):</p> +<p> + The short story (Number of ports follow in parentheses). + The state of the various ports vary from board-to-board. + Follow the links for the details: +</p> <center><table width="90%"> <ul> <tr> @@ -1023,7 +1027,7 @@ <li><a href="#80x86">Intel 80x86</a> (2)</li> </ul> </li> - <li>MicroChip <a href="#pic32mips">PIC32</a> (MIPS) (2)</li> + <li>MicroChip <a href="#pic32mips">PIC32MX</a> (MIPS) (3)</li> <li>Renesas/Hitachi: <ul> <li><a href="#superh">Renesas/Hitachi SuperH</a> (1/2)</li> @@ -1999,7 +2003,8 @@ <p> <b>PIC32MX440F512H</b>. This port uses the "Advanced USB Storage Demo Board," Model DB-DP11215, from <a href="http://www.sureelectronics.net">Sure Electronics</a>. - This board features the MicroChip PIC32MX440F512H. See the <a href="http://www.sureelectronics.net/goods.php?id=1168">Sure website</a> for further information about the DB-DP11215 board. + This board features the MicroChip PIC32MX440F512H. + See the <a href="http://www.sureelectronics.net/goods.php?id=1168">Sure website</a> for further information about the DB-DP11215 board. </p> <ul> <p> @@ -2019,6 +2024,27 @@ <td><br></td> <td> <p> + <b>PIC32MX795F512L</b>. + This port uses the Microchip PIC32 Ethernet Starter Kit (DM320004) with the Multimedia Expansion Board (MEB, DM320005). + See the <a href="http://ww.microchip.com">Microchip website</a> for further information. + </p> + <ul> + <p> + <b>STATUS:</b> + This port was started a shelved... The Starter Kit (even with the MEB) has no serial port. + I will have to come up with a different bring-up strategy to work with this board. + </p> + </ul> + </td> +</tr> +<tr> + <td><br></td> + <td><hr></td> +</tr> +<tr> + <td><br></td> + <td> + <p> <b>Development Environment:</b> These ports uses the <i>LITE</i> version of the PIC32MX toolchain available for download from the <a href="http://www.microchip.com">MicroChip</a> website. @@ -2722,9 +2748,18 @@ nuttx-6.11 2011-xx-xx Gregory Nutt <gnutt@nuttx.org> * arch/arm/stm32/Make.defs: Don't build stm32_rtc.c if CONFIG_RTC is not selected. Doing so will cause errors if other configuration dependencies - are not met + are not met. * configs/stm3210e-eval/src/up_lcd.c: Color corrections for SPFD5408B LCD do not work with R61580 LCD. + * configs/pic32-starterkit: Beginning of a configuration for the Microchip + PIC32 Ethernet Starter Kit. Hmmm.. I don't have a clue how to test this + with no serial port?! + * lib/stdio/lib_fclose.c: fclose() always returns an error (EOF) when it + closes a read-only file. This is because it calls flush() which will + fail on read-only files. No harm is done other that a bad value is + returned. + * arch/sim/src/Makefile: Correct build issue for sim/nsh2 target. Old + libboard.a was not being cleaned. apps-6.11 2011-xx-xx Gregory Nutt <gnutt@nuttx.org> diff --git a/nuttx/arch/sim/src/Makefile b/nuttx/arch/sim/src/Makefile index d4da17d88..108a2bebd 100644 --- a/nuttx/arch/sim/src/Makefile +++ b/nuttx/arch/sim/src/Makefile @@ -114,8 +114,7 @@ LDLIBS = $(patsubst lib%,-l%,$(basename $(notdir $(LINKLIBS)))) # Add the board-specific library and directory -BOARDDIR = $(TOPDIR)/configs/sim/src -LDPATHS += -L $(BOARDDIR) +LDPATHS += -L board LDLIBS += -lboard # Make targets begin here @@ -144,8 +143,8 @@ libarch$(LIBEXT): $(NUTTXOBJS) # the simulation. However, this is a good place to keep parts of the simulation # that are not hardware-related. -$(BOARDDIR)/libboard$(LIBEXT): - @$(MAKE) -C $(BOARDDIR) TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRADEFINES=$(EXTRADEFINES) +board/libboard$(LIBEXT): + @$(MAKE) -C board TOPDIR="$(TOPDIR)" libboard$(LIBEXT) EXTRADEFINES=$(EXTRADEFINES) # A partially linked object containing only NuttX code (no interface to host OS) # Change the names of most symbols that conflict with libc symbols. @@ -159,7 +158,7 @@ GNU/Linux-names.dat: GNU nuttx-names.dat Cygwin-names.dat: nuttx-names.dat @cat $^ | sed -e "s/^/_/g" >$@ -nuttx.rel : libarch$(LIBEXT) $(BOARDDIR)/libboard$(LIBEXT) $(HOSTOS)-names.dat $(LINKOBJS) +nuttx.rel : libarch$(LIBEXT) board/libboard$(LIBEXT) $(HOSTOS)-names.dat $(LINKOBJS) @echo "LD: nuttx.rel" @$(LD) -r $(LDFLAGS) $(LDPATHS) -o $@ $(LINKOBJS) --start-group $(LDLIBS) --end-group $(EXTRA_LIBS) @$(OBJCOPY) --redefine-syms=$(HOSTOS)-names.dat $@ @@ -191,10 +190,16 @@ cleanrel: @rm -f nuttx.rel GNU/Linux-names.dat Cygwin-names.dat clean: cleanrel + @if [ -e board/Makefile ]; then \ + $(MAKE) -C board TOPDIR="$(TOPDIR)" clean ; \ + fi @rm -f nuttx.rel libarch$(LIBEXT) *~ .*.swp $(call CLEAN) distclean: clean + @if [ -e board/Makefile ]; then \ + $(MAKE) -C board TOPDIR="$(TOPDIR)" distclean ; \ + fi @rm -f Make.dep .depend @rm -rf GNU diff --git a/nuttx/configs/pic32-starterkit/README.txt b/nuttx/configs/pic32-starterkit/README.txt index a4e98054a..ea0447279 100644 --- a/nuttx/configs/pic32-starterkit/README.txt +++ b/nuttx/configs/pic32-starterkit/README.txt @@ -4,7 +4,7 @@ configs/pic32-starterkit README This README file discusses the port of NuttX to the Microchip PIC32 Ethernet Starter Kit (DM320004) with the Multimedia Expansion Board (MEB, DM320005). -Advanced USB Storage. See www.microchip.com for further information. +See www.microchip.com for further information. The PIC32 Ethernet Starter Kit includes: @@ -55,7 +55,6 @@ Contents Configurations PIC32MX795F512L Pin Out -PIC32MX795F512L Pin Out ======================= LEFT SIDE, TOP-TO-BOTTOM (if pin 1 is in upper left) |