diff options
Diffstat (limited to 'nuttx')
| -rw-r--r-- | nuttx/ChangeLog | 3 | ||||
| -rw-r--r-- | nuttx/Documentation/NuttX.html | 7 | ||||
| -rw-r--r-- | nuttx/Documentation/NuttxPortingGuide.html | 9 | ||||
| -rw-r--r-- | nuttx/Makefile | 3 | ||||
| -rw-r--r-- | nuttx/TODO | 6 | ||||
| -rw-r--r-- | nuttx/configs/README.txt | 7 | ||||
| -rwxr-xr-x | nuttx/configs/mcu123-lpc214x/lpc21isp.sh | 7 | ||||
| -rw-r--r-- | nuttx/configs/mcu123-lpc214x/ostest/Make.defs | 2 | ||||
| -rw-r--r-- | nuttx/configs/mcu123-lpc214x/ostest/defconfig | 28 |
9 files changed, 43 insertions, 29 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index b35356c34..af944aeb9 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -474,5 +474,8 @@ * Add mmap() API with restricted capability (only for XIP support) * Extend ROMFS test at /examples/romfs to verify mmap() and XIP support. * Add support for Intel Hex format output using objcopy + * Complete the basic port of the NXP LPC2148 on the mcu123.com board. + The basic port includes successful booting, serial console and succesfully + passing the examples/ostest. diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html index bf0082c43..e93eb5bcb 100644 --- a/nuttx/Documentation/NuttX.html +++ b/nuttx/Documentation/NuttX.html @@ -8,7 +8,7 @@ <tr align="center" bgcolor="#e4e4e4"> <td> <h1><big><font color="#3c34ec"><i>NuttX RTOS</i></font></big></h1> - <p>Last Updated: September 12, 2008</p> + <p>Last Updated: September 17, 2008</p> </td> </tr> </table> @@ -609,7 +609,7 @@ </p> <p> <b>STATUS:</b> - Initial coding of this port code complete but has not yet been verified. + A basic port that boots and supports a serial console is in place. </p> </td> </tr> @@ -1108,6 +1108,9 @@ nuttx-0.3.15 2008-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> * Add mmap() API with restricted capability (only for XIP support) * Extend ROMFS test at /examples/romfs to verify mmap() and XIP support. * Add support for Intel Hex format output using objcopy + * Complete the basic port of the NXP LPC2148 on the mcu123.com board. + The basic port includes successful booting, serial console and succesfully + passing the examples/ostest. pascal-0.1.3 2008-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> diff --git a/nuttx/Documentation/NuttxPortingGuide.html b/nuttx/Documentation/NuttxPortingGuide.html index 2693f1941..a2773bcde 100644 --- a/nuttx/Documentation/NuttxPortingGuide.html +++ b/nuttx/Documentation/NuttxPortingGuide.html @@ -16,7 +16,7 @@ </b></big></h1> <p><small>by</small></p> <p>Gregory Nutt</p> - <p><small>Last Update: September 1, 2008</small></p> + <p><small>Last Update: September 17, 2008</small></p> </center> <center><h1>Table of Contents</h1></center> @@ -1338,8 +1338,11 @@ The system can be re-made subsequently by just typing <code>make</code>. using the <code>tools/mkimage.sh</code> script.</li> <li><code>CONFIG_INTELHEX_BINARY</code>: Make the Intel HEX binary format used with many different loaders using the GNU objcopy program - Should not be selected if you are not using the GNU toolchain.</li> - <li><code>CONFIG_HAVE_LIBM</code>: + This option hould not be selected if you are not using the GNU toolchain.</li> + <li><code>CONFIG_RAW_BINARY</code>: + mmke a raw binary format file used with many different loaders using the GNU objcopy program. + This option should not be selected if you are not using the GNU toolchain.</li> + <li><code>CONFIG_HAVE_LIBM</code>: Toolchain supports libm.a</li> </ul> diff --git a/nuttx/Makefile b/nuttx/Makefile index b31afe382..96f7b1f64 100644 --- a/nuttx/Makefile +++ b/nuttx/Makefile @@ -213,6 +213,9 @@ endif ifeq ($(CONFIG_INTELHEX_BINARY),y) @$(OBJCOPY) -O ihex $(TOPDIR)/$@ $(TOPDIR)/$@.ihx endif +ifeq ($(CONFIG_RAW_BINARY),y) + @$(OBJCOPY) -O binary $(TOPDIR)/$@ $(TOPDIR)/$@.bin +endif depend: @for dir in $(MAKEDIRS) ; do \ diff --git a/nuttx/TODO b/nuttx/TODO index cc4071b47..6555ce5d8 100644 --- a/nuttx/TODO +++ b/nuttx/TODO @@ -19,7 +19,7 @@ NuttX TODO List (Last updated July 31, 2008) (1) ARM (arch/arm/) (1) ARM/C5471 (arch/arm/src/c5471/) (1) ARM/DM320 (arch/arm/src/dm320/) - (2) ARM/LPC214x (arch/arm/src/lpc214x/) + (1) ARM/LPC214x (arch/arm/src/lpc214x/) (4) pjrc-8052 / MCS51 (arch/pjrc-8051/) (7) z80/z8 (arch/z80/) (8) z16 (arch/z16/) @@ -349,10 +349,6 @@ o ARM/DM320 (arch/arm/src/dm320/) o ARM/LPC214x (arch/arm/src/lpc214x/) ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - Description: Finish bringup - Status: Open - Priority: High - Description: Add MMC and USB support Status: Open Priority: Mediam diff --git a/nuttx/configs/README.txt b/nuttx/configs/README.txt index 1b8bbad28..492f1f1c6 100644 --- a/nuttx/configs/README.txt +++ b/nuttx/configs/README.txt @@ -141,6 +141,9 @@ defconfig -- This is a configuration file similar to the Linux CONFIG_INTELHEX_BINARY - make the Intel HEX binary format used with many different loaders using the GNU objcopy program Should not be selected if you are not using the GNU toolchain. + CONFIG_RAW_BINARY - make a raw binary format file used with many + different loaders using the GNU objcopy program. This option + should not be selected if you are not using the GNU toolchain. CONFIG_HAVE_LIBM - toolchain supports libm.a General OS setup @@ -335,8 +338,8 @@ configs/ntosd-dm320 configs/mcu123-lpc214x This port is for the NXP LPC2148 as provided on the mcu123.com lpc214x development board. - STATUS: This port is in progress and should be available in the - nuttx-0.2.5 release. + STATUS: A basic port that boots and supports a serial console + is in place. configs/m68322evb This is a work in progress for the venerable m68322evb board from diff --git a/nuttx/configs/mcu123-lpc214x/lpc21isp.sh b/nuttx/configs/mcu123-lpc214x/lpc21isp.sh index 1355a55a5..ccb2025dd 100755 --- a/nuttx/configs/mcu123-lpc214x/lpc21isp.sh +++ b/nuttx/configs/mcu123-lpc214x/lpc21isp.sh @@ -41,12 +41,11 @@ lpc21isp=../lpc2148/lpc21isp/lpc21isp # lpc21ips options -#options="-debug -control -verify" -options="-control -verify" +options="-bin -control -verify" -# The path to the NuttX Intel Hex format binary +# The path to the NuttX raw binary format binary -hxfile=nuttx.ihx +hxfile=nuttx.bin # The TTY to use for the download diff --git a/nuttx/configs/mcu123-lpc214x/ostest/Make.defs b/nuttx/configs/mcu123-lpc214x/ostest/Make.defs index c0124cba0..f8451a321 100644 --- a/nuttx/configs/mcu123-lpc214x/ostest/Make.defs +++ b/nuttx/configs/mcu123-lpc214x/ostest/Make.defs @@ -47,7 +47,7 @@ ARCHPICFLAGS = -fpic ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow ARCHDEFINES = ARCHINCLUDES = -I. -isystem $(TOPDIR)/include -ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/ld.script +ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/ostest/ld.script CROSSDEV = arm-elf- CC = $(CROSSDEV)gcc diff --git a/nuttx/configs/mcu123-lpc214x/ostest/defconfig b/nuttx/configs/mcu123-lpc214x/ostest/defconfig index c1aa4e98d..9d1567d3d 100644 --- a/nuttx/configs/mcu123-lpc214x/ostest/defconfig +++ b/nuttx/configs/mcu123-lpc214x/ostest/defconfig @@ -57,7 +57,7 @@ CONFIG_ARCH_CHIP=lpc214x CONFIG_ARCH_LPC2148=y CONFIG_ARCH_BOARD=mcu123-lpc214x CONFIG_ARCH_BOARD_MCU123=y -CONFIG_BOARD_LOOPSPERMSEC=2778 +CONFIG_BOARD_LOOPSPERMSEC=4327 CONFIG_ARCH_LEDS=y CONFIG_DRAM_SIZE=0x00008000 CONFIG_DRAM_START=0x40000000 @@ -117,10 +117,14 @@ CONFIG_UART1_2STOP=0 # CONFIG_INTELHEX_BINARY - make the Intel HEX binary format # used with many different loaders using the GNU objcopy program # Should not be selected if you are not using the GNU toolchain. +# CONFIG_RAW_BINARY - make a raw binary format file used with many +# different loaders using the GNU objcopy program. This option +# should not be selected if you are not using the GNU toolchain. # CONFIG_HAVE_LIBM - toolchain supports libm.a # CONFIG_RRLOAD_BINARY=n -CONFIG_INTELHEX_BINARY=y +CONFIG_INTELHEX_BINARY=n +CONFIG_RAW_BINARY=y CONFIG_HAVE_LIBM=n # @@ -254,19 +258,19 @@ CONFIG_ARCH_KFREE=n # timer structures to minimize dynamic allocations. Set to # zero for all dynamic allocations. # -CONFIG_MAX_TASKS=64 +CONFIG_MAX_TASKS=16 CONFIG_MAX_TASK_ARGS=4 CONFIG_NPTHREAD_KEYS=4 -CONFIG_NFILE_DESCRIPTORS=32 -CONFIG_NFILE_STREAMS=16 +CONFIG_NFILE_DESCRIPTORS=8 +CONFIG_NFILE_STREAMS=8 CONFIG_NAME_MAX=32 -CONFIG_STDIO_BUFFER_SIZE=1024 +CONFIG_STDIO_BUFFER_SIZE=512 CONFIG_NUNGET_CHARS=2 -CONFIG_PREALLOC_MQ_MSGS=32 +CONFIG_PREALLOC_MQ_MSGS=8 CONFIG_MQ_MAXMSGSIZE=32 CONFIG_MAX_WDOGPARMS=4 -CONFIG_PREALLOC_WDOGS=32 -CONFIG_PREALLOC_TIMERS=8 +CONFIG_PREALLOC_WDOGS=8 +CONFIG_PREALLOC_TIMERS=4 # # TCP/IP and UDP support via uIP @@ -326,7 +330,7 @@ CONFIG_EXAMPLES_NSH_CONSOLE=y CONFIG_EXAMPLES_NSH_TELNET=n CONFIG_EXAMPLES_NSH_IOBUFFER_SIZE=512 CONFIG_EXAMPLES_NSH_CMD_SIZE=40 -CONFIG_EXAMPLES_NSH_STACKSIZE=4096 +CONFIG_EXAMPLES_NSH_STACKSIZE=1024 CONFIG_EXAMPLES_NSH_DHCPC=n CONFIG_EXAMPLES_NSH_NOMAC=n CONFIG_EXAMPLES_NSH_IPADDR=(10<<24|0<<16|0<<8|2) @@ -350,8 +354,8 @@ CONFIG_EXAMPLES_NSH_NETMASK=(255<<24|255<<16|255<<8|0) CONFIG_BOOT_FROM_FLASH=y CONFIG_CUSTOM_STACK=n CONFIG_STACK_POINTER= -CONFIG_PROC_STACK_SIZE=4096 +CONFIG_PROC_STACK_SIZE=1024 CONFIG_PTHREAD_STACK_MIN=256 -CONFIG_PTHREAD_STACK_DEFAULT=4096 +CONFIG_PTHREAD_STACK_DEFAULT=1024 CONFIG_HEAP_BASE= CONFIG_HEAP_SIZE= |