ARM: renesas: Rename arch-/mach-rmobile to arch-/mach-renesas
authorMarek Vasut <marek.vasut+renesas@mailbox.org>
Tue, 27 Feb 2024 16:05:56 +0000 (17:05 +0100)
committerTom Rini <trini@konsulko.com>
Sat, 2 Mar 2024 19:29:36 +0000 (14:29 -0500)
Rename arch-rmobile to arch-renesas and mach-rmobile to mach-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, with manual move of
the directories using git mv and manual fix up to arch/arm/Makefile:

"
$ git grep -l '\<\(arch\|mach\)-rmobile\>' | \
  xargs -I {} sed -i 's@\<\(arch\|mach\)-rmobile\>@\1-renesas@g' {}
$ sed -i 's@rmobile@renesas@' board/*/*/Kconfig
"

Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
Reviewed-by: Paul Barker <paul.barker.ct@bp.renesas.com>
55 files changed:
MAINTAINERS
Makefile
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/mach-renesas/Kconfig [moved from arch/arm/mach-rmobile/Kconfig with 88% similarity]
arch/arm/mach-renesas/Kconfig.32 [moved from arch/arm/mach-rmobile/Kconfig.32 with 100% similarity]
arch/arm/mach-renesas/Kconfig.64 [moved from arch/arm/mach-rmobile/Kconfig.64 with 56% similarity]
arch/arm/mach-renesas/Kconfig.rcar3 [moved from arch/arm/mach-rmobile/Kconfig.rcar3 with 100% similarity]
arch/arm/mach-renesas/Kconfig.rcar4 [moved from arch/arm/mach-rmobile/Kconfig.rcar4 with 100% similarity]
arch/arm/mach-renesas/Kconfig.rza1 [moved from arch/arm/mach-rmobile/Kconfig.rza1 with 100% similarity]
arch/arm/mach-renesas/Kconfig.rzg2l [moved from arch/arm/mach-rmobile/Kconfig.rzg2l with 100% similarity]
arch/arm/mach-renesas/Kconfig.rzn1 [moved from arch/arm/mach-rmobile/Kconfig.rzn1 with 100% similarity]
arch/arm/mach-renesas/Makefile [moved from arch/arm/mach-rmobile/Makefile with 100% similarity]
arch/arm/mach-renesas/board.c [moved from arch/arm/mach-rmobile/board.c with 100% similarity]
arch/arm/mach-renesas/cpu_info-rcar.c [moved from arch/arm/mach-rmobile/cpu_info-rcar.c with 100% similarity]
arch/arm/mach-renesas/cpu_info-rzg.c [moved from arch/arm/mach-rmobile/cpu_info-rzg.c with 100% similarity]
arch/arm/mach-renesas/cpu_info-rzg2l.c [moved from arch/arm/mach-rmobile/cpu_info-rzg2l.c with 100% similarity]
arch/arm/mach-renesas/cpu_info.c [moved from arch/arm/mach-rmobile/cpu_info.c with 100% similarity]
arch/arm/mach-renesas/emac.c [moved from arch/arm/mach-rmobile/emac.c with 100% similarity]
arch/arm/mach-renesas/include/mach/boot0.h [moved from arch/arm/mach-rmobile/include/mach/boot0.h with 100% similarity]
arch/arm/mach-renesas/include/mach/gpio.h [moved from arch/arm/mach-rmobile/include/mach/gpio.h with 100% similarity]
arch/arm/mach-renesas/include/mach/irqs.h [moved from arch/arm/mach-rmobile/include/mach/irqs.h with 100% similarity]
arch/arm/mach-renesas/include/mach/r8a7790.h [moved from arch/arm/mach-rmobile/include/mach/r8a7790.h with 94% similarity]
arch/arm/mach-renesas/include/mach/r8a7791.h [moved from arch/arm/mach-rmobile/include/mach/r8a7791.h with 97% similarity]
arch/arm/mach-renesas/include/mach/r8a7792.h [moved from arch/arm/mach-rmobile/include/mach/r8a7792.h with 93% similarity]
arch/arm/mach-renesas/include/mach/r8a7793.h [moved from arch/arm/mach-rmobile/include/mach/r8a7793.h with 97% similarity]
arch/arm/mach-renesas/include/mach/r8a7794.h [moved from arch/arm/mach-rmobile/include/mach/r8a7794.h with 94% similarity]
arch/arm/mach-renesas/include/mach/rcar-base.h [moved from arch/arm/mach-rmobile/include/mach/rcar-base.h with 99% similarity]
arch/arm/mach-renesas/include/mach/rcar-gen3-base.h [moved from arch/arm/mach-rmobile/include/mach/rcar-gen3-base.h with 97% similarity]
arch/arm/mach-renesas/include/mach/rcar-gen4-base.h [moved from arch/arm/mach-rmobile/include/mach/rcar-gen4-base.h with 96% similarity]
arch/arm/mach-renesas/include/mach/rcar-mstp.h [moved from arch/arm/mach-rmobile/include/mach/rcar-mstp.h with 97% similarity]
arch/arm/mach-renesas/include/mach/renesas.h [moved from arch/arm/mach-rmobile/include/mach/renesas.h with 100% similarity]
arch/arm/mach-renesas/include/mach/rzg2l.h [moved from arch/arm/mach-rmobile/include/mach/rzg2l.h with 100% similarity]
arch/arm/mach-renesas/include/mach/sys_proto.h [moved from arch/arm/mach-rmobile/include/mach/sys_proto.h with 100% similarity]
arch/arm/mach-renesas/lowlevel_init_ca15.S [moved from arch/arm/mach-rmobile/lowlevel_init_ca15.S with 100% similarity]
arch/arm/mach-renesas/lowlevel_init_gen3.S [moved from arch/arm/mach-rmobile/lowlevel_init_gen3.S with 100% similarity]
arch/arm/mach-renesas/memmap-gen3.c [moved from arch/arm/mach-rmobile/memmap-gen3.c with 100% similarity]
arch/arm/mach-renesas/memmap-rzg2l.c [moved from arch/arm/mach-rmobile/memmap-rzg2l.c with 100% similarity]
arch/arm/mach-renesas/psci-r8a779a0.c [moved from arch/arm/mach-rmobile/psci-r8a779a0.c with 100% similarity]
board/beacon/beacon-rzg2m/Kconfig
board/hoperun/hihope-rzg2/Kconfig
board/renesas/condor/Kconfig
board/renesas/draak/Kconfig
board/renesas/eagle/Kconfig
board/renesas/ebisu/Kconfig
board/renesas/falcon/Kconfig
board/renesas/grayhawk/Kconfig
board/renesas/rzg2l/Kconfig
board/renesas/salvator-x/Kconfig
board/renesas/spider/Kconfig
board/renesas/ulcb/Kconfig
board/renesas/v3hsk/Kconfig
board/renesas/v3msk/Kconfig
board/renesas/whitehawk/Kconfig
board/silinux/ek874/Kconfig

