Change boards/z16/z16f2811 to boards/z16/z16f

to fix the follow error:
Refresh z16f2800100zcog/nsh
LN: include/arch to arch/z16/include
LN: include/arch/board to /workspace/mirtos/nuttx/boards/z16/z16/z16f2800100zcog/include
No directory at /workspace/mirtos/nuttx/boards/z16/z16/z16f2800100zcog/include
This commit is contained in:
Xiang Xiao 2020-01-23 07:26:27 +08:00 committed by Gregory Nutt
parent 12cc24abb2
commit 7d33af1360
25 changed files with 26 additions and 28 deletions

View File

@ -6859,7 +6859,7 @@ BFD_ASSERT (*plt_offset != (bfd_vma) -1);
The initial release of support for the z16f was made available in NuttX version 0.3.7. The initial release of support for the z16f was made available in NuttX version 0.3.7.
A working NuttShell (NSH) configuration as added in NuttX-6.33 (although a patch is required to work around an issue with a ZDS-II 5.0.1 tool problem). A working NuttShell (NSH) configuration as added in NuttX-6.33 (although a patch is required to work around an issue with a ZDS-II 5.0.1 tool problem).
An ESPI driver was added in NuttX-7.2. An ESPI driver was added in NuttX-7.2.
Refer to the NuttX board <a href="https://bitbucket.org/nuttx/nuttx/src/master/boards/z16/z16f2811/z16f2800100zcog/README.txt" target="_blank">README</a> file for further information. Refer to the NuttX board <a href="https://bitbucket.org/nuttx/nuttx/src/master/boards/z16/z16f/z16f2800100zcog/README.txt" target="_blank">README</a> file for further information.
</p> </p>
</li> </li>
</ul> </ul>

View File

@ -467,12 +467,12 @@ nuttx/
| | `- esp32-core/ | | `- esp32-core/
| | `- <a href="https://bitbucket.org/nuttx/nuttx/src/master/boards/xtensa/esp32/esp32-core/README.txt" target="_blank"><b><i>README.txt</i></b></a> | | `- <a href="https://bitbucket.org/nuttx/nuttx/src/master/boards/xtensa/esp32/esp32-core/README.txt" target="_blank"><b><i>README.txt</i></b></a>
| |- z16/ | |- z16/
| | `- z16f2811/ | | `- z16f/
| | `- z16f2800100zcog/ | | `- z16f2800100zcog/
| | |- <a href="https://bitbucket.org/nuttx/nuttx/src/master/boards/z16/z16f2811/z16f2800100zcog/configs/nsh/README.txt" target="_blank"><b><i>configs/nsh/README.txt</i></b></a> | | |- <a href="https://bitbucket.org/nuttx/nuttx/src/master/boards/z16/z16f/z16f2800100zcog/configs/nsh/README.txt" target="_blank"><b><i>configs/nsh/README.txt</i></b></a>
| | |- <a href="https://bitbucket.org/nuttx/nuttx/src/master/boards/z16/z16f2811/z16f2800100zcog/configs/ostest/README.txt" target="_blank"><i>configs/ostest/README.txt</i></a> | | |- <a href="https://bitbucket.org/nuttx/nuttx/src/master/boards/z16/z16f/z16f2800100zcog/configs/ostest/README.txt" target="_blank"><i>configs/ostest/README.txt</i></a>
| | |- <a href="https://bitbucket.org/nuttx/nuttx/src/master/boards/z16/z16f2811/z16f2800100zcog/configs/pashello/README.txt" target="_blank"><i>configs/pashello/README.txt</i></a> | | |- <a href="https://bitbucket.org/nuttx/nuttx/src/master/boards/z16/z16f/z16f2800100zcog/configs/pashello/README.txt" target="_blank"><i>configs/pashello/README.txt</i></a>
| | `- <a href="https://bitbucket.org/nuttx/nuttx/src/master/boards/z16/z16f2811/z16f2800100zcog/README.txt" target="_blank"><b><i>README.txt</i></b></a> | | `- <a href="https://bitbucket.org/nuttx/nuttx/src/master/boards/z16/z16f/z16f2800100zcog/README.txt" target="_blank"><b><i>README.txt</i></b></a>
| |- z80/ | |- z80/
| | |- ez80/ | | |- ez80/
| | | |- ez80f910200kitg/ | | | |- ez80f910200kitg/

View File

