diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2014-09-05 07:59:31 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2014-09-05 07:59:31 -0600 |
commit | 3858b64bc48af6a494bf42380f0d3ef9009e78f4 (patch) | |
tree | 505ca4cb01af1b7df19500fcc3a57e2e4b4414d2 | |
parent | 76d37232ff6d6cd0b0f9f32d7e030645f560669a (diff) | |
download | px4-nuttx-3858b64bc48af6a494bf42380f0d3ef9009e78f4.tar.gz px4-nuttx-3858b64bc48af6a494bf42380f0d3ef9009e78f4.tar.bz2 px4-nuttx-3858b64bc48af6a494bf42380f0d3ef9009e78f4.zip |
Remove the 16z board support from the main source tree. It is still avaialable in the misc/Obsoleted directory
-rw-r--r-- | misc/Obsoleted/ChangeLog | 19 | ||||
-rw-r--r-- | misc/Obsoleted/configs/16z/Kconfig (renamed from nuttx/configs/16z/Kconfig) | 0 | ||||
-rw-r--r-- | misc/Obsoleted/configs/16z/README.txt (renamed from nuttx/configs/16z/README.txt) | 0 | ||||
-rw-r--r-- | misc/Obsoleted/configs/16z/include/board.h (renamed from nuttx/configs/16z/include/board.h) | 0 | ||||
-rw-r--r-- | misc/Obsoleted/configs/16z/nsh/.gitignore (renamed from nuttx/configs/16z/nsh/.gitignore) | 0 | ||||
-rw-r--r-- | misc/Obsoleted/configs/16z/nsh/Make.defs (renamed from nuttx/configs/16z/nsh/Make.defs) | 0 | ||||
-rw-r--r-- | misc/Obsoleted/configs/16z/nsh/README.txt (renamed from nuttx/configs/16z/nsh/README.txt) | 0 | ||||
-rw-r--r-- | misc/Obsoleted/configs/16z/nsh/defconfig (renamed from nuttx/configs/16z/nsh/defconfig) | 0 | ||||
-rwxr-xr-x | misc/Obsoleted/configs/16z/nsh/nsh.linkcmd (renamed from nuttx/configs/16z/nsh/nsh.linkcmd) | 0 | ||||
-rw-r--r-- | misc/Obsoleted/configs/16z/nsh/nsh.zfpproj (renamed from nuttx/configs/16z/nsh/nsh.zfpproj) | 0 | ||||
-rwxr-xr-x | misc/Obsoleted/configs/16z/nsh/setenv.sh (renamed from nuttx/configs/16z/nsh/setenv.sh) | 0 | ||||
-rw-r--r-- | misc/Obsoleted/configs/16z/scripts/setenv.bat (renamed from nuttx/configs/16z/scripts/setenv.bat) | 0 | ||||
-rw-r--r-- | misc/Obsoleted/configs/16z/src/.gitignore (renamed from nuttx/configs/16z/src/.gitignore) | 0 | ||||
-rw-r--r-- | misc/Obsoleted/configs/16z/src/Makefile (renamed from nuttx/configs/16z/src/Makefile) | 0 | ||||
-rw-r--r-- | misc/Obsoleted/configs/16z/src/z16f_leds.c (renamed from nuttx/configs/16z/src/z16f_leds.c) | 0 | ||||
-rw-r--r-- | misc/Obsoleted/configs/16z/src/z16f_lowinit.c (renamed from nuttx/configs/16z/src/z16f_lowinit.c) | 0 | ||||
-rwxr-xr-x | misc/Obsoleted/configs/16z/tools/dopatch.sh (renamed from nuttx/configs/16z/tools/dopatch.sh) | 0 | ||||
-rw-r--r-- | misc/Obsoleted/configs/16z/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch (renamed from nuttx/configs/16z/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch) | 0 | ||||
-rwxr-xr-x | nuttx/ChangeLog | 5 | ||||
-rw-r--r-- | nuttx/Documentation/NuttX.html | 10 | ||||
-rw-r--r-- | nuttx/Documentation/README.html | 2 | ||||
-rw-r--r-- | nuttx/README.txt | 2 | ||||
-rw-r--r-- | nuttx/configs/Kconfig | 13 | ||||
-rw-r--r-- | nuttx/configs/README.txt | 5 | ||||
-rw-r--r-- | nuttx/configs/z16f2800100zcog/README.txt | 5 | ||||
-rw-r--r-- | nuttx/configs/z16f2800100zcog/include/board.h | 4 | ||||
-rw-r--r-- | nuttx/configs/z16f2800100zcog/nsh/defconfig | 1 |
27 files changed, 32 insertions, 34 deletions
diff --git a/misc/Obsoleted/ChangeLog b/misc/Obsoleted/ChangeLog index 2b0f137ee..dc86c53e5 100644 --- a/misc/Obsoleted/ChangeLog +++ b/misc/Obsoleted/ChangeLog @@ -17,6 +17,21 @@ ChangeLog 4. I do not thing that anyone has ever used the port and because of bit rot, it is not even certain that it is still function. - NEW HOME: misc/Obsoleted/arch/8051 and misc/Obsoleted/configs/pjrc-8051 + NEW HOME: + misc/Obsoleted/arch/8051 and misc/Obsoleted/configs/pjrc-8051 + + REMOVAL PATCH: + misc/Obsoleted/Patches/Remove-8051-2014-9-1.patch + +2014-9-5: Removed support for the 16z board from the main source tree. + + REASON: + The port is not yet ready for use. It may return to the NuttX source + tree at some point in the future. + + NEW HOME: + misc/Obsoleted/configs/16z + + REMOVAL PATCH: + misc/Obsoleted/Patches/Remove-16z-2014-9-5.patch - REMOVE PATCH: misc/Obsoleted/Patches/Remove-8051-2014-9-1.patch diff --git a/nuttx/configs/16z/Kconfig b/misc/Obsoleted/configs/16z/Kconfig index 3fc0b59be..3fc0b59be 100644 --- a/nuttx/configs/16z/Kconfig +++ b/misc/Obsoleted/configs/16z/Kconfig diff --git a/nuttx/configs/16z/README.txt b/misc/Obsoleted/configs/16z/README.txt index 03338ada6..03338ada6 100644 --- a/nuttx/configs/16z/README.txt +++ b/misc/Obsoleted/configs/16z/README.txt diff --git a/nuttx/configs/16z/include/board.h b/misc/Obsoleted/configs/16z/include/board.h index a60e1a359..a60e1a359 100644 --- a/nuttx/configs/16z/include/board.h +++ b/misc/Obsoleted/configs/16z/include/board.h diff --git a/nuttx/configs/16z/nsh/.gitignore b/misc/Obsoleted/configs/16z/nsh/.gitignore index fb6579652..fb6579652 100644 --- a/nuttx/configs/16z/nsh/.gitignore +++ b/misc/Obsoleted/configs/16z/nsh/.gitignore diff --git a/nuttx/configs/16z/nsh/Make.defs b/misc/Obsoleted/configs/16z/nsh/Make.defs index 8405f00a8..8405f00a8 100644 --- a/nuttx/configs/16z/nsh/Make.defs +++ b/misc/Obsoleted/configs/16z/nsh/Make.defs diff --git a/nuttx/configs/16z/nsh/README.txt b/misc/Obsoleted/configs/16z/nsh/README.txt index b772f43a9..b772f43a9 100644 --- a/nuttx/configs/16z/nsh/README.txt +++ b/misc/Obsoleted/configs/16z/nsh/README.txt diff --git a/nuttx/configs/16z/nsh/defconfig b/misc/Obsoleted/configs/16z/nsh/defconfig index a0792541e..a0792541e 100644 --- a/nuttx/configs/16z/nsh/defconfig +++ b/misc/Obsoleted/configs/16z/nsh/defconfig diff --git a/nuttx/configs/16z/nsh/nsh.linkcmd b/misc/Obsoleted/configs/16z/nsh/nsh.linkcmd index efa76b4f0..efa76b4f0 100755 --- a/nuttx/configs/16z/nsh/nsh.linkcmd +++ b/misc/Obsoleted/configs/16z/nsh/nsh.linkcmd diff --git a/nuttx/configs/16z/nsh/nsh.zfpproj b/misc/Obsoleted/configs/16z/nsh/nsh.zfpproj index b889c9582..b889c9582 100644 --- a/nuttx/configs/16z/nsh/nsh.zfpproj +++ b/misc/Obsoleted/configs/16z/nsh/nsh.zfpproj diff --git a/nuttx/configs/16z/nsh/setenv.sh b/misc/Obsoleted/configs/16z/nsh/setenv.sh index 462be15d6..462be15d6 100755 --- a/nuttx/configs/16z/nsh/setenv.sh +++ b/misc/Obsoleted/configs/16z/nsh/setenv.sh diff --git a/nuttx/configs/16z/scripts/setenv.bat b/misc/Obsoleted/configs/16z/scripts/setenv.bat index 4db1dbba8..4db1dbba8 100644 --- a/nuttx/configs/16z/scripts/setenv.bat +++ b/misc/Obsoleted/configs/16z/scripts/setenv.bat diff --git a/nuttx/configs/16z/src/.gitignore b/misc/Obsoleted/configs/16z/src/.gitignore index b268f1933..b268f1933 100644 --- a/nuttx/configs/16z/src/.gitignore +++ b/misc/Obsoleted/configs/16z/src/.gitignore diff --git a/nuttx/configs/16z/src/Makefile b/misc/Obsoleted/configs/16z/src/Makefile index 1632c6f88..1632c6f88 100644 --- a/nuttx/configs/16z/src/Makefile +++ b/misc/Obsoleted/configs/16z/src/Makefile diff --git a/nuttx/configs/16z/src/z16f_leds.c b/misc/Obsoleted/configs/16z/src/z16f_leds.c index 483ec1662..483ec1662 100644 --- a/nuttx/configs/16z/src/z16f_leds.c +++ b/misc/Obsoleted/configs/16z/src/z16f_leds.c diff --git a/nuttx/configs/16z/src/z16f_lowinit.c b/misc/Obsoleted/configs/16z/src/z16f_lowinit.c index a91980118..a91980118 100644 --- a/nuttx/configs/16z/src/z16f_lowinit.c +++ b/misc/Obsoleted/configs/16z/src/z16f_lowinit.c diff --git a/nuttx/configs/16z/tools/dopatch.sh b/misc/Obsoleted/configs/16z/tools/dopatch.sh index 1193ff792..1193ff792 100755 --- a/nuttx/configs/16z/tools/dopatch.sh +++ b/misc/Obsoleted/configs/16z/tools/dopatch.sh diff --git a/nuttx/configs/16z/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch b/misc/Obsoleted/configs/16z/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch index 3dc9c87c5..3dc9c87c5 100644 --- a/nuttx/configs/16z/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch +++ b/misc/Obsoleted/configs/16z/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch diff --git a/nuttx/ChangeLog b/nuttx/ChangeLog index 3e618e393..c5850368d 100755 --- a/nuttx/ChangeLog +++ b/nuttx/ChangeLog @@ -8402,3 +8402,8 @@ bundle up the user C startup file (crt0), not the kernel head object for the kernel and protected builds (2014-9-4). * tools/mkexport.sh: Add .config file to export package (2014-9-5). + * configs/16z: Support for this board has been removed from the NuttX + source tree (but still can be found in the misc/Obsoleted directory). + This port is not ready for usage but may return to the NuttX tree + at some point in the future (2014-9-5). + diff --git a/nuttx/Documentation/NuttX.html b/nuttx/Documentation/NuttX.html index 5bc50161a..8b48a9074 100644 --- a/nuttx/Documentation/NuttX.html +++ b/nuttx/Documentation/NuttX.html @@ -3962,7 +3962,7 @@ BFD_ASSERT (*plt_offset != (bfd_vma) -1); </li> <li> <p> - <b>Toyaga 16z</b>. + <b>Toyaga 16z (obsoleted)</b>. This port if for the <a href="https://github.com/toyaga/16z">Toyaga 16z</a> board that also use the Zilog ZNEOZ16F2811AL20EG microntroller with the Zilog ZDS-II Windows command line tools. The development environment is either Windows native or Cygwin under Windows. </p> @@ -3970,8 +3970,14 @@ BFD_ASSERT (*plt_offset != (bfd_vma) -1); <b>STATUS:</b> The initial release of support for the 16z board was made available in NuttX version 6.33. Both the 16z board and the NuttX port are works in progress and are not ready for usage as of NuttX-7.2. - Refer to the NuttX board <a href="http://sourceforge.net/p/nuttx/git/ci/master/tree/nuttx/configs/16z/README.txt">README</a> file for further information. + Refer to the NuttX board <a href="http://sourceforge.net/p/nuttx/git/ci/master/tree/misc/Obsoleted/configs/16z/README.txt">README</a> file for further information. </p> + <p> + <b><i>Obsoleted</i></b>. + This architecture has been <i>obsoleted</i>. + The code has been moved out of the NuttX source tree but can still be found be found in <a href="http://sourceforge.net/p/nuttx/git/ci/master/tree/misc/Obsoleted/">Obsoleted</a> directory. + This support was obsoleted because of technical issues that make NuttX unusable on the board at least in the short term. This configuration may return to the NuttX source tree at some time in the future. + </p> </li> </ul> </td> diff --git a/nuttx/Documentation/README.html b/nuttx/Documentation/README.html index 50304cff2..23e355f15 100644 --- a/nuttx/Documentation/README.html +++ b/nuttx/Documentation/README.html @@ -51,8 +51,6 @@ | |- audio/ | | `- <a href="http://sourceforge.net/p/nuttx/git/ci/master/tree/nuttx/audio/README.txt"><b><i>README.txt</i></b></a> | |- configs/ - | | |- 16z/ - | | | `- <a href="http://sourceforge.net/p/nuttx/git/ci/master/tree/nuttx/configs/16z/README.txt"><b><i>README.txt</i></b></a> | | |- amber/ | | | `- <a href="http://sourceforge.net/p/nuttx/git/ci/master/tree/nuttx/configs/amber/README.txt"><b><i>README.txt</i></b></a> | | |- arduino-due/ diff --git a/nuttx/README.txt b/nuttx/README.txt index fcd7e3eb8..a689ff080 100644 --- a/nuttx/README.txt +++ b/nuttx/README.txt @@ -918,8 +918,6 @@ nuttx | `-libpcode/ | `-README.txt |- configs/ - | |- 16z/ - | | `- README.txt | |- amber/ | | `- README.txt | |- arduino-due/ diff --git a/nuttx/configs/Kconfig b/nuttx/configs/Kconfig index 94b4dabc2..8b7aa810e 100644 --- a/nuttx/configs/Kconfig +++ b/nuttx/configs/Kconfig @@ -12,15 +12,6 @@ choice be available for selection. Use ARCH_BOARD_CUSTOM to create a new board configuration. -config ARCH_BOARD_16Z - bool "16z Board" - depends on ARCH_CHIP_Z16F2811 - select ARCH_HAVE_LEDS - ---help--- - This selection enables the port of NuttX port to the 16z board. The - 16z board is based on the ZiLOG ZNEO Z16F2811AL20EG part. See - https://github.com/toyaga/16z for further information. - config ARCH_BOARD_AMBER bool "Amber Web Server" depends on ARCH_CHIP_ATMEGA128 @@ -957,7 +948,6 @@ config ARCH_BOARD_CUSTOM_DIR config ARCH_BOARD string - default "16z" if ARCH_BOARD_16Z default "amber" if ARCH_BOARD_AMBER default "arduino-due" if ARCH_BOARD_ARDUINO_DUE default "avr32dev1" if ARCH_BOARD_AVR32DEV1 @@ -1107,9 +1097,6 @@ config NSH_MMCSDSPIPORTNO comment "Board-Specific Options" -if ARCH_BOARD_16Z -source "configs/16z/Kconfig" -endif if ARCH_BOARD_AMBER source "configs/amber/Kconfig" endif diff --git a/nuttx/configs/README.txt b/nuttx/configs/README.txt index 18e24a022..f64f63f5e 100644 --- a/nuttx/configs/README.txt +++ b/nuttx/configs/README.txt @@ -161,11 +161,6 @@ http://nuttx.org/Documentation/NuttXConfigVariables.html. Supported Boards ^^^^^^^^^^^^^^^^ -configs/16z - This is the port of NuttX port to the 16z board. The 16z board is based on - the ZiLOG ZNEO Z16F2811AL20EG part. See https://github.com/toyaga/16z for - further information. - configs/amber This is placeholder for the SoC Robotics Amber Web Server that is based on the Atmel AVR ATMega128 MCU. There is not much there yet and what is diff --git a/nuttx/configs/z16f2800100zcog/README.txt b/nuttx/configs/z16f2800100zcog/README.txt index 2c0edbcb5..d5d77725f 100644 --- a/nuttx/configs/z16f2800100zcog/README.txt +++ b/nuttx/configs/z16f2800100zcog/README.txt @@ -114,11 +114,6 @@ The patch can also be removed with: See the section "Selecting Configurations" below. -UPDATE: 2014-4-27: The configs/16z/nsh example still does not run -correctly. This is believe to be caused by additional, undiagnosed -compiler errors. At present, these compiler bugs do not seem to effect -the z16f2800100zcog. - Serial Console ============== diff --git a/nuttx/configs/z16f2800100zcog/include/board.h b/nuttx/configs/z16f2800100zcog/include/board.h index 507275986..5343f04e8 100644 --- a/nuttx/configs/z16f2800100zcog/include/board.h +++ b/nuttx/configs/z16f2800100zcog/include/board.h @@ -43,8 +43,8 @@ /**************************************************************************** * Definitions ****************************************************************************/ -/* The 16Z board has a 20MHz crystal. The ZNEO clocking will be configured - * to use this crystal frequency directly as the clock source +/* The Z16F2800100ZCOG board has a 20MHz crystal. The ZNEO clocking will be + * configured to use this crystal frequency directly as the clock source */ #define BOARD_XTAL_FREQUENCY 20000000 /* 20MHz */ diff --git a/nuttx/configs/z16f2800100zcog/nsh/defconfig b/nuttx/configs/z16f2800100zcog/nsh/defconfig index 3f5410f68..4abe21e19 100644 --- a/nuttx/configs/z16f2800100zcog/nsh/defconfig +++ b/nuttx/configs/z16f2800100zcog/nsh/defconfig @@ -161,7 +161,6 @@ CONFIG_RAM_SIZE=65536 # # Board Selection # -# CONFIG_ARCH_BOARD_16Z is not set CONFIG_ARCH_BOARD_Z16F2800100ZCOG=y # CONFIG_ARCH_BOARD_CUSTOM is not set CONFIG_ARCH_BOARD="z16f2800100zcog" |