index 0b08ca1..cd9b2d4 100644 (file)
@@ -497,7 +497,7 @@ M:  Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
 M:     Marek Vasut <marek.vasut+renesas@mailbox.org>
 S:     Maintained
 T:     git https://source.denx.de/u-boot/custodians/u-boot-sh.git
-F:     arch/arm/mach-rmobile/
+F:     arch/arm/mach-renesas/
 F:     drivers/clk/renesas/
 F:     drivers/gpio/gpio-rcar.c
 F:     drivers/i2c/rcar_*
index 3b5db90..f308d78 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1266,7 +1266,7 @@ spl/u-boot-spl.srec: spl/u-boot-spl FORCE
        $(call if_changed,objcopy)
 
 %.scif: %.srec
-       $(Q)$(MAKE) $(build)=arch/arm/mach-rmobile $@
+       $(Q)$(MAKE) $(build)=arch/arm/mach-renesas $@
 
 OBJCOPYFLAGS_u-boot-nodtb.bin := -O binary \
                $(if $(CONFIG_X86_16BIT_INIT),-R .start16 -R .resetvec) \
index dbd7e01..01d6556 100644 (file)
@@ -2269,7 +2269,7 @@ source "arch/arm/mach-orion5x/Kconfig"
 
 source "arch/arm/mach-owl/Kconfig"
 
-source "arch/arm/mach-rmobile/Kconfig"
+source "arch/arm/mach-renesas/Kconfig"
 
 source "arch/arm/mach-meson/Kconfig"
 
index d7ca871..a4266a3 100644 (file)
@@ -75,7 +75,7 @@ machine-$(CONFIG_ARCH_NPCM)             += npcm
 machine-$(CONFIG_ARCH_OMAP2PLUS)       += omap2
 machine-$(CONFIG_ARCH_ORION5X)         += orion5x
 machine-$(CONFIG_ARCH_OWL)             += owl
-machine-$(CONFIG_ARCH_RENESAS)         += rmobile
+machine-$(CONFIG_ARCH_RENESAS)         += renesas
 machine-$(CONFIG_ARCH_ROCKCHIP)                += rockchip
 machine-$(CONFIG_ARCH_S5PC1XX)         += s5pc1xx
 machine-$(CONFIG_ARCH_SNAPDRAGON)      += snapdragon
