From 7d33af1360fc6c87346837f8f1e02499df9056a2 Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Thu, 23 Jan 2020 07:26:27 +0800 Subject: [PATCH] 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 --- Documentation/NuttX.html | 2 +- Documentation/README.html | 10 +++++----- README.txt | 2 +- boards/Kconfig | 2 +- boards/README.txt | 2 +- boards/z16/{z16f2811 => z16f}/drivers/Kconfig | 0 .../{z16f2811 => z16f}/z16f2800100zcog/Kconfig | 0 .../z16f2800100zcog/README.txt | 4 ++-- .../z16f2800100zcog/configs/nsh/.gitignore | 0 .../z16f2800100zcog/configs/nsh/README.txt | 0 .../z16f2800100zcog/configs/nsh/defconfig | 16 +++++++--------- .../z16f2800100zcog/configs/nsh/nsh.zfpproj | 0 .../z16f2800100zcog/configs/ostest/.gitignore | 0 .../z16f2800100zcog/configs/ostest/README.txt | 0 .../z16f2800100zcog/configs/ostest/defconfig | 2 +- .../configs/ostest/ostest.zfpproj | 0 .../z16f2800100zcog/include/board.h | 2 +- .../z16f2800100zcog/scripts/Make.defs | 2 +- .../scripts/z16f2800100zcog.linkcmd | 2 +- .../z16f2800100zcog/src/.gitignore | 0 .../z16f2800100zcog/src/Makefile | 2 +- .../z16f2800100zcog/src/z16f_boot.c | 2 +- .../z16f2800100zcog/src/z16f_leds.c | 2 +- .../z16f2800100zcog/tools/dopatch.sh | 2 +- .../zneo-zdsii-5_0_1-variadic-func-fix.patch | 0 25 files changed, 26 insertions(+), 28 deletions(-) rename boards/z16/{z16f2811 => z16f}/drivers/Kconfig (100%) rename boards/z16/{z16f2811 => z16f}/z16f2800100zcog/Kconfig (100%) rename boards/z16/{z16f2811 => z16f}/z16f2800100zcog/README.txt (98%) rename boards/z16/{z16f2811 => z16f}/z16f2800100zcog/configs/nsh/.gitignore (100%) rename boards/z16/{z16f2811 => z16f}/z16f2800100zcog/configs/nsh/README.txt (100%) rename boards/z16/{z16f2811 => z16f}/z16f2800100zcog/configs/nsh/defconfig (93%) rename boards/z16/{z16f2811 => z16f}/z16f2800100zcog/configs/nsh/nsh.zfpproj (100%) rename boards/z16/{z16f2811 => z16f}/z16f2800100zcog/configs/ostest/.gitignore (100%) rename boards/z16/{z16f2811 => z16f}/z16f2800100zcog/configs/ostest/README.txt (100%) rename boards/z16/{z16f2811 => z16f}/z16f2800100zcog/configs/ostest/defconfig (97%) rename boards/z16/{z16f2811 => z16f}/z16f2800100zcog/configs/ostest/ostest.zfpproj (100%) rename boards/z16/{z16f2811 => z16f}/z16f2800100zcog/include/board.h (99%) rename boards/z16/{z16f2811 => z16f}/z16f2800100zcog/scripts/Make.defs (99%) rename boards/z16/{z16f2811 => z16f}/z16f2800100zcog/scripts/z16f2800100zcog.linkcmd (98%) rename boards/z16/{z16f2811 => z16f}/z16f2800100zcog/src/.gitignore (100%) rename boards/z16/{z16f2811 => z16f}/z16f2800100zcog/src/Makefile (97%) rename boards/z16/{z16f2811 => z16f}/z16f2800100zcog/src/z16f_boot.c (98%) rename boards/z16/{z16f2811 => z16f}/z16f2800100zcog/src/z16f_leds.c (98%) rename boards/z16/{z16f2811 => z16f}/z16f2800100zcog/tools/dopatch.sh (97%) rename boards/z16/{z16f2811 => z16f}/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch (100%) diff --git a/Documentation/NuttX.html b/Documentation/NuttX.html index 6869bcfad0..d82e740753 100644 --- a/Documentation/NuttX.html +++ b/Documentation/NuttX.html @@ -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. 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. - Refer to the NuttX board README file for further information. + Refer to the NuttX board README file for further information.