@ -2179,7 +2179,7 @@ nuttx/
| | `- esp32-core/ | | `- esp32-core/
| | `- README.txt | | `- README.txt
| |- z16/ | |- z16/
| | `- z16f2811/ | | `- z16f/
| | `- z16f2800100zcog/ | | `- z16f2800100zcog/
| | |- configs/nsh/README.txt | | |- configs/nsh/README.txt
| | |- configs/ostest/README.txt | | |- configs/ostest/README.txt

View File

@ -2792,7 +2792,7 @@ if ARCH_BOARD_ESP32CORE
source "boards/xtensa/esp32/esp32-core/Kconfig" source "boards/xtensa/esp32/esp32-core/Kconfig"
endif endif
if ARCH_BOARD_Z16F2800100ZCOG if ARCH_BOARD_Z16F2800100ZCOG
source "boards/z16/z16f2811/z16f2800100zcog/Kconfig" source "boards/z16/z16f/z16f2800100zcog/Kconfig"
endif endif
if ARCH_BOARD_EZ80F910200KITG if ARCH_BOARD_EZ80F910200KITG
source "boards/z80/ez80/ez80f910200kitg/Kconfig" source "boards/z80/ez80/ez80f910200kitg/Kconfig"

View File

@ -865,7 +865,7 @@ boards/arm/stm32/viewtool-stm32f107
config/xmc4500-relax config/xmc4500-relax
Infineon XMC4000 Relax Lite v1 Infineon XMC4000 Relax Lite v1
boards/z16/z16f2811/z16f2800100zcog boards/z16/z16f/z16f2800100zcog
z16f Microcontroller. This port use the Zilog z16f2800100zcog z16f Microcontroller. This port use the Zilog z16f2800100zcog
development kit and the Zilog ZDS-II Windows command line tools. The development kit and the Zilog ZDS-II Windows command line tools. The
development environment is Cygwin under WinXP. development environment is Cygwin under WinXP.

View File

@ -105,7 +105,7 @@ Other Versions
If you use any version of ZDS-II or if you install ZDS-II at any location If you use any version of ZDS-II or if you install ZDS-II at any location
other than the default location, you will have to modify other than the default location, you will have to modify
arch/z16/src/z16f/Kconfig and arch/z16/src/z16f/Kconfig and
boards/z16/z16f2811/z16f2800100zcog/scripts/Make.defs. boards/z16/z16f/z16f2800100zcog/scripts/Make.defs.
Simply edit that file, changing 5.0.1 to whatever. Simply edit that file, changing 5.0.1 to whatever.
Patches Patches
@ -128,7 +128,7 @@ attempt to recover the parameters from the stack and a failure then follows.
This bug prevents the use of NSH with the ZNEO. However, a patch has been This bug prevents the use of NSH with the ZNEO. However, a patch has been
developed that works around the problem. That patch can be found at developed that works around the problem. That patch can be found at
boards/z16/z16f2811/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch. boards/z16/z16f/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch.
In that directory is also a bash script that will apply that patch for you. In that directory is also a bash script that will apply that patch for you.
The patch would be applied when NuttX is configured as follows: The patch would be applied when NuttX is configured as follows:

View File

@ -6,23 +6,20 @@
# modifications. # modifications.
# #
# CONFIG_NSH_ARGCAT is not set # CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_DF_H is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set
# CONFIG_NSH_CMDPARMS is not set # CONFIG_NSH_CMDPARMS is not set
# CONFIG_NSH_DISABLE_IFCONFIG is not set # CONFIG_NSH_DISABLE_IFCONFIG is not set
# CONFIG_NSH_DISABLE_PS is not set # CONFIG_NSH_DISABLE_PS is not set
CONFIG_ARCH_BOARD_Z16F2800100ZCOG=y
CONFIG_ARCH_BOARD="z16f2800100zcog"
CONFIG_ARCH_CHIP="z16f2811"
CONFIG_ARCH_CHIP_Z16F=y
CONFIG_ARCH_CHIP_Z16F2811=y
CONFIG_ARCH_Z16=y
CONFIG_ARCH="z16" CONFIG_ARCH="z16"
CONFIG_ARCH_BOARD="z16f2800100zcog"
CONFIG_ARCH_BOARD_Z16F2800100ZCOG=y
CONFIG_ARCH_CHIP="z16f"
CONFIG_ARCH_CHIP_Z16F2811=y
CONFIG_ARCH_CHIP_Z16F=y
CONFIG_ARCH_Z16=y
CONFIG_BOARD_LOOPSPERMSEC=1250 CONFIG_BOARD_LOOPSPERMSEC=1250
CONFIG_BUILTIN=y CONFIG_BUILTIN=y
CONFIG_ENDIAN_BIG=y CONFIG_ENDIAN_BIG=y
CONFIG_SYSTEM_NSH=y
CONFIG_HOST_WINDOWS=y
CONFIG_MAX_TASKS=16 CONFIG_MAX_TASKS=16
CONFIG_MAX_WDOGPARMS=2 CONFIG_MAX_WDOGPARMS=2
CONFIG_NFILE_DESCRIPTORS=8 CONFIG_NFILE_DESCRIPTORS=8
@ -39,6 +36,7 @@ CONFIG_RR_INTERVAL=200
CONFIG_SCHED_WAITPID=y CONFIG_SCHED_WAITPID=y
CONFIG_SDCLONE_DISABLE=y CONFIG_SDCLONE_DISABLE=y
CONFIG_START_YEAR=2014 CONFIG_START_YEAR=2014
CONFIG_SYSTEM_NSH=y
CONFIG_TASK_NAME_SIZE=0 CONFIG_TASK_NAME_SIZE=0
CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536
CONFIG_UART0_BAUD=57600 CONFIG_UART0_BAUD=57600