similarity index 88%
rename from arch/arm/mach-rmobile/Kconfig
rename to arch/arm/mach-renesas/Kconfig
index c1db953..5aacc6f 100644 (file)
@@ -88,12 +88,12 @@ config RZG2L
 endchoice
 
 config SYS_SOC
-       default "rmobile" if ARCH_RENESAS
+       default "renesas" if ARCH_RENESAS
 
-source "arch/arm/mach-rmobile/Kconfig.32"
-source "arch/arm/mach-rmobile/Kconfig.64"
-source "arch/arm/mach-rmobile/Kconfig.rza1"
-source "arch/arm/mach-rmobile/Kconfig.rzn1"
-source "arch/arm/mach-rmobile/Kconfig.rzg2l"
+source "arch/arm/mach-renesas/Kconfig.32"
+source "arch/arm/mach-renesas/Kconfig.64"
+source "arch/arm/mach-renesas/Kconfig.rza1"
+source "arch/arm/mach-renesas/Kconfig.rzn1"
+source "arch/arm/mach-renesas/Kconfig.rzg2l"
 
 endif
similarity index 56%
rename from arch/arm/mach-rmobile/Kconfig.64
rename to arch/arm/mach-renesas/Kconfig.64
index 57ed1d6..b5067d0 100644 (file)
@@ -6,7 +6,7 @@ config SYS_MALLOC_F_LEN
 config OF_LIBFDT_OVERLAY
        default y if RCAR_64
 
-source "arch/arm/mach-rmobile/Kconfig.rcar3"
-source "arch/arm/mach-rmobile/Kconfig.rcar4"
+source "arch/arm/mach-renesas/Kconfig.rcar3"
+source "arch/arm/mach-renesas/Kconfig.rcar4"
 
 endif
similarity index 94%
rename from arch/arm/mach-rmobile/include/mach/r8a7790.h
rename to arch/arm/mach-renesas/include/mach/r8a7790.h
index 233531c..61101df 100644 (file)
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0 */
 /*
- * arch/arm/include/asm/arch-rmobile/r8a7790.h
+ * arch/arm/include/asm/arch-renesas/r8a7790.h
  *
  * Copyright (C) 2013,2014 Renesas Electronics Corporation
  */
similarity index 97%
rename from arch/arm/mach-rmobile/include/mach/r8a7791.h
rename to arch/arm/mach-renesas/include/mach/r8a7791.h
index 78a910c..40524d7 100644 (file)
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0 */
 /*
- * arch/arm/include/asm/arch-rmobile/r8a7791.h
+ * arch/arm/include/asm/arch-renesas/r8a7791.h
  *
  * Copyright (C) 2013,2014 Renesas Electronics Corporation
  */
similarity index 93%
rename from arch/arm/mach-rmobile/include/mach/r8a7792.h
rename to arch/arm/mach-renesas/include/mach/r8a7792.h
index cc1b00d..51c0d63 100644 (file)
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0 */
 /*
- * arch/arm/include/asm/arch-rmobile/r8a7792.h
+ * arch/arm/include/asm/arch-renesas/r8a7792.h
  *
  * Copyright (C) 2016 Renesas Electronics Corporation
  */
similarity index 97%
rename from arch/arm/mach-rmobile/include/mach/r8a7793.h
rename to arch/arm/mach-renesas/include/mach/r8a7793.h
index 4cb0647..f15f823 100644 (file)
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0 */
 /*
- * arch/arm/include/asm/arch-rmobile/r8a7793.h
+ * arch/arm/include/asm/arch-renesas/r8a7793.h
  *
  * Copyright (C) 2014 Renesas Electronics Corporation
  */
similarity index 94%
rename from arch/arm/mach-rmobile/include/mach/r8a7794.h
rename to arch/arm/mach-renesas/include/mach/r8a7794.h
index 6d0d729..592625e 100644 (file)
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0 */
 /*
- * arch/arm/include/asm/arch-rmobile/r8a7794.h
+ * arch/arm/include/asm/arch-renesas/r8a7794.h
  *
  * Copyright (C) 2014 Renesas Electronics Corporation
  */
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0 */
 /*
- * arch/arm/include/asm/arch-rmobile/rcar-base.h
+ * arch/arm/include/asm/arch-renesas/rcar-base.h
  *
  * Copyright (C) 2013,2014 Renesas Electronics Corporation
  */
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * ./arch/arm/mach-rmobile/include/mach/rcar-gen3-base.h
+ * ./arch/arm/mach-renesas/include/mach/rcar-gen3-base.h
  *
  * Copyright (C) 2015 Renesas Electronics Corporation
  */
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0+ */
 /*
- * ./arch/arm/mach-rmobile/include/mach/rcar-gen4-base.h
+ * ./arch/arm/mach-renesas/include/mach/rcar-gen4-base.h
  *
  * Copyright (C) 2021 Renesas Electronics Corp.
  */
