From 12cc24abb2eef6f27a2425df00692e62fe9a274f Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Thu, 23 Jan 2020 04:49:50 +0800 Subject: [PATCH] Change boards/renesas/sh7032 to boards/renesas/sh1 to fix the follow error: Refresh us7032evb1:nsh LN: include/arch to arch/renesas/include LN: include/arch/board to /workspace/mirtos/nuttx/boards/renesas//us7032evb1/include No directory at /workspace/mirtos/nuttx/boards/renesas//us7032evb1/include --- Documentation/NuttX.html | 2 +- Documentation/README.html | 4 ++-- README.txt | 2 +- boards/Kconfig | 2 +- boards/README.txt | 2 +- boards/renesas/{sh7032 => sh1}/drivers/Kconfig | 0 boards/renesas/{sh7032 => sh1}/us7032evb1/Kconfig | 0 boards/renesas/{sh7032 => sh1}/us7032evb1/README.txt | 2 +- .../renesas/{sh7032 => sh1}/us7032evb1/bin/.gitignore | 0 .../{sh7032 => sh1}/us7032evb1/configs/nsh/defconfig | 10 +++++----- .../us7032evb1/configs/ostest/defconfig | 2 +- .../us7032evb1/configs/ostest/ld.script | 0 .../renesas/{sh7032 => sh1}/us7032evb1/include/board.h | 2 +- .../{sh7032 => sh1}/us7032evb1/scripts/Make.defs | 2 +- .../renesas/{sh7032 => sh1}/us7032evb1/scripts/sram.ld | 2 +- .../{sh7032 => sh1}/us7032evb1/shterm/.gitignore | 0 .../renesas/{sh7032 => sh1}/us7032evb1/shterm/Makefile | 2 +- .../renesas/{sh7032 => sh1}/us7032evb1/shterm/shterm.c | 2 +- .../renesas/{sh7032 => sh1}/us7032evb1/src/.gitignore | 0 boards/renesas/{sh7032 => sh1}/us7032evb1/src/Makefile | 2 +- .../renesas/{sh7032 => sh1}/us7032evb1/src/sh1_leds.c | 2 +- 21 files changed, 20 insertions(+), 20 deletions(-) rename boards/renesas/{sh7032 => sh1}/drivers/Kconfig (100%) rename boards/renesas/{sh7032 => sh1}/us7032evb1/Kconfig (100%) rename boards/renesas/{sh7032 => sh1}/us7032evb1/README.txt (98%) rename boards/renesas/{sh7032 => sh1}/us7032evb1/bin/.gitignore (100%) rename boards/renesas/{sh7032 => sh1}/us7032evb1/configs/nsh/defconfig (98%) rename boards/renesas/{sh7032 => sh1}/us7032evb1/configs/ostest/defconfig (98%) rename boards/renesas/{sh7032 => sh1}/us7032evb1/configs/ostest/ld.script (100%) rename boards/renesas/{sh7032 => sh1}/us7032evb1/include/board.h (98%) rename boards/renesas/{sh7032 => sh1}/us7032evb1/scripts/Make.defs (98%) rename boards/renesas/{sh7032 => sh1}/us7032evb1/scripts/sram.ld (98%) rename boards/renesas/{sh7032 => sh1}/us7032evb1/shterm/.gitignore (100%) rename boards/renesas/{sh7032 => sh1}/us7032evb1/shterm/Makefile (97%) rename boards/renesas/{sh7032 => sh1}/us7032evb1/shterm/shterm.c (99%) rename boards/renesas/{sh7032 => sh1}/us7032evb1/src/.gitignore (100%) rename boards/renesas/{sh7032 => sh1}/us7032evb1/src/Makefile (98%) rename boards/renesas/{sh7032 => sh1}/us7032evb1/src/sh1_leds.c (98%) diff --git a/Documentation/NuttX.html b/Documentation/NuttX.html index 357074fcb6..6869bcfad0 100644 --- a/Documentation/NuttX.html +++ b/Documentation/NuttX.html @@ -6709,7 +6709,7 @@ Mem: 29232 5920 23312 23312 (which has very limit SH-1 support to begin with), or perhaps with the CMON debugger. At any rate, I have exhausted all of the energy that I am willing to put into this cool old processor for the time being. - 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 a77f68f081..a4b2cd3514 100644 --- a/Documentation/README.html +++ b/Documentation/README.html @@ -443,9 +443,9 @@ nuttx/ | | |- m16c/ | | | `- skp16c26/ | | | `- README.txt - | | `-sh7032/ + | | `-sh1/ | | `- us7032evb1/ - | | `- README.txt + | | `- README.txt | |- risc-v/ | | |- gap8/ | | | `- gapuino/ diff --git a/README.txt b/README.txt index 6f4e5599dd..4c41d55b77 100644 --- a/README.txt +++ b/README.txt @@ -2155,7 +2155,7 @@ nuttx/ | | |- m16c/ | | | `- skp16c26/ | | | `- README.txt - | | `-sh7032/ + | | `-sh1/ | | `- us7032evb1/ | | `- README.txt | |- risc-v/ diff --git a/boards/Kconfig b/boards/Kconfig index 43064b79ca..6eb9b28f9b 100644 --- a/boards/Kconfig +++ b/boards/Kconfig @@ -2756,7 +2756,7 @@ if ARCH_BOARD_SKP16C26 source "boards/renesas/m16c/skp16c26/Kconfig" endif if ARCH_BOARD_US7032EVB1 -source "boards/renesas/sh7032/us7032evb1/Kconfig" +source "boards/renesas/sh1/us7032evb1/Kconfig" endif if ARCH_BOARD_GAPUINO source "boards/risc-v/gap8/gapuino/Kconfig" diff --git a/boards/README.txt b/boards/README.txt index 644d682dce..3fcc3249ba 100644 --- a/boards/README.txt +++ b/boards/README.txt @@ -853,7 +853,7 @@ boards/mips/pic32mx/ubw32 with this board http://www.sparkfun.com/products/9713. See also http://www.schmalzhaus.com/UBW32/. -boards/renesas/sh7032/us7032evb1 +boards/renesas/sh1/us7032evb1 This is a port of the Hitachi SH-1 on the Hitachi SH-1/US7032EVB1 board. STATUS: Work has just began on this port. diff --git a/boards/renesas/sh7032/drivers/Kconfig b/boards/renesas/sh1/drivers/Kconfig similarity index 100% rename from boards/renesas/sh7032/drivers/Kconfig rename to boards/renesas/sh1/drivers/Kconfig diff --git a/boards/renesas/sh7032/us7032evb1/Kconfig b/boards/renesas/sh1/us7032evb1/Kconfig similarity index 100% rename from boards/renesas/sh7032/us7032evb1/Kconfig rename to boards/renesas/sh1/us7032evb1/Kconfig diff --git a/boards/renesas/sh7032/us7032evb1/README.txt b/boards/renesas/sh1/us7032evb1/README.txt similarity index 98% rename from boards/renesas/sh7032/us7032evb1/README.txt rename to boards/renesas/sh1/us7032evb1/README.txt index a424459ba2..0634612882 100644 --- a/boards/renesas/sh7032/us7032evb1/README.txt +++ b/boards/renesas/sh1/us7032evb1/README.txt @@ -114,7 +114,7 @@ Architecture selection implemented in. CONFIG_ARCH_BOARD - identifies the boards/ subdirectory and, hence, the board that supports the particular chip or SoC. This - should be us7032evb1 for (boards/renesas/sh7032/us7032evb1). + should be us7032evb1 for (boards/renesas/sh1/us7032evb1). CONFIG_ARCH_BOARD_US7032EVB1 - for use in C code CONFIG_ENDIAN_BIG - the SH-1 usually runs big-endian CONFIG_ARCH_NOINTC - define if the architecture does not diff --git a/boards/renesas/sh7032/us7032evb1/bin/.gitignore b/boards/renesas/sh1/us7032evb1/bin/.gitignore similarity index 100% rename from boards/renesas/sh7032/us7032evb1/bin/.gitignore rename to boards/renesas/sh1/us7032evb1/bin/.gitignore diff --git a/boards/renesas/sh7032/us7032evb1/configs/nsh/defconfig b/boards/renesas/sh1/us7032evb1/configs/nsh/defconfig similarity index 98% rename from boards/renesas/sh7032/us7032evb1/configs/nsh/defconfig rename to boards/renesas/sh1/us7032evb1/configs/nsh/defconfig index b177ce2cdc..12f894d235 100644 --- a/boards/renesas/sh7032/us7032evb1/configs/nsh/defconfig +++ b/boards/renesas/sh1/us7032evb1/configs/nsh/defconfig @@ -7,21 +7,20 @@ # # CONFIG_NSH_DISABLE_IFCONFIG is not set # CONFIG_NSH_DISABLE_PS is not set -CONFIG_ARCH_BOARD_US7032EVB1=y +CONFIG_ARCH="renesas" CONFIG_ARCH_BOARD="us7032evb1" +CONFIG_ARCH_BOARD_US7032EVB1=y CONFIG_ARCH_BUTTONS=y -iCONFIG_ARCH_CHIP="sh7032" +CONFIG_ARCH_CHIP="sh1" CONFIG_ARCH_CHIP_SH7032=y CONFIG_ARCH_RENESAS=y CONFIG_ARCH_STACKDUMP=y -CONFIG_ARCH="renesas" CONFIG_BOARD_LOOPSPERMSEC=572 CONFIG_DISABLE_MOUNTPOINT=y CONFIG_DISABLE_MQUEUE=y CONFIG_DISABLE_POSIX_TIMERS=y CONFIG_DISABLE_PTHREAD=y CONFIG_ENDIAN_BIG=y -CONFIG_SYSTEM_NSH=y CONFIG_MAX_TASKS=8 CONFIG_MAX_WDOGPARMS=2 CONFIG_MOTOROLA_SREC=y @@ -45,7 +44,8 @@ CONFIG_START_DAY=10 CONFIG_START_MONTH=11 CONFIG_START_YEAR=2008 CONFIG_STDIO_DISABLE_BUFFERING=y +CONFIG_SYSTEM_NSH=y CONFIG_TASK_NAME_SIZE=0 -CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_USERMAIN_STACKSIZE=1024 +CONFIG_USER_ENTRYPOINT="nsh_main" CONFIG_WDOG_INTRESERVE=0 diff --git a/boards/renesas/sh7032/us7032evb1/configs/ostest/defconfig b/boards/renesas/sh1/us7032evb1/configs/ostest/defconfig similarity index 98% rename from boards/renesas/sh7032/us7032evb1/configs/ostest/defconfig rename to boards/renesas/sh1/us7032evb1/configs/ostest/defconfig index 226b23ab92..0e934c46dd 100644 --- a/boards/renesas/sh7032/us7032evb1/configs/ostest/defconfig +++ b/boards/renesas/sh1/us7032evb1/configs/ostest/defconfig @@ -9,7 +9,7 @@ CONFIG_ARCH="renesas" CONFIG_ARCH_BOARD="us7032evb1" CONFIG_ARCH_BOARD_US7032EVB1=y CONFIG_ARCH_BUTTONS=y -CONFIG_ARCH_CHIP="sh7032" +CONFIG_ARCH_CHIP="sh1" CONFIG_ARCH_CHIP_SH7032=y CONFIG_ARCH_RENESAS=y CONFIG_ARCH_STACKDUMP=y diff --git a/boards/renesas/sh7032/us7032evb1/configs/ostest/ld.script b/boards/renesas/sh1/us7032evb1/configs/ostest/ld.script similarity index 100% rename from boards/renesas/sh7032/us7032evb1/configs/ostest/ld.script rename to boards/renesas/sh1/us7032evb1/configs/ostest/ld.script diff --git a/boards/renesas/sh7032/us7032evb1/include/board.h b/boards/renesas/sh1/us7032evb1/include/board.h similarity index 98% rename from boards/renesas/sh7032/us7032evb1/include/board.h rename to boards/renesas/sh1/us7032evb1/include/board.h index b5bd5aabad..bc7b686bc7 100644 --- a/boards/renesas/sh7032/us7032evb1/include/board.h +++ b/boards/renesas/sh1/us7032evb1/include/board.h @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/renesas/sh7032/us7032evb1/include/board.h + * boards/renesas/sh1/us7032evb1/include/board.h * * Copyright (C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/renesas/sh7032/us7032evb1/scripts/Make.defs b/boards/renesas/sh1/us7032evb1/scripts/Make.defs similarity index 98% rename from boards/renesas/sh7032/us7032evb1/scripts/Make.defs rename to boards/renesas/sh1/us7032evb1/scripts/Make.defs index 0b46705f43..3843aa080e 100644 --- a/boards/renesas/sh7032/us7032evb1/scripts/Make.defs +++ b/boards/renesas/sh1/us7032evb1/scripts/Make.defs @@ -1,5 +1,5 @@ ############################################################################## -# boards/renesas/sh7032/us7032evb1/scripts/Make.defs +# boards/renesas/sh1/us7032evb1/scripts/Make.defs # # Copyright (C) 2008, 2017 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/renesas/sh7032/us7032evb1/scripts/sram.ld b/boards/renesas/sh1/us7032evb1/scripts/sram.ld similarity index 98% rename from boards/renesas/sh7032/us7032evb1/scripts/sram.ld rename to boards/renesas/sh1/us7032evb1/scripts/sram.ld index b6b16c6746..0eaaf76180 100644 --- a/boards/renesas/sh7032/us7032evb1/scripts/sram.ld +++ b/boards/renesas/sh1/us7032evb1/scripts/sram.ld @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/renesas/sh7032/us7032evb1/nsh/ld.script + * boards/renesas/sh1/us7032evb1/nsh/ld.script * * Copyright (C) 2008 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/renesas/sh7032/us7032evb1/shterm/.gitignore b/boards/renesas/sh1/us7032evb1/shterm/.gitignore similarity index 100% rename from boards/renesas/sh7032/us7032evb1/shterm/.gitignore rename to boards/renesas/sh1/us7032evb1/shterm/.gitignore diff --git a/boards/renesas/sh7032/us7032evb1/shterm/Makefile b/boards/renesas/sh1/us7032evb1/shterm/Makefile similarity index 97% rename from boards/renesas/sh7032/us7032evb1/shterm/Makefile rename to boards/renesas/sh1/us7032evb1/shterm/Makefile index 7760764109..2ac73f9e5b 100644 --- a/boards/renesas/sh7032/us7032evb1/shterm/Makefile +++ b/boards/renesas/sh1/us7032evb1/shterm/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# boards/renesas/sh7032/us7032evb1/shterm/Makefile +# boards/renesas/sh1/us7032evb1/shterm/Makefile # # Copyright (C) 2008 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/renesas/sh7032/us7032evb1/shterm/shterm.c b/boards/renesas/sh1/us7032evb1/shterm/shterm.c similarity index 99% rename from boards/renesas/sh7032/us7032evb1/shterm/shterm.c rename to boards/renesas/sh1/us7032evb1/shterm/shterm.c index ed47edfcf9..2ecfcd4761 100644 --- a/boards/renesas/sh7032/us7032evb1/shterm/shterm.c +++ b/boards/renesas/sh1/us7032evb1/shterm/shterm.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/renesas/sh7032/us7032evb1/shterm/shterm.c + * boards/renesas/sh1/us7032evb1/shterm/shterm.c * * Copyright(C) 2008-2009 Gregory Nutt. All rights reserved. * Author: Gregory Nutt diff --git a/boards/renesas/sh7032/us7032evb1/src/.gitignore b/boards/renesas/sh1/us7032evb1/src/.gitignore similarity index 100% rename from boards/renesas/sh7032/us7032evb1/src/.gitignore rename to boards/renesas/sh1/us7032evb1/src/.gitignore diff --git a/boards/renesas/sh7032/us7032evb1/src/Makefile b/boards/renesas/sh1/us7032evb1/src/Makefile similarity index 98% rename from boards/renesas/sh7032/us7032evb1/src/Makefile rename to boards/renesas/sh1/us7032evb1/src/Makefile index 94c9585932..fa201c031a 100644 --- a/boards/renesas/sh7032/us7032evb1/src/Makefile +++ b/boards/renesas/sh1/us7032evb1/src/Makefile @@ -1,5 +1,5 @@ ############################################################################ -# boards/renesas/sh7032/us7032evb1/src/Makefile +# boards/renesas/sh1/us7032evb1/src/Makefile # # Copyright (C) 2008, 2012 Gregory Nutt. All rights reserved. # Author: Gregory Nutt diff --git a/boards/renesas/sh7032/us7032evb1/src/sh1_leds.c b/boards/renesas/sh1/us7032evb1/src/sh1_leds.c similarity index 98% rename from boards/renesas/sh7032/us7032evb1/src/sh1_leds.c rename to boards/renesas/sh1/us7032evb1/src/sh1_leds.c index 7ac844dca3..7f11eb366d 100644 --- a/boards/renesas/sh7032/us7032evb1/src/sh1_leds.c +++ b/boards/renesas/sh1/us7032evb1/src/sh1_leds.c @@ -1,5 +1,5 @@ /**************************************************************************** - * boards/renesas/sh7032/us7032evb1/src/sh1_leds.c + * boards/renesas/sh1/us7032evb1/src/sh1_leds.c * * Copyright (C) 2008-2009, 2015 Gregory Nutt. All rights reserved. * Author: Gregory Nutt