View File

@ -7,7 +7,7 @@
# #
CONFIG_ARCH_BOARD_Z16F2800100ZCOG=y CONFIG_ARCH_BOARD_Z16F2800100ZCOG=y
CONFIG_ARCH_BOARD="z16f2800100zcog" CONFIG_ARCH_BOARD="z16f2800100zcog"
CONFIG_ARCH_CHIP="z16f2811" CONFIG_ARCH_CHIP="z16f"
CONFIG_ARCH_CHIP_Z16F=y CONFIG_ARCH_CHIP_Z16F=y
CONFIG_ARCH_CHIP_Z16F2811=y CONFIG_ARCH_CHIP_Z16F2811=y
CONFIG_ARCH_Z16=y CONFIG_ARCH_Z16=y

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/z16/z16f2811/z16f2800100zcog/board.h * boards/z16/z16f/z16f2800100zcog/board.h
* *
* Copyright (C) 2008, 2014 Gregory Nutt. All rights reserved. * Copyright (C) 2008, 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
############################################################################ ############################################################################
# boards/z16/z16f2811/z16f2800100zcog/scripts/Make.defs # boards/z16/z16f/z16f2800100zcog/scripts/Make.defs
# #
# Copyright (C) 2014, 2017 Gregory Nutt. All rights reserved. # Copyright (C) 2014, 2017 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/****************************************************************************/ /****************************************************************************/
/* boards/z16/z16f2811/z16f2800100zcog/scripts/z16f2800100zcog.linkcmd */ /* boards/z16/z16f/z16f2800100zcog/scripts/z16f2800100zcog.linkcmd */
/* */ /* */
/* Copyright (C) 2008, 2014, 2017 Gregory Nutt. All rights reserved. */ /* Copyright (C) 2008, 2014, 2017 Gregory Nutt. All rights reserved. */
/* Author: Gregory Nutt <gnutt@nuttx.org> */ /* Author: Gregory Nutt <gnutt@nuttx.org> */

View File

@ -1,5 +1,5 @@
############################################################################ ############################################################################
# boards/z16/z16f2811/z16f2800100zcog/Makefile # boards/z16/z16f/z16f2800100zcog/Makefile
# #
# Copyright (C) 2008, 2012 Gregory Nutt. All rights reserved. # Copyright (C) 2008, 2012 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/z16/z16f2811/z16f2800100zcog/src/z16f_boot.c * boards/z16/z16f/z16f2800100zcog/src/z16f_boot.c
* *
* Copyright (C) 2008, 2014 Gregory Nutt. All rights reserved. * Copyright (C) 2008, 2014 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,5 +1,5 @@
/**************************************************************************** /****************************************************************************
* boards/z16/z16f2811/z16f2800100zcog/z16f_leds.c * boards/z16/z16f/z16f2800100zcog/z16f_leds.c
* *
* Copyright (C) 2008, 2015 Gregory Nutt. All rights reserved. * Copyright (C) 2008, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt <gnutt@nuttx.org> * Author: Gregory Nutt <gnutt@nuttx.org>

View File

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
############################################################################ ############################################################################
# boards/z16/z16f2811/z16f2800100zcog/tools/dopatch.sh # boards/z16/z16f/z16f2800100zcog/tools/dopatch.sh
# #
# Copyright (C) 2014 Gregory Nutt. All rights reserved. # Copyright (C) 2014 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org> # Author: Gregory Nutt <gnutt@nuttx.org>