ARM: renesas: Rename arch-/mach-rmobile to arch-/mach-renesas

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>
2024-11-10 07:04:28 +00:00 · 2024-02-27 17:05:56 +01:00 · 2024-02-27 17:05:56 +01:00 · 40b9d53c74
commit 40b9d53c74
parent f9aabd4579
55 changed files with 37 additions and 37 deletions
--- a/2
+++ b/2
@ -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_*
--- a/2
+++ b/2
@ -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) \
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@ -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"

--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@ -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
--- a/arch/arm/mach-renesas/Kconfig
+++ b/arch/arm/mach-renesas/Kconfig
@ -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
--- a/arch/arm/mach-renesas/Kconfig.32
+++ b/arch/arm/mach-renesas/Kconfig.32
--- a/arch/arm/mach-renesas/Kconfig.64
+++ b/arch/arm/mach-renesas/Kconfig.64
@ -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
--- a/arch/arm/mach-renesas/Kconfig.rcar3
+++ b/arch/arm/mach-renesas/Kconfig.rcar3
--- a/arch/arm/mach-renesas/Kconfig.rcar4
+++ b/arch/arm/mach-renesas/Kconfig.rcar4
--- a/arch/arm/mach-renesas/Kconfig.rza1
+++ b/arch/arm/mach-renesas/Kconfig.rza1
--- a/arch/arm/mach-renesas/Kconfig.rzg2l
+++ b/arch/arm/mach-renesas/Kconfig.rzg2l
--- a/arch/arm/mach-renesas/Kconfig.rzn1
+++ b/arch/arm/mach-renesas/Kconfig.rzn1
--- a/arch/arm/mach-renesas/Makefile
+++ b/arch/arm/mach-renesas/Makefile
--- a/arch/arm/mach-renesas/board.c
+++ b/arch/arm/mach-renesas/board.c
--- a/arch/arm/mach-renesas/cpu_info-rcar.c
+++ b/arch/arm/mach-renesas/cpu_info-rcar.c
--- a/arch/arm/mach-renesas/cpu_info-rzg.c
+++ b/arch/arm/mach-renesas/cpu_info-rzg.c
--- a/arch/arm/mach-renesas/cpu_info-rzg2l.c
+++ b/arch/arm/mach-renesas/cpu_info-rzg2l.c
--- a/arch/arm/mach-renesas/cpu_info.c
+++ b/arch/arm/mach-renesas/cpu_info.c
--- a/arch/arm/mach-renesas/emac.c
+++ b/arch/arm/mach-renesas/emac.c
--- a/arch/arm/mach-renesas/include/mach/boot0.h
+++ b/arch/arm/mach-renesas/include/mach/boot0.h
--- a/arch/arm/mach-renesas/include/mach/gpio.h
+++ b/arch/arm/mach-renesas/include/mach/gpio.h
--- a/arch/arm/mach-renesas/include/mach/irqs.h
+++ b/arch/arm/mach-renesas/include/mach/irqs.h
--- a/arch/arm/mach-renesas/include/mach/r8a7790.h
+++ b/arch/arm/mach-renesas/include/mach/r8a7790.h
@ -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
 */
--- a/arch/arm/mach-renesas/include/mach/r8a7791.h
+++ b/arch/arm/mach-renesas/include/mach/r8a7791.h
@ -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
 */
--- a/arch/arm/mach-renesas/include/mach/r8a7792.h
+++ b/arch/arm/mach-renesas/include/mach/r8a7792.h
@ -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
 */
--- a/arch/arm/mach-renesas/include/mach/r8a7793.h
+++ b/arch/arm/mach-renesas/include/mach/r8a7793.h
@ -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
 */
--- a/arch/arm/mach-renesas/include/mach/r8a7794.h
+++ b/arch/arm/mach-renesas/include/mach/r8a7794.h
@ -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
 */
--- a/arch/arm/mach-renesas/include/mach/rcar-base.h
+++ b/arch/arm/mach-renesas/include/mach/rcar-base.h
@ -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
 */
--- a/arch/arm/mach-renesas/include/mach/rcar-gen3-base.h
+++ b/arch/arm/mach-renesas/include/mach/rcar-gen3-base.h
@ -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
 */
--- a/arch/arm/mach-renesas/include/mach/rcar-gen4-base.h
+++ b/arch/arm/mach-renesas/include/mach/rcar-gen4-base.h
@ -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.
 */
--- a/arch/arm/mach-renesas/include/mach/rcar-mstp.h
+++ b/arch/arm/mach-renesas/include/mach/rcar-mstp.h
@ -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
--- a/arch/arm/mach-renesas/include/mach/renesas.h
+++ b/arch/arm/mach-renesas/include/mach/renesas.h
--- a/arch/arm/mach-renesas/include/mach/rzg2l.h
+++ b/arch/arm/mach-renesas/include/mach/rzg2l.h
--- a/arch/arm/mach-renesas/include/mach/sys_proto.h
+++ b/arch/arm/mach-renesas/include/mach/sys_proto.h
--- a/arch/arm/mach-renesas/lowlevel_init_ca15.S
+++ b/arch/arm/mach-renesas/lowlevel_init_ca15.S
--- a/arch/arm/mach-renesas/lowlevel_init_gen3.S
+++ b/arch/arm/mach-renesas/lowlevel_init_gen3.S
--- a/arch/arm/mach-renesas/memmap-gen3.c
+++ b/arch/arm/mach-renesas/memmap-gen3.c
--- a/arch/arm/mach-renesas/memmap-rzg2l.c
+++ b/arch/arm/mach-renesas/memmap-rzg2l.c
--- a/arch/arm/mach-renesas/psci-r8a779a0.c
+++ b/arch/arm/mach-renesas/psci-r8a779a0.c
--- a/board/beacon/beacon-rzg2m/Kconfig
+++ b/board/beacon/beacon-rzg2m/Kconfig
@ -1,7 +1,7 @@
 if TARGET_BEACON_RZG2M

 config SYS_SOC