diff --git a/Documentation/README.html b/Documentation/README.html index a4b2cd3514..d74d420d97 100644 --- a/Documentation/README.html +++ b/Documentation/README.html @@ -467,12 +467,12 @@ nuttx/ | | `- esp32-core/ | | `- README.txt | |- z16/ - | | `- z16f2811/ + | | `- z16f/ | | `- z16f2800100zcog/ - | | |- configs/nsh/README.txt - | | |- configs/ostest/README.txt - | | |- configs/pashello/README.txt - | | `- README.txt + | | |- configs/nsh/README.txt + | | |- configs/ostest/README.txt + | | |- configs/pashello/README.txt + | | `- README.txt | |- z80/ | | |- ez80/ | | | |- ez80f910200kitg/ diff --git a/README.txt b/README.txt index 4c41d55b77..cdf8791295 100644 --- a/README.txt +++ b/README.txt @@ -2179,7 +2179,7 @@ nuttx/ | | `- esp32-core/ | | `- README.txt | |- z16/ - | | `- z16f2811/ + | | `- z16f/ | | `- z16f2800100zcog/ | | |- configs/nsh/README.txt | | |- configs/ostest/README.txt diff --git a/boards/Kconfig b/boards/Kconfig index 6eb9b28f9b..52b3ad90f4 100644 --- a/boards/Kconfig +++ b/boards/Kconfig @@ -2792,7 +2792,7 @@ if ARCH_BOARD_ESP32CORE source "boards/xtensa/esp32/esp32-core/Kconfig" endif if ARCH_BOARD_Z16F2800100ZCOG -source "boards/z16/z16f2811/z16f2800100zcog/Kconfig" +source "boards/z16/z16f/z16f2800100zcog/Kconfig" endif if ARCH_BOARD_EZ80F910200KITG source "boards/z80/ez80/ez80f910200kitg/Kconfig" diff --git a/boards/README.txt b/boards/README.txt index 3fcc3249ba..3fd2bf5812 100644 --- a/boards/README.txt +++ b/boards/README.txt @@ -865,7 +865,7 @@ boards/arm/stm32/viewtool-stm32f107 config/xmc4500-relax Infineon XMC4000 Relax Lite v1 -boards/z16/z16f2811/z16f2800100zcog +boards/z16/z16f/z16f2800100zcog z16f Microcontroller. This port use the Zilog z16f2800100zcog development kit and the Zilog ZDS-II Windows command line tools. The development environment is Cygwin under WinXP. diff --git a/boards/z16/z16f2811/drivers/Kconfig b/boards/z16/z16f/drivers/Kconfig similarity index 100% rename from boards/z16/z16f2811/drivers/Kconfig rename to boards/z16/z16f/drivers/Kconfig diff --git a/boards/z16/z16f2811/z16f2800100zcog/Kconfig b/boards/z16/z16f/z16f2800100zcog/Kconfig similarity index 100% rename from boards/z16/z16f2811/z16f2800100zcog/Kconfig rename to boards/z16/z16f/z16f2800100zcog/Kconfig diff --git a/boards/z16/z16f2811/z16f2800100zcog/README.txt b/boards/z16/z16f/z16f2800100zcog/README.txt similarity index 98% rename from boards/z16/z16f2811/z16f2800100zcog/README.txt rename to boards/z16/z16f/z16f2800100zcog/README.txt index 67d667aff0..cbe9a362da 100644 --- a/boards/z16/z16f2811/z16f2800100zcog/README.txt +++ b/boards/z16/z16f/z16f2800100zcog/README.txt @@ -105,7 +105,7 @@ Other Versions 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 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. 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 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. The patch would be applied when NuttX is configured as follows: diff --git a/boards/z16/z16f2811/z16f2800100zcog/configs/nsh/.gitignore b/boards/z16/z16f/z16f2800100zcog/configs/nsh/.gitignore similarity index 100% rename from boards/z16/z16f2811/z16f2800100zcog/configs/nsh/.gitignore rename to boards/z16/z16f/z16f2800100zcog/configs/nsh/.gitignore diff --git a/boards/z16/z16f2811/z16f2800100zcog/configs/nsh/README.txt b/boards/z16/z16f/z16f2800100zcog/configs/nsh/README.txt similarity index 100% rename from boards/z16/z16f2811/z16f2800100zcog/configs/nsh/README.txt rename to boards/z16/z16f/z16f2800100zcog/configs/nsh/README.txt diff --git a/boards/z16/z16f2811/z16f2800100zcog/configs/nsh/defconfig b/boards/z16/z16f/z16f2800100zcog/configs/nsh/defconfig similarity index 93% rename from boards/z16/z16f2811/z16f2800100zcog/configs/nsh/defconfig rename to boards/z16/z16f/z16f2800100zcog/configs/nsh/defconfig index 4d8fb29fa9..d49a38a1f5 100644 --- a/boards/z16/z16f2811/z16f2800100zcog/configs/nsh/defconfig +++ b/boards/z16/z16f/z16f2800100zcog/configs/nsh/defconfig @@ -6,23 +6,20 @@ # modifications. # # CONFIG_NSH_ARGCAT is not set -# CONFIG_NSH_CMDOPT_DF_H is not set # CONFIG_NSH_CMDOPT_HEXDUMP is not set # CONFIG_NSH_CMDPARMS is not set # CONFIG_NSH_DISABLE_IFCONFIG 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_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_BUILTIN=y CONFIG_ENDIAN_BIG=y -CONFIG_SYSTEM_NSH=y -CONFIG_HOST_WINDOWS=y CONFIG_MAX_TASKS=16 CONFIG_MAX_WDOGPARMS=2 CONFIG_NFILE_DESCRIPTORS=8 @@ -39,6 +36,7 @@ CONFIG_RR_INTERVAL=200 CONFIG_SCHED_WAITPID=y CONFIG_SDCLONE_DISABLE=y CONFIG_START_YEAR=2014 +CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 CONFIG_TASK_SPAWN_DEFAULT_STACKSIZE=1536 CONFIG_UART0_BAUD=57600 diff --git a/boards/z16/z16f2811/z16f2800100zcog/configs/nsh/nsh.zfpproj b/boards/z16/z16f/z16f2800100zcog/configs/nsh/nsh.zfpproj similarity index 100% rename from boards/z16/z16f2811/z16f2800100zcog/configs/nsh/nsh.zfpproj rename to boards/z16/z16f/z16f2800100zcog/configs/nsh/nsh.zfpproj diff --git a/boards/z16/z16f2811/z16f2800100zcog/configs/ostest/.gitignore b/boards/z16/z16f/z16f2800100zcog/configs/ostest/.gitignore similarity index 100% rename from boards/z16/z16f2811/z16f2800100zcog/configs/ostest/.gitignore rename to boards/z16/z16f/z16f2800100zcog/configs/ostest/.gitignore diff --git a/boards/z16/z16f2811/z16f2800100zcog/configs/ostest/README.txt b/boards/z16/z16f/z16f2800100zcog/configs/ostest/README.txt similarity index 100% rename from boards/z16/z16f2811/z16f2800100zcog/configs/ostest/README.txt rename to boards/z16/z16f/z16f2800100zcog/configs/ostest/README.txt diff --git a/boards/z16/z16f2811/z16f2800100zcog/configs/ostest/defconfig b/boards/z16/z16f/z16f2800100zcog/configs/ostest/defconfig similarity index 97% rename from boards/z16/z16f2811/z16f2800100zcog/configs/ostest/defconfig rename to boards/z16/z16f/z16f2800100zcog/configs/ostest/defconfig index a821996536..7e64cb903b 100644 --- a/boards/z16/z16f2811/z16f2800100zcog/configs/ostest/defconfig +++ b/boards/z16/z16f/z16f2800100zcog/configs/ostest/defconfig @@ -7,7 +7,7 @@ # CONFIG_ARCH_BOARD_Z16F2800100ZCOG=y CONFIG_ARCH_BOARD="z16f2800100zcog" -CONFIG_ARCH_CHIP="z16f2811" +CONFIG_ARCH_CHIP="z16f" CONFIG_ARCH_CHIP_Z16F=y CONFIG_ARCH_CHIP_Z16F2811=y CONFIG_ARCH_Z16=y diff --git a/boards/z16/z16f2811/z16f2800100zcog/configs/ostest/ostest.zfpproj b/boards/z16/z16f/z16f2800100zcog/configs/ostest/ostest.zfpproj similarity index 100% rename from boards/z16/z16f2811/z16f2800100zcog/configs/ostest/ostest.zfpproj rename to boards/z16/z16f/z16f2800100zcog/configs/ostest/ostest.zfpproj diff --git a/boards/z16/z16f2811/z16f2800100zcog/include/board.h b/boards/z16/z16f/z16f2800100zcog/include/board.h similarity index 99% rename from boards/z16/z16f2811/z16f2800100zcog/include/board.h rename to boards/z16/z16f/z16f2800100zcog/include/board.h index 6a23819cd6..5b02fde74e 100644 --- a/boards/z16/z16f2811/z16f2800100zcog/include/board.h +++ b/boards/z16/z16f/z16f2800100zcog/include/board.h @@ -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. * Author: Gregory Nutt diff --git a/boards/z16/z16f2811/z16f2800100zcog/scripts/Make.defs b/boards/z16/z16f/z16f2800100zcog/scripts/Make.defs similarity index 99% rename from boards/z16/z16f2811/z16f2800100zcog/scripts/Make.defs rename to boards/z16/z16f/z16f2800100zcog/scripts/Make.defs index 2c4895a52e..daae12b654 100644 --- a/boards/z16/z16f2811/z16f2800100zcog/scripts/Make.defs +++ b/boards/z16/z16f/z16f2800100zcog/scripts/Make.defs @@ -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. # Author: Gregory Nutt diff --git a/boards/z16/z16f2811/z16f2800100zcog/scripts/z16f2800100zcog.linkcmd b/boards/z16/z16f/z16f2800100zcog/scripts/z16f2800100zcog.linkcmd similarity index 98% rename from boards/z16/z16f2811/z16f2800100zcog/scripts/z16f2800100zcog.linkcmd rename to boards/z16/z16f/z16f2800100zcog/scripts/z16f2800100zcog.linkcmd index 72a6036d9a..edb9533f04 100644 --- a/boards/z16/z16f2811/z16f2800100zcog/scripts/z16f2800100zcog.linkcmd +++ b/boards/z16/z16f/z16f2800100zcog/scripts/z16f2800100zcog.linkcmd @@ -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. */ /* Author: Gregory Nutt */ diff --git a/boards/z16/z16f2811/z16f2800100zcog/src/.gitignore b/boards/z16/z16f/z16f2800100zcog/src/.gitignore similarity index 100% rename from boards/z16/z16f2811/z16f2800100zcog/src/.gitignore rename to boards/z16/z16f/z16f2800100zcog/src/.gitignore diff --git a/boards/z16/z16f2811/z16f2800100zcog/src/Makefile b/boards/z16/z16f/z16f2800100zcog/src/Makefile similarity index 97% rename from boards/z16/z16f2811/z16f2800100zcog/src/Makefile rename to boards/z16/z16f/z16f2800100zcog/src/Makefile index 26733d1f6d..f877d62d1a 100644 --- a/boards/z16/z16f2811/z16f2800100zcog/src/Makefile +++ b/boards/z16/z16f/z16f2800100zcog/src/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# boards/z16/z16f2811/z16f2800100zcog/Makefile +# boards/z16/z16f/z16f2800100zcog/Makefile # # Copyright (C) 2008, 2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/z16/z16f2811/z16f2800100zcog/src/z16f_boot.c b/boards/z16/z16f/z16f2800100zcog/src/z16f_boot.c similarity index 98% rename from boards/z16/z16f2811/z16f2800100zcog/src/z16f_boot.c rename to boards/z16/z16f/z16f2800100zcog/src/z16f_boot.c index 4b079c217c..3024ad13b9 100644 --- a/boards/z16/z16f2811/z16f2800100zcog/src/z16f_boot.c +++ b/boards/z16/z16f/z16f2800100zcog/src/z16f_boot.c @@ -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. * Author: Gregory Nutt diff --git a/boards/z16/z16f2811/z16f2800100zcog/src/z16f_leds.c b/boards/z16/z16f/z16f2800100zcog/src/z16f_leds.c similarity index 98% rename from boards/z16/z16f2811/z16f2800100zcog/src/z16f_leds.c rename to boards/z16/z16f/z16f2800100zcog/src/z16f_leds.c index f7d32fafdf..255a1320c2 100644 --- a/boards/z16/z16f2811/z16f2800100zcog/src/z16f_leds.c +++ b/boards/z16/z16f/z16f2800100zcog/src/z16f_leds.c @@ -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. * Author: Gregory Nutt diff --git a/boards/z16/z16f2811/z16f2800100zcog/tools/dopatch.sh b/boards/z16/z16f/z16f2800100zcog/tools/dopatch.sh similarity index 97% rename from boards/z16/z16f2811/z16f2800100zcog/tools/dopatch.sh rename to boards/z16/z16f/z16f2800100zcog/tools/dopatch.sh index 78e5bddfe1..e7ad5a10d4 100755 --- a/boards/z16/z16f2811/z16f2800100zcog/tools/dopatch.sh +++ b/boards/z16/z16f/z16f2800100zcog/tools/dopatch.sh @@ -1,6 +1,6 @@ #!/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. # Author: Gregory Nutt diff --git a/boards/z16/z16f2811/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch b/boards/z16/z16f/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch similarity index 100% rename from boards/z16/z16f2811/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch rename to boards/z16/z16f/z16f2800100zcog/tools/zneo-zdsii-5_0_1-variadic-func-fix.patch