@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0 */
 /*
- * arch/arm/include/asm/arch-rmobile/rcar-mstp.h
+ * arch/arm/include/asm/arch-renesas/rcar-mstp.h
  *
  * Copyright (C) 2013, 2014 Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
  * Copyright (C) 2013, 2014 Renesas Electronics Corporation
index c03857c..1eb9e0d 100644 (file)
@@ -1,7 +1,7 @@
 if TARGET_BEACON_RZG2M
 
 config SYS_SOC
-       default "rmobile"
+       default "renesas"
 
 config SYS_BOARD
        default "beacon-rzg2m"
index ee422ba..e15b54a 100644 (file)
@@ -1,7 +1,7 @@
 if TARGET_HIHOPE_RZG2
 
 config SYS_SOC
-       default "rmobile"
+       default "renesas"
 
 config SYS_BOARD
        default "hihope-rzg2"
index 2286d88..fbfb12c 100644 (file)
@@ -1,7 +1,7 @@
 if TARGET_CONDOR
 
 config SYS_SOC
-       default "rmobile"
+       default "renesas"
 
 config SYS_BOARD
        default "condor"
index 9106387..8f3d904 100644 (file)
@@ -1,7 +1,7 @@
 if TARGET_DRAAK
 
 config SYS_SOC
-       default "rmobile"
+       default "renesas"
 
 config SYS_BOARD
        default "draak"
index 4d12843..04895d2 100644 (file)
@@ -1,7 +1,7 @@
 if TARGET_EAGLE
 
 config SYS_SOC
-       default "rmobile"
+       default "renesas"
 
 config SYS_BOARD
        default "eagle"
index f500a94..a9049b6 100644 (file)
@@ -1,7 +1,7 @@
 if TARGET_EBISU
 
 config SYS_SOC
-       default "rmobile"
+       default "renesas"
 
 config SYS_BOARD
        default "ebisu"
index 1fcefa7..44a2e56 100644 (file)
@@ -1,7 +1,7 @@
 if TARGET_FALCON
 
 config SYS_SOC
-       default "rmobile"
+       default "renesas"
 
 config SYS_BOARD
        default "falcon"
index 97621a3..a6dbfb5 100644 (file)
@@ -1,7 +1,7 @@
 if TARGET_GRAYHAWK
 
 config SYS_SOC
-       default "rmobile"
+       default "renesas"
 
 config SYS_BOARD
        default "grayhawk"
index 1335fc7..c7b7570 100644 (file)
@@ -4,7 +4,7 @@
 if TARGET_RZG2L_SMARC_EVK
 
 config SYS_SOC
-       default "rmobile"
+       default "renesas"
 
 config SYS_BOARD
        default "rzg2l"
index ed4c479..52955e1 100644 (file)
@@ -1,7 +1,7 @@
 if TARGET_SALVATOR_X
 
 config SYS_SOC
-       default "rmobile"
+       default "renesas"
 
 config SYS_BOARD
        default "salvator-x"
index 8df2e85..bd5825e 100644 (file)
@@ -1,7 +1,7 @@
 if TARGET_SPIDER
 
 config SYS_SOC
-       default "rmobile"
+       default "renesas"
 
 config SYS_BOARD
        default "spider"
index 1e9a10d..3186036 100644 (file)
@@ -1,7 +1,7 @@
 if TARGET_ULCB
 
 config SYS_SOC
-       default "rmobile"
+       default "renesas"
 
 config SYS_BOARD
        default "ulcb"
index 531ceb7..da595a4 100644 (file)
@@ -1,7 +1,7 @@
 if TARGET_V3HSK
 
 config SYS_SOC
-       default "rmobile"
+       default "renesas"
 
 config SYS_BOARD
        default "v3hsk"
index fe037fd..8f42386 100644 (file)
@@ -1,7 +1,7 @@
 if TARGET_V3MSK
 
 config SYS_SOC
-       default "rmobile"
+       default "renesas"
 
 config SYS_BOARD
        default "v3msk"
index 05a8789..8adb24c 100644 (file)
@@ -1,7 +1,7 @@
 if TARGET_WHITEHAWK
 
 config SYS_SOC
-       default "rmobile"
+       default "renesas"
 
 config SYS_BOARD
        default "whitehawk"
index 60b390a..5b34087 100644 (file)
@@ -1,7 +1,7 @@
 if TARGET_SILINUX_EK874
 
 config SYS_SOC
-       default "rmobile"
+       default "renesas"
 
 config SYS_BOARD
        default "ek874"