-	default "rmobile"
+	default "renesas"

 config SYS_BOARD
 	default "beacon-rzg2m"
--- a/board/hoperun/hihope-rzg2/Kconfig
+++ b/board/hoperun/hihope-rzg2/Kconfig
@ -1,7 +1,7 @@
 if TARGET_HIHOPE_RZG2

 config SYS_SOC
-	default "rmobile"
+	default "renesas"

 config SYS_BOARD
 	default "hihope-rzg2"
--- a/board/renesas/condor/Kconfig
+++ b/board/renesas/condor/Kconfig
@ -1,7 +1,7 @@
 if TARGET_CONDOR

 config SYS_SOC
-	default "rmobile"
+	default "renesas"

 config SYS_BOARD
 	default "condor"
--- a/board/renesas/draak/Kconfig
+++ b/board/renesas/draak/Kconfig
@ -1,7 +1,7 @@
 if TARGET_DRAAK

 config SYS_SOC
-	default "rmobile"
+	default "renesas"

 config SYS_BOARD
 	default "draak"
--- a/board/renesas/eagle/Kconfig
+++ b/board/renesas/eagle/Kconfig
@ -1,7 +1,7 @@
 if TARGET_EAGLE

 config SYS_SOC
-	default "rmobile"
+	default "renesas"

 config SYS_BOARD
 	default "eagle"
--- a/board/renesas/ebisu/Kconfig
+++ b/board/renesas/ebisu/Kconfig
@ -1,7 +1,7 @@
 if TARGET_EBISU

 config SYS_SOC
-	default "rmobile"
+	default "renesas"

 config SYS_BOARD
 	default "ebisu"
--- a/board/renesas/falcon/Kconfig
+++ b/board/renesas/falcon/Kconfig
@ -1,7 +1,7 @@
 if TARGET_FALCON

 config SYS_SOC
-	default "rmobile"
+	default "renesas"

 config SYS_BOARD
 	default "falcon"
--- a/board/renesas/grayhawk/Kconfig
+++ b/board/renesas/grayhawk/Kconfig
@ -1,7 +1,7 @@
 if TARGET_GRAYHAWK

 config SYS_SOC
-	default "rmobile"
+	default "renesas"

 config SYS_BOARD
 	default "grayhawk"
--- a/board/renesas/rzg2l/Kconfig
+++ b/board/renesas/rzg2l/Kconfig
@ -4,7 +4,7 @@
 if TARGET_RZG2L_SMARC_EVK

 config SYS_SOC
-	default "rmobile"
+	default "renesas"

 config SYS_BOARD
 	default "rzg2l"
--- a/board/renesas/salvator-x/Kconfig
+++ b/board/renesas/salvator-x/Kconfig
@ -1,7 +1,7 @@
 if TARGET_SALVATOR_X

 config SYS_SOC
-	default "rmobile"
+	default "renesas"

 config SYS_BOARD
 	default "salvator-x"
--- a/board/renesas/spider/Kconfig
+++ b/board/renesas/spider/Kconfig
@ -1,7 +1,7 @@
 if TARGET_SPIDER

 config SYS_SOC
-	default "rmobile"
+	default "renesas"

 config SYS_BOARD
 	default "spider"
--- a/board/renesas/ulcb/Kconfig
+++ b/board/renesas/ulcb/Kconfig
@ -1,7 +1,7 @@
 if TARGET_ULCB

 config SYS_SOC
-	default "rmobile"
+	default "renesas"

 config SYS_BOARD
 	default "ulcb"
--- a/board/renesas/v3hsk/Kconfig
+++ b/board/renesas/v3hsk/Kconfig
@ -1,7 +1,7 @@
 if TARGET_V3HSK

 config SYS_SOC
-	default "rmobile"
+	default "renesas"

 config SYS_BOARD
 	default "v3hsk"
--- a/board/renesas/v3msk/Kconfig
+++ b/board/renesas/v3msk/Kconfig
@ -1,7 +1,7 @@
 if TARGET_V3MSK

 config SYS_SOC
-	default "rmobile"
+	default "renesas"

 config SYS_BOARD
 	default "v3msk"
--- a/board/renesas/whitehawk/Kconfig
+++ b/board/renesas/whitehawk/Kconfig
@ -1,7 +1,7 @@
 if TARGET_WHITEHAWK

 config SYS_SOC
-	default "rmobile"
+	default "renesas"

 config SYS_BOARD
 	default "whitehawk"
--- a/board/silinux/ek874/Kconfig
+++ b/board/silinux/ek874/Kconfig
@ -1,7 +1,7 @@
 if TARGET_SILINUX_EK874

 config SYS_SOC
-	default "rmobile"
+	default "renesas"

 config SYS_BOARD
 	default "ek874"