ARM: renesas: Rename ARCH_RMOBILE to ARCH_RENESAS
Rename ARCH_RMOBILE to ARCH_RENESAS because all the chips are made
by Renesas, while only a subset of them is from the R-Mobile
line.
Use the following command to perform the rename:
"
$ git grep -l 'ARCH_RMOBILE' | xargs -I {} sed -i 's@ARCH_RMOBILE@ARCH_RENESAS@g' {}
"
Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
Reviewed-by: Paul Barker <paul.barker.ct@bp.renesas.com>
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index fde85dc..dbd7e01 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1071,7 +1071,7 @@
imply USB_KEYBOARD
imply CMD_USB
-config ARCH_RMOBILE
+config ARCH_RENESAS
bool "Renesas ARM SoCs"
select DM
select DM_SERIAL
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 5ebe061..d7ca871 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -75,7 +75,7 @@
machine-$(CONFIG_ARCH_OMAP2PLUS) += omap2
machine-$(CONFIG_ARCH_ORION5X) += orion5x
machine-$(CONFIG_ARCH_OWL) += owl
-machine-$(CONFIG_ARCH_RMOBILE) += rmobile
+machine-$(CONFIG_ARCH_RENESAS) += rmobile
machine-$(CONFIG_ARCH_ROCKCHIP) += rockchip
machine-$(CONFIG_ARCH_S5PC1XX) += s5pc1xx
machine-$(CONFIG_ARCH_SNAPDRAGON) += snapdragon
diff --git a/arch/arm/mach-rmobile/Kconfig b/arch/arm/mach-rmobile/Kconfig
index 2bb9674..c1db953 100644
--- a/arch/arm/mach-rmobile/Kconfig
+++ b/arch/arm/mach-rmobile/Kconfig
@@ -1,4 +1,4 @@
-if ARCH_RMOBILE
+if ARCH_RENESAS
# Renesas ARM SoCs R-Car Gen3/Gen4 (64bit)
config RCAR_64
@@ -88,7 +88,7 @@
endchoice
config SYS_SOC
- default "rmobile" if ARCH_RMOBILE
+ default "rmobile" if ARCH_RENESAS
source "arch/arm/mach-rmobile/Kconfig.32"
source "arch/arm/mach-rmobile/Kconfig.64"
diff --git a/arch/arm/mach-rmobile/include/mach/renesas.h b/arch/arm/mach-rmobile/include/mach/renesas.h
index 67c4800..c69c764 100644
--- a/arch/arm/mach-rmobile/include/mach/renesas.h
+++ b/arch/arm/mach-rmobile/include/mach/renesas.h
@@ -1,7 +1,7 @@
-#ifndef __ASM_ARCH_RMOBILE_H
-#define __ASM_ARCH_RMOBILE_H
+#ifndef __ASM_ARCH_RENESAS_H
+#define __ASM_ARCH_RENESAS_H
-#if defined(CONFIG_ARCH_RMOBILE)
+#if defined(CONFIG_ARCH_RENESAS)
#if defined(CONFIG_R8A7790)
#include <asm/arch/r8a7790.h>
#elif defined(CONFIG_R8A7791)
@@ -22,7 +22,7 @@
#else
#error "SOC Name not defined"
#endif
-#endif /* CONFIG_ARCH_RMOBILE */
+#endif /* CONFIG_ARCH_RENESAS */
/* PRR CPU IDs */
#define RENESAS_CPU_TYPE_R8A7740 0x40
@@ -53,4 +53,4 @@
u32 renesas_get_cpu_rev_fraction(void);
#endif /* __ASSEMBLY__ */
-#endif /* __ASM_ARCH_RMOBILE_H */
+#endif /* __ASM_ARCH_RENESAS_H */
diff --git a/arch/sh/lib/time.c b/arch/sh/lib/time.c
index 366500d..19c8e3c 100644
--- a/arch/sh/lib/time.c
+++ b/arch/sh/lib/time.c
@@ -16,7 +16,7 @@
#include <asm/io.h>
#include <linux/bitops.h>
-#if defined(CONFIG_CPU_SH4) || defined(CONFIG_ARCH_RMOBILE)
+#if defined(CONFIG_CPU_SH4) || defined(CONFIG_ARCH_RENESAS)
#define TSTR 0x4
#define TCR0 0x10
#endif /* CONFIG_CPU_SH4 */