diff options
-rwxr-xr-x | misc/pascal/config.info | 4 | ||||
-rw-r--r-- | misc/pascal/insn16/prun/pexec.c | 9 | ||||
-rw-r--r-- | nuttx/Documentation/NuttxPortingGuide.html | 12 | ||||
-rw-r--r-- | nuttx/configs/README.txt | 7 | ||||
-rw-r--r-- | nuttx/configs/c5471evm/defconfig | 18 | ||||
-rw-r--r-- | nuttx/configs/c5471evm/dhcpconfig | 18 | ||||
-rw-r--r-- | nuttx/configs/c5471evm/netconfig | 18 | ||||
-rw-r--r-- | nuttx/configs/c5471evm/nshconfig | 18 | ||||
-rw-r--r-- | nuttx/configs/m68332evb/defconfig | 18 | ||||
-rw-r--r-- | nuttx/configs/mcu123-lpc214x/defconfig | 18 | ||||
-rw-r--r-- | nuttx/configs/ntosd-dm320/defconfig | 18 | ||||
-rw-r--r-- | nuttx/configs/ntosd-dm320/netconfig | 18 | ||||
-rw-r--r-- | nuttx/configs/ntosd-dm320/udpconfig | 18 | ||||
-rw-r--r-- | nuttx/configs/ntosd-dm320/uipconfig | 18 | ||||
-rw-r--r-- | nuttx/configs/pjrc-8051/defconfig | 18 | ||||
-rw-r--r-- | nuttx/configs/sim/defconfig | 2 | ||||
-rw-r--r-- | nuttx/configs/sim/netconfig | 18 | ||||
-rw-r--r-- | nuttx/configs/z80sim/defconfig | 18 | ||||
-rw-r--r-- | nuttx/configs/z80sim/nshconfig | 18 |
19 files changed, 172 insertions, 114 deletions
diff --git a/misc/pascal/config.info b/misc/pascal/config.info index 8832061eb..b7ae3a05c 100755 --- a/misc/pascal/config.info +++ b/misc/pascal/config.info @@ -58,3 +58,7 @@ CONFIGS="$CONFIGS CONFIG_INSN32:n" # Register model selection CONFIG_REGM_INFO="Processor module supports a register machine" CONFIGS="$CONFIGS CONFIG_REGM:n" + +# Availability of libma.a +CONFIG_HAVE_LIBM_INFO="Host toolchain supports libm.a" +CONFIGS="$CONFIGS CONFIG_HAVE_LIBM:y" diff --git a/misc/pascal/insn16/prun/pexec.c b/misc/pascal/insn16/prun/pexec.c index 8249d55c6..b9d688e5a 100644 --- a/misc/pascal/insn16/prun/pexec.c +++ b/misc/pascal/insn16/prun/pexec.c @@ -41,7 +41,6 @@ #include <stdlib.h>
#include <string.h>
#include <ctype.h>
-#include <math.h>
#include "keywords.h"
#include "pdefs.h"
@@ -53,6 +52,10 @@ #include "paslib.h"
#include "pexec.h"
+#ifdef CONFIG_HAVE_LIBM
+#include <math.h>
+#endif
+
/****************************************************************************
* Definitions
****************************************************************************/
@@ -1037,6 +1040,7 @@ static uint16 pexec_execfp(struct pexec_s *st, ubyte fpop) PUSH(st, result.hw[2]);
PUSH(st, result.hw[3]);
break;
+#ifdef CONFIG_HAVE_LIBM
case fpABS :
pexec_getfparguments(st, fpop, &arg1, NULL);
result.f = fabs(arg1.f);
@@ -1045,6 +1049,7 @@ static uint16 pexec_execfp(struct pexec_s *st, ubyte fpop) PUSH(st, result.hw[2]);
PUSH(st, result.hw[3]);
break;
+#endif
case fpSQR :
pexec_getfparguments(st, fpop, &arg1, NULL);
result.f = arg1.f * arg1.f;
@@ -1053,6 +1058,7 @@ static uint16 pexec_execfp(struct pexec_s *st, ubyte fpop) PUSH(st, result.hw[2]);
PUSH(st, result.hw[3]);
break;
+#ifdef CONFIG_HAVE_LIBM
case fpSQRT :
pexec_getfparguments(st, fpop, &arg1, NULL);
result.f = sqrt(arg1.f);
@@ -1101,6 +1107,7 @@ static uint16 pexec_execfp(struct pexec_s *st, ubyte fpop) PUSH(st, result.hw[2]);
PUSH(st, result.hw[3]);
break;
+#endif
default :
return eBADFPOPCODE;
diff --git a/nuttx/Documentation/NuttxPortingGuide.html b/nuttx/Documentation/NuttxPortingGuide.html index 601bb2720..39769e601 100644 --- a/nuttx/Documentation/NuttxPortingGuide.html +++ b/nuttx/Documentation/NuttxPortingGuide.html @@ -16,7 +16,7 @@ </b></big> <p><small>by</small></p> <p>Gregory Nutt</p> - <p><small>Last Update: December 30, 2007</small></p> + <p><small>Last Update: January 6, 2006</small></p> </center> <center><h1>Table of Contents</h1></center> @@ -1245,6 +1245,16 @@ The system can be re-made subsequently by just typing <code>make</code>. The startaddress of DRAM (virtual)</li> </ul> +<p> + General build options: +</p> +<ul> + <li><code>CONFIG_RRLOAD_BINARY</code>: + Make the rrload binary format used with BSPs from <a href="www.ridgerun.com">ridgerun.com</a>.</li> + <li><code>CONFIG_HAVE_LIBM</code>: + Toolchain supports libm.a</li> +</ul> + <h2>General OS setup</h2> <ul> diff --git a/nuttx/configs/README.txt b/nuttx/configs/README.txt index 60151e243..b3470680a 100644 --- a/nuttx/configs/README.txt +++ b/nuttx/configs/README.txt @@ -120,6 +120,13 @@ defconfig -- This is a configuration file similar to the Linux CONFIG_DRAM_START - The start address of DRAM (physical) CONFIG_DRAM_VSTART - The startaddress of DRAM (virtual) + + General build options + + CONFIG_RRLOAD_BINARY - make the rrload binary format used with + BSPs from www.ridgerun.com + CONFIG_HAVE_LIBM - toolchain supports libm.a + General OS setup CONFIG_EXAMPLE - identifies the subdirectory in examples diff --git a/nuttx/configs/c5471evm/defconfig b/nuttx/configs/c5471evm/defconfig index ce8e142f6..85a2b5b8b 100644 --- a/nuttx/configs/c5471evm/defconfig +++ b/nuttx/configs/c5471evm/defconfig @@ -97,6 +97,16 @@ CONFIG_UART_IRDA_2STOP=0 CONFIG_UART_MODEM_2STOP=0 # +# General build options +# +# CONFIG_RRLOAD_BINARY - make the rrload binary format used with +# BSPs from www.ridgerun.com +# CONFIG_HAVE_LIBM - toolchain supports libm.a +# +CONFIG_RRLOAD_BINARY=y +CONFIG_HAVE_LIBM=n + +# # General OS setup # # CONFIG_EXAMPLE - identifies the subdirectory in examples @@ -193,14 +203,6 @@ CONFIG_ARCH_KZMALLOC=n CONFIG_ARCH_KFREE=n # -# General build options -# -# CONFIG_RRLOAD_BINARY - make the rrload binary format used with -# BSPs from www.ridgerun.com -# -CONFIG_RRLOAD_BINARY=y - -# # Sizes of configurable things (0 disables) # # CONFIG_MAX_TASKS - The maximum number of simultaneously diff --git a/nuttx/configs/c5471evm/dhcpconfig b/nuttx/configs/c5471evm/dhcpconfig index 1526f6149..555a051ab 100644 --- a/nuttx/configs/c5471evm/dhcpconfig +++ b/nuttx/configs/c5471evm/dhcpconfig @@ -97,6 +97,16 @@ CONFIG_UART_IRDA_2STOP=0 CONFIG_UART_MODEM_2STOP=0 # +# General build options +# +# CONFIG_RRLOAD_BINARY - make the rrload binary format used with +# BSPs from www.ridgerun.com +# CONFIG_HAVE_LIBM - toolchain supports libm.a +# +CONFIG_RRLOAD_BINARY=y +CONFIG_HAVE_LIBM=n + +# # General OS setup # # CONFIG_EXAMPLE - identifies the subdirectory in examples @@ -193,14 +203,6 @@ CONFIG_ARCH_KZMALLOC=n CONFIG_ARCH_KFREE=n # -# General build options -# -# CONFIG_RRLOAD_BINARY - make the rrload binary format used with -# BSPs from www.ridgerun.com -# -CONFIG_RRLOAD_BINARY=y - -# # Sizes of configurable things (0 disables) # # CONFIG_MAX_TASKS - The maximum number of simultaneously diff --git a/nuttx/configs/c5471evm/netconfig b/nuttx/configs/c5471evm/netconfig index 153b3e72a..1d73d1bbe 100644 --- a/nuttx/configs/c5471evm/netconfig +++ b/nuttx/configs/c5471evm/netconfig @@ -66,6 +66,16 @@ CONFIG_ARCH_LEDS=y CONFIG_ARCH_STACKDUMP=y # +# General build options +# +# CONFIG_RRLOAD_BINARY - make the rrload binary format used with +# BSPs from www.ridgerun.com +# CONFIG_HAVE_LIBM - toolchain supports libm.a +# +CONFIG_RRLOAD_BINARY=y +CONFIG_HAVE_LIBM=n + +# # C5471 specific device driver settings # # CONFIG_SERIAL_IRDA_CONSOLE - selects the IRDA UART for the @@ -193,14 +203,6 @@ CONFIG_ARCH_KZMALLOC=n CONFIG_ARCH_KFREE=n # -# General build options -# -# CONFIG_RRLOAD_BINARY - make the rrload binary format used with -# BSPs from www.ridgerun.com -# -CONFIG_RRLOAD_BINARY=y - -# # Sizes of configurable things (0 disables) # # CONFIG_MAX_TASKS - The maximum number of simultaneously diff --git a/nuttx/configs/c5471evm/nshconfig b/nuttx/configs/c5471evm/nshconfig index fc611ac73..9e185994f 100644 --- a/nuttx/configs/c5471evm/nshconfig +++ b/nuttx/configs/c5471evm/nshconfig @@ -97,6 +97,16 @@ CONFIG_UART_IRDA_2STOP=0 CONFIG_UART_MODEM_2STOP=0 # +# General build options +# +# CONFIG_RRLOAD_BINARY - make the rrload binary format used with +# BSPs from www.ridgerun.com +# CONFIG_HAVE_LIBM - toolchain supports libm.a +# +CONFIG_RRLOAD_BINARY=y +CONFIG_HAVE_LIBM=n + +# # General OS setup # # CONFIG_EXAMPLE - identifies the subdirectory in examples @@ -193,14 +203,6 @@ CONFIG_ARCH_KZMALLOC=n CONFIG_ARCH_KFREE=n # -# General build options -# -# CONFIG_RRLOAD_BINARY - make the rrload binary format used with -# BSPs from www.ridgerun.com -# -CONFIG_RRLOAD_BINARY=y - -# # Sizes of configurable things (0 disables) # # CONFIG_MAX_TASKS - The maximum number of simultaneously diff --git a/nuttx/configs/m68332evb/defconfig b/nuttx/configs/m68332evb/defconfig index ce4bed812..99dc97c53 100644 --- a/nuttx/configs/m68332evb/defconfig +++ b/nuttx/configs/m68332evb/defconfig @@ -86,6 +86,16 @@ CONFIG_UART0_2STOP=0 CONFIG_UART1_2STOP=0 # +# General build options +# +# CONFIG_RRLOAD_BINARY - make the rrload binary format used with +# BSPs from www.ridgerun.com +# CONFIG_HAVE_LIBM - toolchain supports libm.a +# +CONFIG_RRLOAD_BINARY=n +CONFIG_HAVE_LIBM=n + +# # General OS setup # # CONFIG_EXAMPLE - identifies the subdirectory in examples @@ -182,14 +192,6 @@ CONFIG_ARCH_KZMALLOC=n CONFIG_ARCH_KFREE=n # -# General build options -# -# CONFIG_RRLOAD_BINARY - make the rrload binary format used with -# BSPs from www.ridgerun.com -# -CONFIG_RRLOAD_BINARY=n - -# # Sizes of configurable things (0 disables) # # CONFIG_MAX_TASKS - The maximum number of simultaneously diff --git a/nuttx/configs/mcu123-lpc214x/defconfig b/nuttx/configs/mcu123-lpc214x/defconfig index 6401217c8..93883dfd1 100644 --- a/nuttx/configs/mcu123-lpc214x/defconfig +++ b/nuttx/configs/mcu123-lpc214x/defconfig @@ -110,6 +110,16 @@ CONFIG_UART0_2STOP=0 CONFIG_UART1_2STOP=0 # +# General build options +# +# CONFIG_RRLOAD_BINARY - make the rrload binary format used with +# BSPs from www.ridgerun.com +# CONFIG_HAVE_LIBM - toolchain supports libm.a +# +CONFIG_RRLOAD_BINARY=n +CONFIG_HAVE_LIBM=n + +# # General OS setup # # CONFIG_EXAMPLE - identifies the subdirectory in examples @@ -206,14 +216,6 @@ CONFIG_ARCH_KZMALLOC=n CONFIG_ARCH_KFREE=n # -# General build options -# -# CONFIG_RRLOAD_BINARY - make the rrload binary format used with -# BSPs from www.ridgerun.com -# -CONFIG_RRLOAD_BINARY=y - -# # Sizes of configurable things (0 disables) # # CONFIG_MAX_TASKS - The maximum number of simultaneously diff --git a/nuttx/configs/ntosd-dm320/defconfig b/nuttx/configs/ntosd-dm320/defconfig index e4e53bc8c..d6c138167 100644 --- a/nuttx/configs/ntosd-dm320/defconfig +++ b/nuttx/configs/ntosd-dm320/defconfig @@ -95,6 +95,16 @@ CONFIG_UART0_2STOP=0 CONFIG_UART1_2STOP=0 # +# General build options +# +# CONFIG_RRLOAD_BINARY - make the rrload binary format used with +# BSPs from www.ridgerun.com +# CONFIG_HAVE_LIBM - toolchain supports libm.a +# +CONFIG_RRLOAD_BINARY=n +CONFIG_HAVE_LIBM=n + +# # General OS setup # # CONFIG_EXAMPLE - identifies the subdirectory in examples @@ -191,14 +201,6 @@ CONFIG_ARCH_KZMALLOC=n CONFIG_ARCH_KFREE=n # -# General build options -# -# CONFIG_RRLOAD_BINARY - make the rrload binary format used with -# BSPs from www.ridgerun.com -# -CONFIG_RRLOAD_BINARY=n - -# # Sizes of configurable things (0 disables) # # CONFIG_MAX_TASKS - The maximum number of simultaneously diff --git a/nuttx/configs/ntosd-dm320/netconfig b/nuttx/configs/ntosd-dm320/netconfig index 3115a076f..99c790c57 100644 --- a/nuttx/configs/ntosd-dm320/netconfig +++ b/nuttx/configs/ntosd-dm320/netconfig @@ -95,6 +95,16 @@ CONFIG_UART0_2STOP=0 CONFIG_UART1_2STOP=0 # +# General build options +# +# CONFIG_RRLOAD_BINARY - make the rrload binary format used with +# BSPs from www.ridgerun.com +# CONFIG_HAVE_LIBM - toolchain supports libm.a +# +CONFIG_RRLOAD_BINARY=n +CONFIG_HAVE_LIBM=n + +# # General OS setup # # CONFIG_EXAMPLE - identifies the subdirectory in examples @@ -191,14 +201,6 @@ CONFIG_ARCH_KZMALLOC=n CONFIG_ARCH_KFREE=n # -# General build options -# -# CONFIG_RRLOAD_BINARY - make the rrload binary format used with -# BSPs from www.ridgerun.com -# -CONFIG_RRLOAD_BINARY=n - -# # Sizes of configurable things (0 disables) # # CONFIG_MAX_TASKS - The maximum number of simultaneously diff --git a/nuttx/configs/ntosd-dm320/udpconfig b/nuttx/configs/ntosd-dm320/udpconfig index dfa00b100..e5e52153d 100644 --- a/nuttx/configs/ntosd-dm320/udpconfig +++ b/nuttx/configs/ntosd-dm320/udpconfig @@ -95,6 +95,16 @@ CONFIG_UART0_2STOP=0 CONFIG_UART1_2STOP=0 # +# General build options +# +# CONFIG_RRLOAD_BINARY - make the rrload binary format used with +# BSPs from www.ridgerun.com +# CONFIG_HAVE_LIBM - toolchain supports libm.a +# +CONFIG_RRLOAD_BINARY=n +CONFIG_HAVE_LIBM=n + +# # General OS setup # # CONFIG_EXAMPLE - identifies the subdirectory in examples @@ -191,14 +201,6 @@ CONFIG_ARCH_KZMALLOC=n CONFIG_ARCH_KFREE=n # -# General build options -# -# CONFIG_RRLOAD_BINARY - make the rrload binary format used with -# BSPs from www.ridgerun.com -# -CONFIG_RRLOAD_BINARY=n - -# # Sizes of configurable things (0 disables) # # CONFIG_MAX_TASKS - The maximum number of simultaneously diff --git a/nuttx/configs/ntosd-dm320/uipconfig b/nuttx/configs/ntosd-dm320/uipconfig index f5e523c54..37516219d 100644 --- a/nuttx/configs/ntosd-dm320/uipconfig +++ b/nuttx/configs/ntosd-dm320/uipconfig @@ -95,6 +95,16 @@ CONFIG_UART0_2STOP=0 CONFIG_UART1_2STOP=0 # +# General build options +# +# CONFIG_RRLOAD_BINARY - make the rrload binary format used with +# BSPs from www.ridgerun.com +# CONFIG_HAVE_LIBM - toolchain supports libm.a +# +CONFIG_RRLOAD_BINARY=n +CONFIG_HAVE_LIBM=n + +# # General OS setup # # CONFIG_EXAMPLE - identifies the subdirectory in examples @@ -191,14 +201,6 @@ CONFIG_ARCH_KZMALLOC=n CONFIG_ARCH_KFREE=n # -# General build options -# -# CONFIG_RRLOAD_BINARY - make the rrload binary format used with -# BSPs from www.ridgerun.com -# -CONFIG_RRLOAD_BINARY=n - -# # Sizes of configurable things (0 disables) # # CONFIG_MAX_TASKS - The maximum number of simultaneously diff --git a/nuttx/configs/pjrc-8051/defconfig b/nuttx/configs/pjrc-8051/defconfig index fd2965129..e10a6d540 100644 --- a/nuttx/configs/pjrc-8051/defconfig +++ b/nuttx/configs/pjrc-8051/defconfig @@ -83,6 +83,16 @@ CONFIG_INTERRUPT_FRAME_DUMP=n CONFIG_LED_DEBUG=n # +# General build options +# +# CONFIG_RRLOAD_BINARY - make the rrload binary format used with +# BSPs from www.ridgerun.com +# CONFIG_HAVE_LIBM - toolchain supports libm.a +# +CONFIG_RRLOAD_BINARY=n +CONFIG_HAVE_LIBM=n + +# # General OS setup # # CONFIG_EXAMPLE - identifies the subdirectory in examples @@ -179,14 +189,6 @@ CONFIG_ARCH_KZMALLOC=n CONFIG_ARCH_KFREE=n # -# General build options -# -# CONFIG_RRLOAD_BINARY - make the rrload binary format used with -# BSPs from www.ridgerun.com -# -CONFIG_RRLOAD_BINARY=n - -# # Sizes of configurable things (0 disables) # # CONFIG_MAX_TASKS - The maximum number of simultaneously diff --git a/nuttx/configs/sim/defconfig b/nuttx/configs/sim/defconfig index 85e0f865b..d7c2eb0fc 100644 --- a/nuttx/configs/sim/defconfig +++ b/nuttx/configs/sim/defconfig @@ -151,8 +151,10 @@ CONFIG_ARCH_KFREE=n # # CONFIG_RRLOAD_BINARY - make the rrload binary format used with # BSPs from www.ridgerun.com +# CONFIG_HAVE_LIBM - toolchain supports libm.a # CONFIG_RRLOAD_BINARY=n +CONFIG_HAVE_LIBM=y # # Sizes of configurable things (0 disables) diff --git a/nuttx/configs/sim/netconfig b/nuttx/configs/sim/netconfig index 264bfb9f9..77f4ae829 100644 --- a/nuttx/configs/sim/netconfig +++ b/nuttx/configs/sim/netconfig @@ -51,6 +51,16 @@ CONFIG_ARCH_BOARD=sim CONFIG_ARCH_BOARD_SIM=y # +# General build options +# +# CONFIG_RRLOAD_BINARY - make the rrload binary format used with +# BSPs from www.ridgerun.com +# CONFIG_HAVE_LIBM - toolchain supports libm.a +# +CONFIG_RRLOAD_BINARY=n +CONFIG_HAVE_LIBM=y + +# # General OS setup # # CONFIG_EXAMPLE - identifies the subdirectory in examples @@ -148,14 +158,6 @@ CONFIG_ARCH_KZMALLOC=n CONFIG_ARCH_KFREE=n # -# General build options -# -# CONFIG_RRLOAD_BINARY - make the rrload binary format used with -# BSPs from www.ridgerun.com -# -CONFIG_RRLOAD_BINARY=n - -# # Sizes of configurable things (0 disables) # # CONFIG_MAX_TASKS - The maximum number of simultaneously diff --git a/nuttx/configs/z80sim/defconfig b/nuttx/configs/z80sim/defconfig index e52913f7d..4de440afc 100644 --- a/nuttx/configs/z80sim/defconfig +++ b/nuttx/configs/z80sim/defconfig @@ -65,6 +65,16 @@ CONFIG_UART_RXBUFSIZE=0 CONFIG_UART_TXBUFSIZE=0 # +# General build options +# +# CONFIG_RRLOAD_BINARY - make the rrload binary format used with +# BSPs from www.ridgerun.com +# CONFIG_HAVE_LIBM - toolchain supports libm.a +# +CONFIG_RRLOAD_BINARY=n +CONFIG_HAVE_LIBM=n + +# # General OS setup # # CONFIG_EXAMPLE - identifies the subdirectory in examples @@ -161,14 +171,6 @@ CONFIG_ARCH_KZMALLOC=n CONFIG_ARCH_KFREE=n # -# General build options -# -# CONFIG_RRLOAD_BINARY - make the rrload binary format used with -# BSPs from www.ridgerun.com -# -CONFIG_RRLOAD_BINARY=n - -# # Sizes of configurable things (0 disables) # # CONFIG_MAX_TASKS - The maximum number of simultaneously diff --git a/nuttx/configs/z80sim/nshconfig b/nuttx/configs/z80sim/nshconfig index 63326cb6f..aa852ef8a 100644 --- a/nuttx/configs/z80sim/nshconfig +++ b/nuttx/configs/z80sim/nshconfig @@ -65,6 +65,16 @@ CONFIG_UART_RXBUFSIZE=64 CONFIG_UART_TXBUFSIZE=64 # +# General build options +# +# CONFIG_RRLOAD_BINARY - make the rrload binary format used with +# BSPs from www.ridgerun.com +# CONFIG_HAVE_LIBM - toolchain supports libm.a +# +CONFIG_RRLOAD_BINARY=n +CONFIG_HAVE_LIBM=n + +# # General OS setup # # CONFIG_EXAMPLE - identifies the subdirectory in examples @@ -161,14 +171,6 @@ CONFIG_ARCH_KZMALLOC=n CONFIG_ARCH_KFREE=n # -# General build options -# -# CONFIG_RRLOAD_BINARY - make the rrload binary format used with -# BSPs from www.ridgerun.com -# -CONFIG_RRLOAD_BINARY=n - -# # Sizes of configurable things (0 disables) # # CONFIG_MAX_TASKS - The maximum number of simultaneously |