diff options
author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-12-08 21:31:43 +0000 |
---|---|---|
committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-12-08 21:31:43 +0000 |
commit | 9ba1a8f55d7224dfa2ca260bad6891b8222e96fb (patch) | |
tree | 2ce062b0ca06058601d4d991e91467a92738bd67 /nuttx | |
parent | c5d9112de113f09613684d58f1b41fdf0c36def6 (diff) | |
download | px4-firmware-9ba1a8f55d7224dfa2ca260bad6891b8222e96fb.tar.gz px4-firmware-9ba1a8f55d7224dfa2ca260bad6891b8222e96fb.tar.bz2 px4-firmware-9ba1a8f55d7224dfa2ca260bad6891b8222e96fb.zip |
Fixes for configs/z80sim/pashello Windows native build
git-svn-id: http://svn.code.sf.net/p/nuttx/code/trunk@5420 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx')
-rw-r--r-- | nuttx/arch/z80/src/z80/up_mem.h | 6 | ||||
-rw-r--r-- | nuttx/configs/z80sim/README.txt | 25 | ||||
-rw-r--r-- | nuttx/configs/z80sim/nsh/defconfig | 2 | ||||
-rw-r--r-- | nuttx/configs/z80sim/ostest/defconfig | 2 | ||||
-rw-r--r-- | nuttx/configs/z80sim/pashello/defconfig | 4 |
5 files changed, 21 insertions, 18 deletions
diff --git a/nuttx/arch/z80/src/z80/up_mem.h b/nuttx/arch/z80/src/z80/up_mem.h index 9273d3f89..a12b52656 100644 --- a/nuttx/arch/z80/src/z80/up_mem.h +++ b/nuttx/arch/z80/src/z80/up_mem.h @@ -33,8 +33,8 @@ * ************************************************************************************/ -#ifndef nuttx.lnk__ARCH_Z80_SRC_COMMON_UP_MEM_H -#define nuttx.lnk__ARCH_Z80_SRC_COMMON_UP_MEM_H +#ifndef __ARCH_Z80_SRC_COMMON_UP_MEM_H +#define __ARCH_Z80_SRC_COMMON_UP_MEM_H /************************************************************************************ * Included Files @@ -72,4 +72,4 @@ extern const uint16_t g_heapbase; -#endif /* nuttx.lnk__ARCH_Z80_SRC_COMMON_UP_MEM_H */ +#endif /* __ARCH_Z80_SRC_COMMON_UP_MEM_H */ diff --git a/nuttx/configs/z80sim/README.txt b/nuttx/configs/z80sim/README.txt index 0580b684c..8b90f3095 100644 --- a/nuttx/configs/z80sim/README.txt +++ b/nuttx/configs/z80sim/README.txt @@ -25,10 +25,11 @@ Configuring NuttX This configuration performs a simple, minimal OS test using examples/ostest. This can be configurated as follows: + 1) From a POSIX window: cd tools - ./configure.sh z80sim/ostest - cd - - . ./setenv.sh + ./configure.sh z80sim/pashello + 2) From a CMD.exe window + setenv.bat NOTES: @@ -43,7 +44,7 @@ Configuring NuttX 3. This configuration was last verified sucessfully prior to the the configure to Kconfig/mconf tool using SDCC 2.6.0 built to run - natively under Cygwin. + natively under Cygwin. The current build requires ca. 3.2.1 SDCC. nsh @@ -53,10 +54,11 @@ Configuring NuttX This configuration can be selected by: + 1) From a POSIX window: cd tools - ./configure.sh z80sim/nsh - cd - - . ./setenv.sh + ./configure.sh z80sim/pashello + 2) From a CMD.exe window + setenv.bat NOTES: @@ -71,7 +73,7 @@ Configuring NuttX 3. This configuration was last verified sucessfully prior to the the configure to Kconfig/mconf tool using SDCC 2.6.0 built to run - natively under Cygwin. + natively under Cygwin.nsh/defconfig:CONFIG_BOARD_LOOPSPERMSEC pashello @@ -83,10 +85,11 @@ Configuring NuttX This configuration can be selected by: + 1) From a POSIX window: cd tools ./configure.sh z80sim/pashello - cd - - . ./setenv.sh + 2) From a CMD.exe window + setenv.bat NOTES: @@ -101,7 +104,7 @@ Configuring NuttX 3. This configuration was last verified sucessfully prior to the the configure to Kconfig/mconf tool using SDCC 2.6.0 built to run - natively under Cygwin. + natively under Cygwin.nsh/defconfig:CONFIG_BOARD_LOOPSPERMSEC Reconfiguring NuttX ^^^^^^^^^^^^^^^^^^^ diff --git a/nuttx/configs/z80sim/nsh/defconfig b/nuttx/configs/z80sim/nsh/defconfig index d3fd60706..ff9a90344 100644 --- a/nuttx/configs/z80sim/nsh/defconfig +++ b/nuttx/configs/z80sim/nsh/defconfig @@ -62,7 +62,7 @@ CONFIG_WINDOWS_NATIVE=y CONFIG_ARCH_Z80=y CONFIG_ARCH="z80" CONFIG_ARCH_CHIP="z80" -CONFIG_BOARD_LOOPSPERMSEC= +CONFIG_BOARD_LOOPSPERMSEC=100 CONFIG_ARCH_CHIP_Z80=y # CONFIG_ARCH_CHIP_Z8F6403 is not set # CONFIG_ARCH_CHIP_Z8F6423 is not set diff --git a/nuttx/configs/z80sim/ostest/defconfig b/nuttx/configs/z80sim/ostest/defconfig index fa79acd30..0697d8bba 100644 --- a/nuttx/configs/z80sim/ostest/defconfig +++ b/nuttx/configs/z80sim/ostest/defconfig @@ -62,7 +62,7 @@ CONFIG_WINDOWS_NATIVE=y CONFIG_ARCH_Z80=y CONFIG_ARCH="z80" CONFIG_ARCH_CHIP="z80" -CONFIG_BOARD_LOOPSPERMSEC= +CONFIG_BOARD_LOOPSPERMSEC=100 CONFIG_ARCH_CHIP_Z80=y # CONFIG_ARCH_CHIP_Z8F6403 is not set # CONFIG_ARCH_CHIP_Z8F6423 is not set diff --git a/nuttx/configs/z80sim/pashello/defconfig b/nuttx/configs/z80sim/pashello/defconfig index 19d255464..b0ff5ce16 100644 --- a/nuttx/configs/z80sim/pashello/defconfig +++ b/nuttx/configs/z80sim/pashello/defconfig @@ -62,7 +62,7 @@ CONFIG_WINDOWS_NATIVE=y CONFIG_ARCH_Z80=y CONFIG_ARCH="z80" CONFIG_ARCH_CHIP="z80" -CONFIG_BOARD_LOOPSPERMSEC= +CONFIG_BOARD_LOOPSPERMSEC=100 CONFIG_ARCH_CHIP_Z80=y # CONFIG_ARCH_CHIP_Z8F6403 is not set # CONFIG_ARCH_CHIP_Z8F6423 is not set @@ -142,7 +142,7 @@ CONFIG_DISABLE_PTHREAD=y CONFIG_DISABLE_SIGNALS=y CONFIG_DISABLE_MQUEUE=y CONFIG_DISABLE_MOUNTPOINT=y -CONFIG_DISABLE_ENVIRON=y +# CONFIG_DISABLE_ENVIRON is not set CONFIG_DISABLE_POLL=y # |