diff --git a/Documentation/README.html b/Documentation/README.html
index d9199a48271..4bbe2d956d0 100644
--- a/Documentation/README.html
+++ b/Documentation/README.html
@@ -31,11 +31,11 @@ nuttx/
| |- arm/
| | `- src
| | `- lpc214x/README.txt
- | |- sh/
+ | |- renesas/
| | |- include/
- | | | `-README.txt
+ | | | `-README.txt
| | |- src/
- | | | `-README.txt
+ | | | `-README.txt
| |- x86/
| | |- include/
| | | `-README.txt
diff --git a/README.txt b/README.txt
index 6843d81a4b8..3617f874a72 100644
--- a/README.txt
+++ b/README.txt
@@ -1250,7 +1250,7 @@ nuttx/
| |- arm/
| | `- src
| | `- lpc214x/README.txt
- | |- sh/
+ | |- renesas/
| | |- include/
| | | `-README.txt
| | |- src/
diff --git a/TODO b/TODO
index 215d21d983e..5e38398b921 100644
--- a/TODO
+++ b/TODO
@@ -1737,7 +1737,7 @@ o ARM (arch/arm/)
upon return. This could be improved as well: If there is no
context switch, then the static registers need not be restored
because they will not be modified by the called C code.
- (see arch/sh/src/sh1/sh1_vector.S for example)
+ (see arch/renesas/src/sh1/sh1_vector.S for example)
Status: Open
Priority: Low
diff --git a/arch/Kconfig b/arch/Kconfig
index fa5bf48edaa..9efa581e3ec 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -99,7 +99,7 @@ source arch/avr/Kconfig
source arch/hc/Kconfig
source arch/mips/Kconfig
source arch/rgmp/Kconfig
-source arch/sh/Kconfig
+source arch/renesas/Kconfig
source arch/sim/Kconfig
source arch/x86/Kconfig
source arch/z16/Kconfig
diff --git a/arch/README.txt b/arch/README.txt
index 114f2f6f1e7..7562e1ab3a6 100644
--- a/arch/README.txt
+++ b/arch/README.txt
@@ -210,6 +210,16 @@ arch/mips
arch/mips/include/pic32mx and arch/mips/src/pic32mx
arch/mips/include/pic32mz and arch/mips/src/pic32mz
+arch/renesas - Support for Renesas and legacy Hitachi microcontrollers.
+ This include SuperH and M16C.
+
+ Architecture Support
+ arch/renesas/include and arch/renesas/src/common
+
+ MCU support
+ arch/renesas/include/m16c and arch/renesas/src/m16c
+ arch/renesas/include/sh1 and arch/renesas/src/sh1
+
arch/rgmp
RGMP stands for RTOS and GPOS on Multi-Processor. RGMP is a project
@@ -221,15 +231,6 @@ arch/rgmp
See http://rgmp.sourceforge.net/wiki/index.php/Main_Page for further
information about RGMP.
-arch/sh - SuperH and related Hitachi/Renesas microcontrollers
-
- Architecture Support
- arch/sh/include and arch/sh/src/common
-
- MCU support
- arch/sh/include/m16c and arch/sh/src/m16c
- arch/sh/include/sh1 and arch/sh/src/sh1
-
arch/x86 - Intel x86 architectures
This directory holds related, 32- and 64-bit architectures from Intel.
At present, this includes the following subdirectories:
diff --git a/arch/sh/Kconfig b/arch/renesas/Kconfig
similarity index 84%
rename from arch/sh/Kconfig
rename to arch/renesas/Kconfig
index 48c76f3ca03..d11223f0bca 100644
--- a/arch/sh/Kconfig
+++ b/arch/renesas/Kconfig
@@ -37,8 +37,8 @@ config ARCH_CHIP
default "sh1" if ARCH_SH1
default "m16c" if ARCH_M16C
-source arch/sh/src/common/Kconfig
-source arch/sh/src/m16c/Kconfig
-source arch/sh/src/sh1/Kconfig
+source arch/renesas/src/common/Kconfig
+source arch/renesas/src/m16c/Kconfig
+source arch/renesas/src/sh1/Kconfig
endif # ARCH_SH
diff --git a/arch/sh/include/README.txt b/arch/renesas/include/README.txt
similarity index 100%
rename from arch/sh/include/README.txt
rename to arch/renesas/include/README.txt
diff --git a/arch/sh/include/arch.h b/arch/renesas/include/arch.h
similarity index 95%
rename from arch/sh/include/arch.h
rename to arch/renesas/include/arch.h
index 4b4c7e934d9..a4824ce9841 100644
--- a/arch/sh/include/arch.h
+++ b/arch/renesas/include/arch.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/sh/include/arch.h
+ * arch/renesas/include/arch.h
*
* Copyright (C) 2008 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
@@ -37,8 +37,8 @@
* only indirectly through nuttx/arch.h
*/
-#ifndef __ARCH_SH_INCLUDE_ARCH_H
-#define __ARCH_SH_INCLUDE_ARCH_H
+#ifndef __ARCH_RENESAS_INCLUDE_ARCH_H
+#define __ARCH_RENESAS_INCLUDE_ARCH_H
/****************************************************************************
* Included Files
@@ -77,4 +77,4 @@ extern "C"
}
#endif
-#endif /* __ARCH_SH_INCLUDE_ARCH_H */
+#endif /* __ARCH_RENESAS_INCLUDE_ARCH_H */
diff --git a/arch/sh/include/irq.h b/arch/renesas/include/irq.h
similarity index 95%
rename from arch/sh/include/irq.h
rename to arch/renesas/include/irq.h
index 78617accce6..4f365ceaa84 100644
--- a/arch/sh/include/irq.h
+++ b/arch/renesas/include/irq.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/sh/include/irq.h
+ * arch/renesas/include/irq.h
*
* Copyright (C) 2008 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
@@ -37,8 +37,8 @@
* only indirectly through nuttx/irq.h
*/
-#ifndef __ARCH_SH_INCLUDE_IRQ_H
-#define __ARCH_SH_INCLUDE_IRQ_H
+#ifndef __ARCH_RENESAS_INCLUDE_IRQ_H
+#define __ARCH_RENESAS_INCLUDE_IRQ_H
/****************************************************************************
* Included Files
@@ -82,5 +82,5 @@ extern "C"
#endif
#endif
-#endif /* __ARCH_SH_INCLUDE_IRQ_H */
+#endif /* __ARCH_RENESAS_INCLUDE_IRQ_H */
diff --git a/arch/sh/include/limits.h b/arch/renesas/include/limits.h
similarity index 93%
rename from arch/sh/include/limits.h
rename to arch/renesas/include/limits.h
index feb02e5d6f3..56c729c0c74 100644
--- a/arch/sh/include/limits.h
+++ b/arch/renesas/include/limits.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/sh/include/limits.h
+ * arch/renesas/include/limits.h
*
* Copyright (C) 2008, 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
@@ -33,8 +33,8 @@
*
****************************************************************************/
-#ifndef __ARCH_SH_INCLUDE_LIMITS_H
-#define __ARCH_SH_INCLUDE_LIMITS_H
+#ifndef __ARCH_RENESAS_INCLUDE_LIMITS_H
+#define __ARCH_RENESAS_INCLUDE_LIMITS_H
/****************************************************************************
* Included Files
@@ -46,4 +46,4 @@
* Pre-processor Definitions
****************************************************************************/
-#endif /* __ARCH_SH_INCLUDE_LIMITS_H */
+#endif /* __ARCH_RENESAS_INCLUDE_LIMITS_H */
diff --git a/arch/sh/include/m16c/irq.h b/arch/renesas/include/m16c/irq.h
similarity index 98%
rename from arch/sh/include/m16c/irq.h
rename to arch/renesas/include/m16c/irq.h
index 2528e911eb7..0d000f975f8 100644
--- a/arch/sh/include/m16c/irq.h
+++ b/arch/renesas/include/m16c/irq.h
@@ -1,5 +1,5 @@
/************************************************************************************
- * arch/sh/include/m16c/irq.h
+ * arch/renesas/include/m16c/irq.h
*
* Copyright (C) 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
@@ -37,8 +37,8 @@
* only indirectly through nuttx/irq.h
*/
-#ifndef __ARCH_SH_INCLUDE_M16C_IRQ_H
-#define __ARCH_SH_INCLUDE_M16C_IRQ_H
+#ifndef __ARCH_RENESAS_INCLUDE_M16C_IRQ_H
+#define __ARCH_RENESAS_INCLUDE_M16C_IRQ_H
/************************************************************************************
* Included Files
@@ -328,5 +328,5 @@ static inline void up_irq_restore(irqstate_t flags)
#endif
#endif
-#endif /* __ARCH_SH_INCLUDE_M16C_IRQ_H */
+#endif /* __ARCH_RENESAS_INCLUDE_M16C_IRQ_H */
diff --git a/arch/sh/include/m16c/limits.h b/arch/renesas/include/m16c/limits.h
similarity index 94%
rename from arch/sh/include/m16c/limits.h
rename to arch/renesas/include/m16c/limits.h
index 27723d99686..26cb2726f36 100644
--- a/arch/sh/include/m16c/limits.h
+++ b/arch/renesas/include/m16c/limits.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/sh/include/m16c/limits.h
+ * arch/renesas/include/m16c/limits.h
*
* Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
@@ -33,8 +33,8 @@
*
****************************************************************************/
-#ifndef __ARCH_SH_INCLUDE_M16C_LIMITS_H
-#define __ARCH_SH_INCLUDE_M16C_LIMITS_H
+#ifndef __ARCH_RENESAS_INCLUDE_M16C_LIMITS_H
+#define __ARCH_RENESAS_INCLUDE_M16C_LIMITS_H
/****************************************************************************
* Included Files
@@ -85,4 +85,4 @@
#define PTR_MAX 32767
#define UPTR_MAX 65535U
-#endif /* __ARCH_SH_INCLUDE_M16C_LIMITS_H */
+#endif /* __ARCH_RENESAS_INCLUDE_M16C_LIMITS_H */
diff --git a/arch/sh/include/m16c/types.h b/arch/renesas/include/m16c/types.h
similarity index 95%
rename from arch/sh/include/m16c/types.h
rename to arch/renesas/include/m16c/types.h
index 3211209e93f..8eb35288337 100644
--- a/arch/sh/include/m16c/types.h
+++ b/arch/renesas/include/m16c/types.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/sh/include/m16c/types.h
+ * arch/renesas/include/m16c/types.h
*
* Copyright (C) 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
@@ -37,8 +37,8 @@
* through sys/types.h
*/
-#ifndef __ARCH_SH_INCLUDE_M16C_TYPES_H
-#define __ARCH_SH_INCLUDE_M16C_TYPES_H
+#ifndef __ARCH_RENESAS_INCLUDE_M16C_TYPES_H
+#define __ARCH_RENESAS_INCLUDE_M16C_TYPES_H
/****************************************************************************
* Included Files
@@ -95,4 +95,4 @@ typedef _uint16_t irqstate_t;
* Public Function Prototypes
****************************************************************************/
-#endif /* __ARCH_SH_INCLUDE_M16C_TYPES_H */
+#endif /* __ARCH_RENESAS_INCLUDE_M16C_TYPES_H */
diff --git a/arch/sh/include/serial.h b/arch/renesas/include/serial.h
similarity index 94%
rename from arch/sh/include/serial.h
rename to arch/renesas/include/serial.h
index 2ec4ac9054a..224e769c1e0 100644
--- a/arch/sh/include/serial.h
+++ b/arch/renesas/include/serial.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/sh/include/serial.h
+ * arch/renesas/include/serial.h
*
* Copyright (C) 2008, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
@@ -33,8 +33,8 @@
*
****************************************************************************/
-#ifndef __ARCH_SH_INCLUDE_SERIAL_H
-#define __ARCH_SH_INCLUDE_SERIAL_H
+#ifndef __ARCH_RENESAS_INCLUDE_SERIAL_H
+#define __ARCH_RENESAS_INCLUDE_SERIAL_H
/****************************************************************************
* Included Files
@@ -54,4 +54,4 @@
* Public Functions
****************************************************************************/
-#endif /* __ARCH_SH_INCLUDE_SERIAL_H */
+#endif /* __ARCH_RENESAS_INCLUDE_SERIAL_H */
diff --git a/arch/sh/include/sh1/irq.h b/arch/renesas/include/sh1/irq.h
similarity index 99%
rename from arch/sh/include/sh1/irq.h
rename to arch/renesas/include/sh1/irq.h
index b4af921bdbb..9c82e0b39e0 100644
--- a/arch/sh/include/sh1/irq.h
+++ b/arch/renesas/include/sh1/irq.h
@@ -1,5 +1,5 @@
/************************************************************************************
- * arch/sh/include/sh1/irq.h
+ * arch/renesas/include/sh1/irq.h
*
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
@@ -37,8 +37,8 @@
* only indirectly through nuttx/irq.h
*/
-#ifndef __ARCH_SH_INCLUDE_SH1_IRQ_H
-#define __ARCH_SH_INCLUDE_SH1_IRQ_H
+#ifndef __ARCH_RENESAS_INCLUDE_SH1_IRQ_H
+#define __ARCH_RENESAS_INCLUDE_SH1_IRQ_H
/************************************************************************************
* Included Files
@@ -563,5 +563,5 @@ static inline void up_irq_restore(irqstate_t flags)
#endif
#endif
-#endif /* __ARCH_SH_INCLUDE_SH1_IRQ_H */
+#endif /* __ARCH_RENESAS_INCLUDE_SH1_IRQ_H */
diff --git a/arch/sh/include/sh1/limits.h b/arch/renesas/include/sh1/limits.h
similarity index 100%
rename from arch/sh/include/sh1/limits.h
rename to arch/renesas/include/sh1/limits.h
diff --git a/arch/sh/include/sh1/types.h b/arch/renesas/include/sh1/types.h
similarity index 100%
rename from arch/sh/include/sh1/types.h
rename to arch/renesas/include/sh1/types.h
diff --git a/arch/renesas/include/sh1Plimits.h b/arch/renesas/include/sh1Plimits.h
new file mode 100644
index 00000000000..661ed6bd1ee
--- /dev/null
+++ b/arch/renesas/include/sh1Plimits.h
@@ -0,0 +1,88 @@
+/****************************************************************************
+ * arch/renesas/include/sh1/limits.h
+ *
+ * Copyright (C) 2008, 2009, 2012 Gregory Nutt. All rights reserved.
+ * Author: Gregory Nutt
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ * used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+#ifndef __ARCH_RENESAS_INCLUDE_SH1_LIMITS_H
+#define __ARCH_RENESAS_INCLUDE_SH1_LIMITS_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+#define CHAR_BIT 8
+#define SCHAR_MIN (-SCHAR_MAX - 1)
+#define SCHAR_MAX 127
+#define UCHAR_MAX 255
+
+/* These could be different on machines where char is unsigned */
+
+#ifdef __CHAR_UNSIGNED__
+#define CHAR_MIN 0
+#define CHAR_MAX UCHAR_MAX
+#else
+#define CHAR_MIN SCHAR_MIN
+#define CHAR_MAX SCHAR_MAX
+#endif
+
+#define SHRT_MIN (-SHRT_MAX - 1)
+#define SHRT_MAX 32767
+#define USHRT_MAX 65535U
+
+/* On SH-1, type 'int' is 32-bits */
+
+#define INT_MIN (-INT_MAX - 1)
+#define INT_MAX 2147483647
+#define UINT_MAX 4294967295U
+
+/* On SH-1, type 'long' is the same size as type 'int', 32-bits */
+
+#define LONG_MIN (-LONG_MAX - 1)
+#define LONG_MAX 2147483647L
+#define ULONG_MAX 4294967295UL
+
+#define LLONG_MIN (-LLONG_MAX - 1)
+#define LLONG_MAX 9223372036854775807LL
+#define ULLONG_MAX 18446744073709551615ULL
+
+/* A pointer is 4 bytes */
+
+#define PTR_MIN (-PTR_MAX - 1)
+#define PTR_MAX 2147483647
+#define UPTR_MAX 4294967295U
+
+#endif /* __ARCH_RENESAS_INCLUDE_SH1_LIMITS_H */
diff --git a/arch/renesas/include/sh1Ptypes.h b/arch/renesas/include/sh1Ptypes.h
new file mode 100644
index 00000000000..86d7b5b9bb3
--- /dev/null
+++ b/arch/renesas/include/sh1Ptypes.h
@@ -0,0 +1,96 @@
+/****************************************************************************
+ * arch/renesas/include/sh1/types.h
+ *
+ * Copyright (C) 2008, 2009 Gregory Nutt. All rights reserved.
+ * Author: Gregory Nutt
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in
+ * the documentation and/or other materials provided with the
+ * distribution.
+ * 3. Neither the name NuttX nor the names of its contributors may be
+ * used to endorse or promote products derived from this software
+ * without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
+ * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ ****************************************************************************/
+
+/* This file should never be included directed but, rather, only indirectly\
+ * through sys/types.h
+ */
+
+#ifndef __ARCH_RENESAS_INCLUDE_SH1_TYPES_H
+#define __ARCH_RENESAS_INCLUDE_SH1_TYPES_H
+
+/****************************************************************************
+ * Included Files
+ ****************************************************************************/
+
+/****************************************************************************
+ * Pre-processor Definitions
+ ****************************************************************************/
+
+/****************************************************************************
+ * Type Declarations
+ ****************************************************************************/
+
+#ifndef __ASSEMBLY__
+
+/* These are the sizes of the standard integer types. NOTE that these type
+ * names have a leading underscore character. This file will be included
+ * (indirectly) by include/stdint.h and typedef'ed to the final name without
+ * the underscore character. This roundabout way of doings things allows
+ * the stdint.h to be removed from the include/ directory in the event that
+ * the user prefers to use the definitions provided by their toolchain header
+ * files
+ */
+
+typedef signed char _int8_t;
+typedef unsigned char _uint8_t;
+
+typedef signed short _int16_t;
+typedef unsigned short _uint16_t;
+
+typedef signed int _int32_t;
+typedef unsigned int _uint32_t;
+
+typedef signed long long _int64_t;
+typedef unsigned long long _uint64_t;
+#define __INT64_DEFINED
+
+/* A pointer is 4 bytes */
+
+typedef signed int _intptr_t;
+typedef unsigned int _uintptr_t;
+
+/* This is the size of the interrupt state save returned by
+ * up_irq_save()
+ */
+
+typedef unsigned long irqstate_t;
+
+#endif /* __ASSEMBLY__ */
+
+/****************************************************************************
+ * Public Function Prototypes
+ ****************************************************************************/
+
+#endif /* __ARCH_RENESAS_INCLUDE_SH1_TYPES_H */
diff --git a/arch/sh/include/syscall.h b/arch/renesas/include/syscall.h
similarity index 95%
rename from arch/sh/include/syscall.h
rename to arch/renesas/include/syscall.h
index b26dffcd39c..afe93f69761 100644
--- a/arch/sh/include/syscall.h
+++ b/arch/renesas/include/syscall.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/sh/include/syscall.h
+ * arch/renesas/include/syscall.h
*
* Copyright (C) 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
@@ -37,8 +37,8 @@
* through include/syscall.h or include/sys/sycall.h
*/
-#ifndef __ARCH_SH_INCLUDE_SYSCALL_H
-#define __ARCH_SH_INCLUDE_SYSCALL_H
+#ifndef __ARCH_RENESAS_INCLUDE_SYSCALL_H
+#define __ARCH_RENESAS_INCLUDE_SYSCALL_H
/****************************************************************************
* Included Files
@@ -79,5 +79,5 @@ extern "C"
#endif
#endif
-#endif /* __ARCH_SH_INCLUDE_SYSCALL_H */
+#endif /* __ARCH_RENESAS_INCLUDE_SYSCALL_H */
diff --git a/arch/sh/include/types.h b/arch/renesas/include/types.h
similarity index 94%
rename from arch/sh/include/types.h
rename to arch/renesas/include/types.h
index db6c6178ad3..aca5f944635 100644
--- a/arch/sh/include/types.h
+++ b/arch/renesas/include/types.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/sh/include/types.h
+ * arch/renesas/include/types.h
*
* Copyright (C) 2008, 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
@@ -37,8 +37,8 @@
* through sys/types.h
*/
-#ifndef __ARCH_SH_INCLUDE_TYPES_H
-#define __ARCH_SH_INCLUDE_TYPES_H
+#ifndef __ARCH_RENESAS_INCLUDE_TYPES_H
+#define __ARCH_RENESAS_INCLUDE_TYPES_H
/****************************************************************************
* Included Files
@@ -58,4 +58,4 @@
* Public Function Prototypes
****************************************************************************/
-#endif /* __ARCH_SH_INCLUDE_TYPES_H */
+#endif /* __ARCH_RENESAS_INCLUDE_TYPES_H */
diff --git a/arch/sh/include/watchdog.h b/arch/renesas/include/watchdog.h
similarity index 94%
rename from arch/sh/include/watchdog.h
rename to arch/renesas/include/watchdog.h
index 091729833cd..002bc420595 100644
--- a/arch/sh/include/watchdog.h
+++ b/arch/renesas/include/watchdog.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/sh/include/watchdog.h
+ * arch/renesas/include/watchdog.h
*
* Copyright (C) 2008 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
@@ -33,8 +33,8 @@
*
****************************************************************************/
-#ifndef __ARCH_SH_INCLUDE_WATCHDOG_H
-#define __ARCH_SH_INCLUDE_WATCHDOG_H
+#ifndef __ARCH_RENESAS_INCLUDE_WATCHDOG_H
+#define __ARCH_RENESAS_INCLUDE_WATCHDOG_H
/****************************************************************************
* Included Files
@@ -56,4 +56,4 @@
* Public Functions
****************************************************************************/
-#endif /* __ARCH_SH_INCLUDE_WATCHDOG_H */
+#endif /* __ARCH_RENESAS_INCLUDE_WATCHDOG_H */
diff --git a/arch/sh/src/.gitignore b/arch/renesas/src/.gitignore
similarity index 100%
rename from arch/sh/src/.gitignore
rename to arch/renesas/src/.gitignore
diff --git a/arch/sh/src/Makefile b/arch/renesas/src/Makefile
similarity index 99%
rename from arch/sh/src/Makefile
rename to arch/renesas/src/Makefile
index 81e0b5b8c14..14e4bc23122 100644
--- a/arch/sh/src/Makefile
+++ b/arch/renesas/src/Makefile
@@ -1,5 +1,5 @@
############################################################################
-# arch/sh/src/Makefile
+# arch/renesas/src/Makefile
#
# Copyright (C) 2008, 2011-2012, 2014, 2016 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt
diff --git a/arch/sh/src/README.txt b/arch/renesas/src/README.txt
similarity index 100%
rename from arch/sh/src/README.txt
rename to arch/renesas/src/README.txt
diff --git a/arch/sh/src/common/Kconfig b/arch/renesas/src/common/Kconfig
similarity index 100%
rename from arch/sh/src/common/Kconfig
rename to arch/renesas/src/common/Kconfig
diff --git a/arch/sh/src/common/up_allocateheap.c b/arch/renesas/src/common/up_allocateheap.c
similarity index 98%
rename from arch/sh/src/common/up_allocateheap.c
rename to arch/renesas/src/common/up_allocateheap.c
index ddf287983a1..4148407fb79 100644
--- a/arch/sh/src/common/up_allocateheap.c
+++ b/arch/renesas/src/common/up_allocateheap.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/sh/src/common/up_allocateheap.c
+ * arch/renesas/src/common/up_allocateheap.c
*
* Copyright (C) 2008, 2013, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/arch/sh/src/common/up_arch.h b/arch/renesas/src/common/up_arch.h
similarity index 94%
rename from arch/sh/src/common/up_arch.h
rename to arch/renesas/src/common/up_arch.h
index b624da189d5..5637ddf5a2d 100644
--- a/arch/sh/src/common/up_arch.h
+++ b/arch/renesas/src/common/up_arch.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/sh/src/common/up_arch.h
+ * arch/renesas/src/common/up_arch.h
*
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
@@ -33,8 +33,8 @@
*
****************************************************************************/
-#ifndef ___ARCH_SH_SRC_COMMON_UP_ARCH_H
-#define ___ARCH_SH_SRC_COMMON_UP_ARCH_H
+#ifndef ___ARCH_RENESAS_SRC_COMMON_UP_ARCH_H
+#define ___ARCH_RENESAS_SRC_COMMON_UP_ARCH_H
/****************************************************************************
* Included Files
@@ -67,4 +67,4 @@
#endif
-#endif /* ___ARCH_SH_SRC_COMMON_UP_ARCH_H */
+#endif /* ___ARCH_RENESAS_SRC_COMMON_UP_ARCH_H */
diff --git a/arch/sh/src/common/up_assert.c b/arch/renesas/src/common/up_assert.c
similarity index 99%
rename from arch/sh/src/common/up_assert.c
rename to arch/renesas/src/common/up_assert.c
index ec02578cfd0..eaee6f7fec0 100644
--- a/arch/sh/src/common/up_assert.c
+++ b/arch/renesas/src/common/up_assert.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/sh/src/common/up_assert.c
+ * arch/renesas/src/common/up_assert.c
*
* Copyright (C) 2008-2009, 2012-2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/arch/sh/src/common/up_blocktask.c b/arch/renesas/src/common/up_blocktask.c
similarity index 99%
rename from arch/sh/src/common/up_blocktask.c
rename to arch/renesas/src/common/up_blocktask.c
index 75ecdef5077..9e8ba57db75 100644
--- a/arch/sh/src/common/up_blocktask.c
+++ b/arch/renesas/src/common/up_blocktask.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/sh/src/common/up_blocktask.c
+ * arch/renesas/src/common/up_blocktask.c
*
* Copyright (C) 2008-2009, 2013-2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/arch/sh/src/common/up_createstack.c b/arch/renesas/src/common/up_createstack.c
similarity index 99%
rename from arch/sh/src/common/up_createstack.c
rename to arch/renesas/src/common/up_createstack.c
index 3a2a4118119..1bbf3cc8e0f 100644
--- a/arch/sh/src/common/up_createstack.c
+++ b/arch/renesas/src/common/up_createstack.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/sh/src/common/up_createstack.c
+ * arch/renesas/src/common/up_createstack.c
*
* Copyright (C) 2008-2009, 2013-2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/arch/sh/src/common/up_doirq.c b/arch/renesas/src/common/up_doirq.c
similarity index 99%
rename from arch/sh/src/common/up_doirq.c
rename to arch/renesas/src/common/up_doirq.c
index a2996c9f482..9ac9d99aa00 100644
--- a/arch/sh/src/common/up_doirq.c
+++ b/arch/renesas/src/common/up_doirq.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/sh/src/common/up_doirq.c
+ * arch/renesas/src/common/up_doirq.c
*
* Copyright (C) 2008-2009, 2011, 2014-2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/arch/sh/src/common/up_exit.c b/arch/renesas/src/common/up_exit.c
similarity index 100%
rename from arch/sh/src/common/up_exit.c
rename to arch/renesas/src/common/up_exit.c
diff --git a/arch/sh/src/common/up_idle.c b/arch/renesas/src/common/up_idle.c
similarity index 98%
rename from arch/sh/src/common/up_idle.c
rename to arch/renesas/src/common/up_idle.c
index 0333722347b..c1fc2ed0ce4 100644
--- a/arch/sh/src/common/up_idle.c
+++ b/arch/renesas/src/common/up_idle.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/sh/src/common/up_idle.c
+ * arch/renesas/src/common/up_idle.c
*
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/arch/sh/src/common/up_initialize.c b/arch/renesas/src/common/up_initialize.c
similarity index 99%
rename from arch/sh/src/common/up_initialize.c
rename to arch/renesas/src/common/up_initialize.c
index 2cd40a07188..fc61dc0e363 100644
--- a/arch/sh/src/common/up_initialize.c
+++ b/arch/renesas/src/common/up_initialize.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/sh/src/common/up_initialize.c
+ * arch/renesas/src/common/up_initialize.c
*
* Copyright (C) 2008-2010, 2012-2013, 2015-2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/arch/sh/src/common/up_internal.h b/arch/renesas/src/common/up_internal.h
similarity index 97%
rename from arch/sh/src/common/up_internal.h
rename to arch/renesas/src/common/up_internal.h
index c055436edb6..e04157953a0 100644
--- a/arch/sh/src/common/up_internal.h
+++ b/arch/renesas/src/common/up_internal.h
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/sh/src/common/up_internal.h
+ * arch/renesas/src/common/up_internal.h
*
* Copyright (C) 2008-2009, 2012-2013, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
@@ -33,8 +33,8 @@
*
****************************************************************************/
-#ifndef ___ARCH_SH_SRC_COMMON_UP_INTERNAL_H
-#define ___ARCH_SH_SRC_COMMON_UP_INTERNAL_H
+#ifndef ___ARCH_RENESAS_SRC_COMMON_UP_INTERNAL_H
+#define ___ARCH_RENESAS_SRC_COMMON_UP_INTERNAL_H
/****************************************************************************
* Included Files
@@ -237,4 +237,4 @@ void up_dumpstate(void);
#endif
#endif /* __ASSEMBLY__ */
-#endif /* ___ARCH_SH_SRC_COMMON_UP_INTERNAL_H */
+#endif /* ___ARCH_RENESAS_SRC_COMMON_UP_INTERNAL_H */
diff --git a/arch/sh/src/common/up_interruptcontext.c b/arch/renesas/src/common/up_interruptcontext.c
similarity index 98%
rename from arch/sh/src/common/up_interruptcontext.c
rename to arch/renesas/src/common/up_interruptcontext.c
index 56e4f9478ea..a67f13d0c30 100644
--- a/arch/sh/src/common/up_interruptcontext.c
+++ b/arch/renesas/src/common/up_interruptcontext.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/sh/src/common/up_interruptcontext.c
+ * arch/renesas/src/common/up_interruptcontext.c
*
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/arch/sh/src/common/up_lowputs.c b/arch/renesas/src/common/up_lowputs.c
similarity index 98%
rename from arch/sh/src/common/up_lowputs.c
rename to arch/renesas/src/common/up_lowputs.c
index 592ea8177f7..76617901e78 100644
--- a/arch/sh/src/common/up_lowputs.c
+++ b/arch/renesas/src/common/up_lowputs.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/sh/src/common/up_lowputs.c
+ * arch/renesas/src/common/up_lowputs.c
*
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/arch/sh/src/common/up_mdelay.c b/arch/renesas/src/common/up_mdelay.c
similarity index 98%
rename from arch/sh/src/common/up_mdelay.c
rename to arch/renesas/src/common/up_mdelay.c
index e7ed4f90156..e3120ce74b4 100644
--- a/arch/sh/src/common/up_mdelay.c
+++ b/arch/renesas/src/common/up_mdelay.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/sh/src/common/up_mdelay.c
+ * arch/renesas/src/common/up_mdelay.c
*
* Copyright (C) 2008 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/arch/sh/src/common/up_puts.c b/arch/renesas/src/common/up_puts.c
similarity index 98%
rename from arch/sh/src/common/up_puts.c
rename to arch/renesas/src/common/up_puts.c
index 24dccecbe40..5bc2cc8433f 100644
--- a/arch/sh/src/common/up_puts.c
+++ b/arch/renesas/src/common/up_puts.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/sh/src/common/up_puts.c
+ * arch/renesas/src/common/up_puts.c
*
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/arch/sh/src/common/up_releasepending.c b/arch/renesas/src/common/up_releasepending.c
similarity index 99%
rename from arch/sh/src/common/up_releasepending.c
rename to arch/renesas/src/common/up_releasepending.c
index 195935ff458..5c3f5748217 100644
--- a/arch/sh/src/common/up_releasepending.c
+++ b/arch/renesas/src/common/up_releasepending.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/sh/src/common/up_releasepending.c
+ * arch/renesas/src/common/up_releasepending.c
*
* Copyright (C) 2008-2009, 2014-2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/arch/sh/src/common/up_releasestack.c b/arch/renesas/src/common/up_releasestack.c
similarity index 99%
rename from arch/sh/src/common/up_releasestack.c
rename to arch/renesas/src/common/up_releasestack.c
index 8e01456fdbf..e2b5948b142 100644
--- a/arch/sh/src/common/up_releasestack.c
+++ b/arch/renesas/src/common/up_releasestack.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/sh/src/common/up_releasestack.c
+ * arch/renesas/src/common/up_releasestack.c
*
* Copyright (C) 2008-2009, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/arch/sh/src/common/up_reprioritizertr.c b/arch/renesas/src/common/up_reprioritizertr.c
similarity index 99%
rename from arch/sh/src/common/up_reprioritizertr.c
rename to arch/renesas/src/common/up_reprioritizertr.c
index f2d0d1a2266..c476dbad376 100644
--- a/arch/sh/src/common/up_reprioritizertr.c
+++ b/arch/renesas/src/common/up_reprioritizertr.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/sh/src/common/up_reprioritizertr.c
+ * arch/renesas/src/common/up_reprioritizertr.c
*
* Copyright (C) 2008-2009, 2011, 2013-2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/arch/sh/src/common/up_stackframe.c b/arch/renesas/src/common/up_stackframe.c
similarity index 99%
rename from arch/sh/src/common/up_stackframe.c
rename to arch/renesas/src/common/up_stackframe.c
index 06d2c218a34..811fcd4aad1 100644
--- a/arch/sh/src/common/up_stackframe.c
+++ b/arch/renesas/src/common/up_stackframe.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/sh/src/common/up_stackframe.c
+ * arch/renesas/src/common/up_stackframe.c
*
* Copyright (C) 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/arch/sh/src/common/up_udelay.c b/arch/renesas/src/common/up_udelay.c
similarity index 99%
rename from arch/sh/src/common/up_udelay.c
rename to arch/renesas/src/common/up_udelay.c
index 6af5d2f76d4..9f9bda30330 100644
--- a/arch/sh/src/common/up_udelay.c
+++ b/arch/renesas/src/common/up_udelay.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/sh/src/common/up_udelay.c
+ * arch/renesas/src/common/up_udelay.c
*
* Copyright (C) 2008 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/arch/sh/src/common/up_unblocktask.c b/arch/renesas/src/common/up_unblocktask.c
similarity index 99%
rename from arch/sh/src/common/up_unblocktask.c
rename to arch/renesas/src/common/up_unblocktask.c
index d506d97d094..de3008f98a0 100644
--- a/arch/sh/src/common/up_unblocktask.c
+++ b/arch/renesas/src/common/up_unblocktask.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/sh/src/common/up_unblocktask.c
+ * arch/renesas/src/common/up_unblocktask.c
*
* Copyright (C) 2008-2009, 2013-2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/arch/sh/src/common/up_usestack.c b/arch/renesas/src/common/up_usestack.c
similarity index 99%
rename from arch/sh/src/common/up_usestack.c
rename to arch/renesas/src/common/up_usestack.c
index 2da654391ca..de4c4aca95f 100644
--- a/arch/sh/src/common/up_usestack.c
+++ b/arch/renesas/src/common/up_usestack.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/sh/src/common/up_usestack.c
+ * arch/renesas/src/common/up_usestack.c
*
* Copyright (C) 2008-2009, 2013 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/arch/sh/src/m16c/Kconfig b/arch/renesas/src/m16c/Kconfig
similarity index 100%
rename from arch/sh/src/m16c/Kconfig
rename to arch/renesas/src/m16c/Kconfig
diff --git a/arch/sh/src/m16c/Make.defs b/arch/renesas/src/m16c/Make.defs
similarity index 98%
rename from arch/sh/src/m16c/Make.defs
rename to arch/renesas/src/m16c/Make.defs
index 6995d37b1e4..d44d9b2f097 100644
--- a/arch/sh/src/m16c/Make.defs
+++ b/arch/renesas/src/m16c/Make.defs
@@ -1,5 +1,5 @@
##############################################################################
-# arch/sh/src/m16c/Make.defs
+# arch/renesas/src/m16c/Make.defs
#
# Copyright (C) 2009, 2014 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt
diff --git a/arch/sh/src/m16c/chip.h b/arch/renesas/src/m16c/chip.h
similarity index 98%
rename from arch/sh/src/m16c/chip.h
rename to arch/renesas/src/m16c/chip.h
index 695814d4324..80fbc0e734d 100644
--- a/arch/sh/src/m16c/chip.h
+++ b/arch/renesas/src/m16c/chip.h
@@ -1,5 +1,5 @@
/************************************************************************************
- * arch/sh/src/m16c/chip.h
+ * arch/renesas/src/m16c/chip.h
*
* Copyright (C) 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
@@ -33,8 +33,8 @@
*
************************************************************************************/
-#ifndef __ARCH_SH_SRC_M16C_CHIP_H
-#define __ARCH_SH_SRC_M16C_CHIP_H
+#ifndef __ARCH_RENESAS_SRC_M16C_CHIP_H
+#define __ARCH_RENESAS_SRC_M16C_CHIP_H
/************************************************************************************
* Included Files
@@ -278,4 +278,4 @@ extern uint32_t g_idle_topstack; /* Start of the heap */
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_SH_SRC_M16C_CHIP_H */
+#endif /* __ARCH_RENESAS_SRC_M16C_CHIP_H */
diff --git a/arch/sh/src/m16c/m16c_copystate.c b/arch/renesas/src/m16c/m16c_copystate.c
similarity index 98%
rename from arch/sh/src/m16c/m16c_copystate.c
rename to arch/renesas/src/m16c/m16c_copystate.c
index 2aa48d6c72a..662a6870f63 100644
--- a/arch/sh/src/m16c/m16c_copystate.c
+++ b/arch/renesas/src/m16c/m16c_copystate.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/sh/src/m16c/up_copystate.c
+ * arch/renesas/src/m16c/up_copystate.c
*
* Copyright (C) 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/arch/sh/src/m16c/m16c_dumpstate.c b/arch/renesas/src/m16c/m16c_dumpstate.c
similarity index 99%
rename from arch/sh/src/m16c/m16c_dumpstate.c
rename to arch/renesas/src/m16c/m16c_dumpstate.c
index 7dc1a74ee43..cfd9bd0fdb2 100644
--- a/arch/sh/src/m16c/m16c_dumpstate.c
+++ b/arch/renesas/src/m16c/m16c_dumpstate.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/sh/src/m16c/m16c_assert.c
+ * arch/renesas/src/m16c/m16c_assert.c
*
* Copyright (C) 2009, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/arch/sh/src/m16c/m16c_head.S b/arch/renesas/src/m16c/m16c_head.S
similarity index 99%
rename from arch/sh/src/m16c/m16c_head.S
rename to arch/renesas/src/m16c/m16c_head.S
index 711ce26aaaf..2ed97e4853b 100644
--- a/arch/sh/src/m16c/m16c_head.S
+++ b/arch/renesas/src/m16c/m16c_head.S
@@ -1,5 +1,5 @@
/************************************************************************************
- * arch/sh/src/m16c/m16c_head.S
+ * arch/renesas/src/m16c/m16c_head.S
*
* Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/arch/sh/src/m16c/m16c_initialstate.c b/arch/renesas/src/m16c/m16c_initialstate.c
similarity index 98%
rename from arch/sh/src/m16c/m16c_initialstate.c
rename to arch/renesas/src/m16c/m16c_initialstate.c
index cc913fde649..abf31035d10 100644
--- a/arch/sh/src/m16c/m16c_initialstate.c
+++ b/arch/renesas/src/m16c/m16c_initialstate.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/sh/src/m16c/m16c_initialstate.c
+ * arch/renesas/src/m16c/m16c_initialstate.c
*
* Copyright (C) 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/arch/sh/src/m16c/m16c_irq.c b/arch/renesas/src/m16c/m16c_irq.c
similarity index 99%
rename from arch/sh/src/m16c/m16c_irq.c
rename to arch/renesas/src/m16c/m16c_irq.c
index 2951033206e..ce94eb4d344 100644
--- a/arch/sh/src/m16c/m16c_irq.c
+++ b/arch/renesas/src/m16c/m16c_irq.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/sh/src/m16c/m16c_irq.c
+ * arch/renesas/src/m16c/m16c_irq.c
*
* Copyright (C) 2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/arch/sh/src/m16c/m16c_lowputc.c b/arch/renesas/src/m16c/m16c_lowputc.c
similarity index 99%
rename from arch/sh/src/m16c/m16c_lowputc.c
rename to arch/renesas/src/m16c/m16c_lowputc.c
index 5ec641fbec6..ecda7343800 100644
--- a/arch/sh/src/m16c/m16c_lowputc.c
+++ b/arch/renesas/src/m16c/m16c_lowputc.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/sh/src/m16c/m16c_lowputc.c
+ * arch/renesas/src/m16c/m16c_lowputc.c
*
* Copyright (C) 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/arch/sh/src/m16c/m16c_schedulesigaction.c b/arch/renesas/src/m16c/m16c_schedulesigaction.c
similarity index 99%
rename from arch/sh/src/m16c/m16c_schedulesigaction.c
rename to arch/renesas/src/m16c/m16c_schedulesigaction.c
index 23d105240bf..69913944663 100644
--- a/arch/sh/src/m16c/m16c_schedulesigaction.c
+++ b/arch/renesas/src/m16c/m16c_schedulesigaction.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/sh/src/m16c/m16c_schedulesigaction.c
+ * arch/renesas/src/m16c/m16c_schedulesigaction.c
*
* Copyright (C) 2009-2010, 2015-2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/arch/sh/src/m16c/m16c_serial.c b/arch/renesas/src/m16c/m16c_serial.c
similarity index 99%
rename from arch/sh/src/m16c/m16c_serial.c
rename to arch/renesas/src/m16c/m16c_serial.c
index 4bc1f969ce6..cdbcc2471c8 100644
--- a/arch/sh/src/m16c/m16c_serial.c
+++ b/arch/renesas/src/m16c/m16c_serial.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/sh/src/m16c/m16c_serial.c
+ * arch/renesas/src/m16c/m16c_serial.c
*
* Copyright (C) 2009, 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/arch/sh/src/m16c/m16c_sigdeliver.c b/arch/renesas/src/m16c/m16c_sigdeliver.c
similarity index 99%
rename from arch/sh/src/m16c/m16c_sigdeliver.c
rename to arch/renesas/src/m16c/m16c_sigdeliver.c
index 40976346f3d..a56448c36bc 100644
--- a/arch/sh/src/m16c/m16c_sigdeliver.c
+++ b/arch/renesas/src/m16c/m16c_sigdeliver.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/sh/src/m16c/m16c_sigdeliver.c
+ * arch/renesas/src/m16c/m16c_sigdeliver.c
*
* Copyright (C) 2009-2010, 2015 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/arch/sh/src/m16c/m16c_timer.h b/arch/renesas/src/m16c/m16c_timer.h
similarity index 98%
rename from arch/sh/src/m16c/m16c_timer.h
rename to arch/renesas/src/m16c/m16c_timer.h
index ff542163222..5c19ff6ed55 100644
--- a/arch/sh/src/m16c/m16c_timer.h
+++ b/arch/renesas/src/m16c/m16c_timer.h
@@ -1,5 +1,5 @@
/************************************************************************************
- * arch/sh/src/m16c/m16c_timer.h
+ * arch/renesas/src/m16c/m16c_timer.h
*
* Copyright (C) 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
@@ -33,8 +33,8 @@
*
************************************************************************************/
-#ifndef __ARCH_SH_SRC_M16C_M16C_TIMER_H
-#define __ARCH_SH_SRC_M16C_M16C_TIMER_H
+#ifndef __ARCH_RENESAS_SRC_M16C_M16C_TIMER_H
+#define __ARCH_RENESAS_SRC_M16C_M16C_TIMER_H
/************************************************************************************
* Included Files
@@ -223,4 +223,4 @@
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_SH_SRC_M16C_M16C_TIMER_H */
+#endif /* __ARCH_RENESAS_SRC_M16C_M16C_TIMER_H */
diff --git a/arch/sh/src/m16c/m16c_timerisr.c b/arch/renesas/src/m16c/m16c_timerisr.c
similarity index 99%
rename from arch/sh/src/m16c/m16c_timerisr.c
rename to arch/renesas/src/m16c/m16c_timerisr.c
index adaa18af022..02570de1cc0 100644
--- a/arch/sh/src/m16c/m16c_timerisr.c
+++ b/arch/renesas/src/m16c/m16c_timerisr.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/sh/src/m16c/m16c_timerisr.c
+ * arch/renesas/src/m16c/m16c_timerisr.c
*
* Copyright (C) 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/arch/sh/src/m16c/m16c_uart.h b/arch/renesas/src/m16c/m16c_uart.h
similarity index 97%
rename from arch/sh/src/m16c/m16c_uart.h
rename to arch/renesas/src/m16c/m16c_uart.h
index 382411538d3..c50d9b90183 100644
--- a/arch/sh/src/m16c/m16c_uart.h
+++ b/arch/renesas/src/m16c/m16c_uart.h
@@ -1,5 +1,5 @@
/************************************************************************************
- * arch/sh/src/m16c/m16c_uart.h
+ * arch/renesas/src/m16c/m16c_uart.h
*
* Copyright (C) 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
@@ -33,8 +33,8 @@
*
************************************************************************************/
-#ifndef __ARCH_SH_SRC_M16C_M16C_UART_H
-#define __ARCH_SH_SRC_M16C_M16C_UART_H
+#ifndef __ARCH_RENESAS_SRC_M16C_M16C_UART_H
+#define __ARCH_RENESAS_SRC_M16C_M16C_UART_H
/************************************************************************************
* Included Files
@@ -142,4 +142,4 @@
#endif /* __ASSEMBLY__ */
-#endif /* __ARCH_SH_SRC_M16C_M16C_UART_H */
+#endif /* __ARCH_RENESAS_SRC_M16C_M16C_UART_H */
diff --git a/arch/sh/src/m16c/m16c_vectors.S b/arch/renesas/src/m16c/m16c_vectors.S
similarity index 99%
rename from arch/sh/src/m16c/m16c_vectors.S
rename to arch/renesas/src/m16c/m16c_vectors.S
index b59f179864f..0925db3e4ed 100644
--- a/arch/sh/src/m16c/m16c_vectors.S
+++ b/arch/renesas/src/m16c/m16c_vectors.S
@@ -1,5 +1,5 @@
/************************************************************************************
- * arch/sh/src/m16c/m16c_vectors.S
+ * arch/renesas/src/m16c/m16c_vectors.S
*
* Copyright (C) 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/arch/sh/src/sh1/Kconfig b/arch/renesas/src/sh1/Kconfig
similarity index 100%
rename from arch/sh/src/sh1/Kconfig
rename to arch/renesas/src/sh1/Kconfig
diff --git a/arch/sh/src/sh1/Make.defs b/arch/renesas/src/sh1/Make.defs
similarity index 98%
rename from arch/sh/src/sh1/Make.defs
rename to arch/renesas/src/sh1/Make.defs
index 180034a72d2..adbfd361986 100644
--- a/arch/sh/src/sh1/Make.defs
+++ b/arch/renesas/src/sh1/Make.defs
@@ -1,5 +1,5 @@
##############################################################################
-# arch/sh/src/sh1/Make.defs
+# arch/renesas/src/sh1/Make.defs
#
# Copyright (C) 2008, 2009, 2014 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt
diff --git a/arch/sh/src/sh1/chip.h b/arch/renesas/src/sh1/chip.h
similarity index 95%
rename from arch/sh/src/sh1/chip.h
rename to arch/renesas/src/sh1/chip.h
index 490b20973e8..4459bdcadb3 100644
--- a/arch/sh/src/sh1/chip.h
+++ b/arch/renesas/src/sh1/chip.h
@@ -1,5 +1,5 @@
/************************************************************************************
- * arch/sh/src/sh1/chip.h
+ * arch/renesas/src/sh1/chip.h
*
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
@@ -33,8 +33,8 @@
*
************************************************************************************/
-#ifndef __ARCH_SH_SRC_SH1_CHIP_H
-#define __ARCH_SH_SRC_SH1_CHIP_H
+#ifndef __ARCH_RENESAS_SRC_SH1_CHIP_H
+#define __ARCH_RENESAS_SRC_SH1_CHIP_H
/************************************************************************************
* Included Files
@@ -71,4 +71,4 @@
* Public Functions
************************************************************************************/
-#endif /* __ARCH_SH_SRC_SH1_CHIP_H */
+#endif /* __ARCH_RENESAS_SRC_SH1_CHIP_H */
diff --git a/arch/sh/src/sh1/sh1_703x.h b/arch/renesas/src/sh1/sh1_703x.h
similarity index 99%
rename from arch/sh/src/sh1/sh1_703x.h
rename to arch/renesas/src/sh1/sh1_703x.h
index 87f2c1bcd17..ba5ab4d6270 100644
--- a/arch/sh/src/sh1/sh1_703x.h
+++ b/arch/renesas/src/sh1/sh1_703x.h
@@ -1,5 +1,5 @@
/************************************************************************************
- * arch/sh/src/sh1/sh1_703x.h
+ * arch/renesas/src/sh1/sh1_703x.h
*
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
@@ -33,8 +33,8 @@
*
************************************************************************************/
-#ifndef __ARCH_SH_SRC_SH1_703X_H
-#define __ARCH_SH_SRC_SH1_703X_H
+#ifndef __ARCH_RENESAS_SRC_SH1_703X_H
+#define __ARCH_RENESAS_SRC_SH1_703X_H
/************************************************************************************
* Included Files
@@ -459,7 +459,7 @@
* Public Functions
************************************************************************************/
-#endif /* __ARCH_SH_SRC_SH1_703X_H */
+#endif /* __ARCH_RENESAS_SRC_SH1_703X_H */
diff --git a/arch/sh/src/sh1/sh1_copystate.c b/arch/renesas/src/sh1/sh1_copystate.c
similarity index 98%
rename from arch/sh/src/sh1/sh1_copystate.c
rename to arch/renesas/src/sh1/sh1_copystate.c
index 57fa2d46386..8b2404ca257 100644
--- a/arch/sh/src/sh1/sh1_copystate.c
+++ b/arch/renesas/src/sh1/sh1_copystate.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/sh/src/sh1/up_copystate.c
+ * arch/renesas/src/sh1/up_copystate.c
*
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/arch/sh/src/sh1/sh1_dumpstate.c b/arch/renesas/src/sh1/sh1_dumpstate.c
similarity index 99%
rename from arch/sh/src/sh1/sh1_dumpstate.c
rename to arch/renesas/src/sh1/sh1_dumpstate.c
index e9b0e590784..4609b435591 100644
--- a/arch/sh/src/sh1/sh1_dumpstate.c
+++ b/arch/renesas/src/sh1/sh1_dumpstate.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/sh/src/sh1/sh1_assert.c
+ * arch/renesas/src/sh1/sh1_assert.c
*
* Copyright (C) 2008-2009, 2011, 2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/arch/sh/src/sh1/sh1_head.S b/arch/renesas/src/sh1/sh1_head.S
similarity index 99%
rename from arch/sh/src/sh1/sh1_head.S
rename to arch/renesas/src/sh1/sh1_head.S
index e46522da885..695e0d86537 100644
--- a/arch/sh/src/sh1/sh1_head.S
+++ b/arch/renesas/src/sh1/sh1_head.S
@@ -1,5 +1,5 @@
/*****************************************************************************
- * arch/sh/src/sh1/sh1_head.S
+ * arch/renesas/src/sh1/sh1_head.S
*
* Copyright (C) 2008-2009, 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/arch/sh/src/sh1/sh1_initialstate.c b/arch/renesas/src/sh1/sh1_initialstate.c
similarity index 99%
rename from arch/sh/src/sh1/sh1_initialstate.c
rename to arch/renesas/src/sh1/sh1_initialstate.c
index 984829a370d..0575b0300f6 100644
--- a/arch/sh/src/sh1/sh1_initialstate.c
+++ b/arch/renesas/src/sh1/sh1_initialstate.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/sh/src/sh1/sh1_initialstate.c
+ * arch/renesas/src/sh1/sh1_initialstate.c
*
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/arch/sh/src/sh1/sh1_irq.c b/arch/renesas/src/sh1/sh1_irq.c
similarity index 99%
rename from arch/sh/src/sh1/sh1_irq.c
rename to arch/renesas/src/sh1/sh1_irq.c
index bb598773402..8fe7241c607 100644
--- a/arch/sh/src/sh1/sh1_irq.c
+++ b/arch/renesas/src/sh1/sh1_irq.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/sh/src/sh1/sh1_irq.c
+ * arch/renesas/src/sh1/sh1_irq.c
*
* Copyright (C) 2008-2009, 2011 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/arch/sh/src/sh1/sh1_lowputc.c b/arch/renesas/src/sh1/sh1_lowputc.c
similarity index 99%
rename from arch/sh/src/sh1/sh1_lowputc.c
rename to arch/renesas/src/sh1/sh1_lowputc.c
index 8b423b75b8f..b04612b7024 100644
--- a/arch/sh/src/sh1/sh1_lowputc.c
+++ b/arch/renesas/src/sh1/sh1_lowputc.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/sh/src/sh1/sh1_lowputc.c
+ * arch/renesas/src/sh1/sh1_lowputc.c
*
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/arch/sh/src/sh1/sh1_saveusercontext.S b/arch/renesas/src/sh1/sh1_saveusercontext.S
similarity index 99%
rename from arch/sh/src/sh1/sh1_saveusercontext.S
rename to arch/renesas/src/sh1/sh1_saveusercontext.S
index 8084e5bd0d8..e2fcebd7ef3 100644
--- a/arch/sh/src/sh1/sh1_saveusercontext.S
+++ b/arch/renesas/src/sh1/sh1_saveusercontext.S
@@ -1,5 +1,5 @@
/**************************************************************************
- * arch/sh/src/sh1/sh1_saveusercontext.S
+ * arch/renesas/src/sh1/sh1_saveusercontext.S
*
* Copyright (C) 2008, 2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/arch/sh/src/sh1/sh1_schedulesigaction.c b/arch/renesas/src/sh1/sh1_schedulesigaction.c
similarity index 99%
rename from arch/sh/src/sh1/sh1_schedulesigaction.c
rename to arch/renesas/src/sh1/sh1_schedulesigaction.c
index 11c241ddea3..503272b5a95 100644
--- a/arch/sh/src/sh1/sh1_schedulesigaction.c
+++ b/arch/renesas/src/sh1/sh1_schedulesigaction.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/sh/src/sh1/sh1_schedulesigaction.c
+ * arch/renesas/src/sh1/sh1_schedulesigaction.c
*
* Copyright (C) 2008-2010, 2015-2016 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/arch/sh/src/sh1/sh1_serial.c b/arch/renesas/src/sh1/sh1_serial.c
similarity index 99%
rename from arch/sh/src/sh1/sh1_serial.c
rename to arch/renesas/src/sh1/sh1_serial.c
index 44c9cf8a934..ff9246fad99 100644
--- a/arch/sh/src/sh1/sh1_serial.c
+++ b/arch/renesas/src/sh1/sh1_serial.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/sh/src/sh1/sh1_serial.c
+ * arch/renesas/src/sh1/sh1_serial.c
*
* Copyright (C) 2008-2009, 2012 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/arch/sh/src/sh1/sh1_sigdeliver.c b/arch/renesas/src/sh1/sh1_sigdeliver.c
similarity index 100%
rename from arch/sh/src/sh1/sh1_sigdeliver.c
rename to arch/renesas/src/sh1/sh1_sigdeliver.c
diff --git a/arch/sh/src/sh1/sh1_timerisr.c b/arch/renesas/src/sh1/sh1_timerisr.c
similarity index 99%
rename from arch/sh/src/sh1/sh1_timerisr.c
rename to arch/renesas/src/sh1/sh1_timerisr.c
index 08647be112f..c291735ad22 100644
--- a/arch/sh/src/sh1/sh1_timerisr.c
+++ b/arch/renesas/src/sh1/sh1_timerisr.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * arch/sh/src/sh1/sh1_timerisr.c
+ * arch/renesas/src/sh1/sh1_timerisr.c
*
* Copyright (C) 2008-2009 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/arch/sh/src/sh1/sh1_vector.S b/arch/renesas/src/sh1/sh1_vector.S
similarity index 99%
rename from arch/sh/src/sh1/sh1_vector.S
rename to arch/renesas/src/sh1/sh1_vector.S
index 396e33cd276..78ec75f310c 100644
--- a/arch/sh/src/sh1/sh1_vector.S
+++ b/arch/renesas/src/sh1/sh1_vector.S
@@ -1,5 +1,5 @@
/*****************************************************************************
- * arch/sh/src/sh1/sh1_vector.S
+ * arch/renesas/src/sh1/sh1_vector.S
*
* Copyright (C) 2008 Gregory Nutt. All rights reserved.
* Author: Gregory Nutt
diff --git a/configs/skp16c26/ostest/defconfig b/configs/skp16c26/ostest/defconfig
index cf950449245..e96c79f62dc 100644
--- a/configs/skp16c26/ostest/defconfig
+++ b/configs/skp16c26/ostest/defconfig
@@ -59,7 +59,7 @@ CONFIG_ARCH_SH=y
# CONFIG_ARCH_X86 is not set
# CONFIG_ARCH_Z16 is not set
# CONFIG_ARCH_Z80 is not set
-CONFIG_ARCH="sh"
+CONFIG_ARCH="renesas"
CONFIG_ARCH_CHIP="m16c"
# CONFIG_ARCH_CHIP_SH7032 is not set
CONFIG_ARCH_CHIP_M30262F8=y
diff --git a/configs/us7032evb1/README.txt b/configs/us7032evb1/README.txt
index 7a94b1af06c..20745179943 100644
--- a/configs/us7032evb1/README.txt
+++ b/configs/us7032evb1/README.txt
@@ -110,9 +110,9 @@ specific to the SH-1
Architecture selection
CONFIG_ARCH - identifies the arch subdirectory and, hence, the
- processor architecture. This should be sh (for arch/sh)
+ processor architecture. This should be sh (for arch/renesas)
CONFIG_ARCH_CHIP - Identifies the arch/*/chip subdirectory.
- This should be sh1 (for arch/sh/src/sh1 and arch/sh/include/sh1)
+ This should be sh1 (for arch/renesas/src/sh1 and arch/renesas/include/sh1)
CONFIG_ARCH_SH1 and CONFIG_ARCH_CHIP_SH7032 - for use in C code. These
identify the particular chip or SoC that the architecture is
implemented in.
diff --git a/configs/us7032evb1/nsh/defconfig b/configs/us7032evb1/nsh/defconfig
index e87a5da115d..321edd55698 100644
--- a/configs/us7032evb1/nsh/defconfig
+++ b/configs/us7032evb1/nsh/defconfig
@@ -59,7 +59,7 @@ CONFIG_ARCH_SH=y
# CONFIG_ARCH_X86 is not set
# CONFIG_ARCH_Z16 is not set
# CONFIG_ARCH_Z80 is not set
-CONFIG_ARCH="sh"
+CONFIG_ARCH="renesas"
CONFIG_ARCH_CHIP="sh1"
CONFIG_ARCH_CHIP_SH7032=y
# CONFIG_ARCH_CHIP_M30262F8 is not set
diff --git a/configs/us7032evb1/ostest/defconfig b/configs/us7032evb1/ostest/defconfig
index 0c8a86314e2..6f19a0b5a2e 100644
--- a/configs/us7032evb1/ostest/defconfig
+++ b/configs/us7032evb1/ostest/defconfig
@@ -59,7 +59,7 @@ CONFIG_ARCH_SH=y
# CONFIG_ARCH_X86 is not set
# CONFIG_ARCH_Z16 is not set
# CONFIG_ARCH_Z80 is not set
-CONFIG_ARCH="sh"
+CONFIG_ARCH="renesas"
CONFIG_ARCH_CHIP="sh1"
CONFIG_ARCH_CHIP_SH7032=y
# CONFIG_ARCH_CHIP_M30262F8 is not set