diff options
Diffstat (limited to 'nuttx')
-rw-r--r-- | nuttx/ChangeLog | 2 | ||||
-rw-r--r-- | nuttx/Documentation/NuttX.html | 23 | ||||
-rw-r--r-- | nuttx/Makefile | 16 | ||||
-rw-r--r-- | nuttx/configs/sim/pashello/appconfig | 3 | ||||
-rw-r--r-- | nuttx/configs/xtrs/pashello/appconfig | 4 | ||||
-rw-r--r-- | nuttx/configs/z16f2800100zcog/pashello/appconfig | 3 | ||||
-rw-r--r-- | nuttx/configs/z80sim/pashello/appconfig | 4 |
7 files changed, 38 insertions, 17 deletions
diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 69dc8fc1e..1d696e6f4 100644 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -1733,3 +1733,5 @@ * configs/pcblogic-pic32mx: Add directory structure for PCB Logic PIC32MX board * apps/include: Move include/apps to apps/include. A symbolic link is created at build time + * Makefile: Removed support for Pascal pcode interpreter. Support for that + interpreter has been moved to apps/interpreter/Makefile. diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html index 4d5691b08..391849996 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: May 6, 2011</p> + <p>Last Updated: May 10, 2011</p> </td> </tr> </table> @@ -2189,9 +2189,28 @@ buildroot-1.10 2011-05-06 <spudmonkey@racsa.co.cr> <ul><pre> nuttx-6.3 2011-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> + * Remove clock_getutc(). It is replaces with clock_gettime(CLOCK_ACTIVETIME). + Add other RTC related changes provided by Uros Platise. + * arch/arm/src/stm32/stm32_flash.c: Add support for access to on-chp STM32 + FLASH; beginning of integration with NXFFS (Uros Platise). + * arch/mips: Added directory structure for PIC32 support + * configs/pcblogic-pic32mx: Add directory structure for PCB Logic PIC32MX board + * apps/include: Move include/apps to apps/include. A symbolic link is created at + build time + * Makefile: Removed support for Pascal pcode interpreter. Support for that + interpreter has been moved to apps/interpreter/Makefile. + apps-6.3 2011-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> -pascal-2.1 2011-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> + * apps/interpreter: Add a directory to hold interpreters. The Pascal add- + on module now installs and builds under this directory. + +pascal-3.0 2011-xx-xx Gregory Nutt <spudmonkey@racsa.co.cr> + + * nuttx/: The Pascal add-on module now installs and builds under the + apps/interpreters directory. This means that the pascal-2.1 module is + incompatible with will all releases of NuttX prior to nuttx-6.0 where the + apps/ module was introduced. buildroot-1.11 2011-xx-xx <spudmonkey@racsa.co.cr> </pre></ul> diff --git a/nuttx/Makefile b/nuttx/Makefile index 8785f1a1f..b74f9e225 100644 --- a/nuttx/Makefile +++ b/nuttx/Makefile @@ -1,7 +1,6 @@ ############################################################################ # Makefile # -# # Copyright (C) 2007-2011 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <spudmonkey@racsa.co.cr> # @@ -70,16 +69,12 @@ CONFIG_APPS_DIR = ../apps endif APPDIR := ${shell if [ -r $(CONFIG_APPS_DIR)/Makefile ]; then echo "$(CONFIG_APPS_DIR)"; fi} -# The Pascal p-code add-on directory - -PCODE_DIR := ${shell if [ -r pcode/Makefile ]; then echo "pcode"; fi} - # All add-on directories. # # NUTTX_ADDONS is the list of directories built into the NuttX kernel. # USER_ADDONS is the list of directories that will be built into the user application -NUTTX_ADDONS := $(PCODE_DIR) $(NX_DIR) +NUTTX_ADDONS := $(NX_DIR) USER_ADDONS := ifeq ($(CONFIG_NUTTX_KERNEL),y) @@ -228,12 +223,6 @@ else NUTTXLIBS += fs/libfs$(LIBEXT) drivers/libdrivers$(LIBEXT) binfmt/libbinfmt$(LIBEXT) endif -# Add libraries for Pascall P-Code - -ifneq ($(PCODE_DIR),) -NUTTXLIBS += $(PCODE_DIR)/libpcode$(LIBEXT) -endif - # Add libraries for the NX graphics sub-system ifneq ($(NX_DIR),) @@ -357,9 +346,6 @@ drivers/libdrivers$(LIBEXT): context binfmt/libbinfmt$(LIBEXT): context @$(MAKE) -C binfmt TOPDIR="$(TOPDIR)" libbinfmt$(LIBEXT) EXTRADEFINES=$(KDEFINE) -pcode/libpcode$(LIBEXT): context - @$(MAKE) -C pcode TOPDIR="$(TOPDIR)" libpcode$(LIBEXT) EXTRADEFINES=$(KDEFINE) - graphics/libgraphics$(LIBEXT): context @$(MAKE) -C graphics TOPDIR="$(TOPDIR)" libgraphics$(LIBEXT) EXTRADEFINES=$(KDEFINE) diff --git a/nuttx/configs/sim/pashello/appconfig b/nuttx/configs/sim/pashello/appconfig index 30d83caaf..d4adbcce1 100644 --- a/nuttx/configs/sim/pashello/appconfig +++ b/nuttx/configs/sim/pashello/appconfig @@ -37,3 +37,6 @@ CONFIGURED_APPS += examples/pashello +# Path to the Pascal p-code runtime interpreter module + +CONFIGURED_APPS += interpreters/pcode diff --git a/nuttx/configs/xtrs/pashello/appconfig b/nuttx/configs/xtrs/pashello/appconfig index cb1af14a3..0deb0b01b 100644 --- a/nuttx/configs/xtrs/pashello/appconfig +++ b/nuttx/configs/xtrs/pashello/appconfig @@ -37,3 +37,7 @@ CONFIGURED_APPS += examples/pashello +# Path to the Pascal p-code runtime interpreter module + +CONFIGURED_APPS += interpreters/pcode + diff --git a/nuttx/configs/z16f2800100zcog/pashello/appconfig b/nuttx/configs/z16f2800100zcog/pashello/appconfig index f77eca16a..07a95ee0f 100644 --- a/nuttx/configs/z16f2800100zcog/pashello/appconfig +++ b/nuttx/configs/z16f2800100zcog/pashello/appconfig @@ -37,3 +37,6 @@ CONFIGURED_APPS += examples/pashello +# Path to the Pascal p-code runtime interpreter module + +CONFIGURED_APPS += interpreters/pcode diff --git a/nuttx/configs/z80sim/pashello/appconfig b/nuttx/configs/z80sim/pashello/appconfig index b08323b16..faa2589ab 100644 --- a/nuttx/configs/z80sim/pashello/appconfig +++ b/nuttx/configs/z80sim/pashello/appconfig @@ -37,3 +37,7 @@ CONFIGURED_APPS += examples/pashello +# Path to the Pascal p-code runtime interpreter module + +CONFIGURED_APPS += interpreters/pcode + |