]> git.ipfire.org Git - thirdparty/u-boot.git/commitdiff
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 0b08ca192397b48f0f08d81aa49428c3bd0a0b16..cd9b2d42e834746f03237f54b628fe057ffe7751 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 3b5db90df6f9b231c33a843b3a6de3043141f35d..f308d7884dd40a15629bcec9549fc05ea6cf3b1d 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 dbd7e014245bbce73499f0cc718d9b7593c1080d..01d6556c42b6f613acbe5bf5179435b8e73b35ec 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 d7ca8715a3f4db0c68609b6d35a866defd5e7bfa..a4266a3e3668c5fe9b9bfdd16b30b63f762ba020 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 c1db9531a3c92abc53f77096707efd672cfc085a..5aacc6f58f30d22425ee5ba2c70f95b85a205d76 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 57ed1d6c50d7857ad9b2dacd506fb9eac72e9fc9..b5067d0a8f035b28510935e9900713732ea3810a 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 233531cb4ab745dddf29e2c477b784e4ce40371c..61101df3f1ad9a67ccd80dc644749ddf75d415ed 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 78a910cfdd2ad1f7f9b0833388b4b3a9b12fd901..40524d77d8410a66f2c0849c3d5ef5935ac45b39 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 cc1b00db33f5471a83dc2e28a9c8902d2fc78920..51c0d63eefb9b7260a7f845d27cff51006c90d9a 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 4cb064731ca040124f0dc072e1c6e3fd0ad0a9c5..f15f8236059ac2f3488d626c5e05b83d800c0a62 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 6d0d729bb1252577d97b536a32c9a04338faf8f7..592625e6e9a9ac1025ada1041b4172a76eb022eb 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
  */
similarity index 99%
rename from arch/arm/mach-rmobile/include/mach/rcar-base.h
rename to arch/arm/mach-renesas/include/mach/rcar-base.h
index e422e9100a8b6b31133aadd735307d7e32b82d96..4c2ee8187e0360fbe27f25c1c8b3cac9af03151c 100644 (file)
@@ -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
  */
similarity index 97%
rename from arch/arm/mach-rmobile/include/mach/rcar-gen3-base.h
rename to arch/arm/mach-renesas/include/mach/rcar-gen3-base.h
index ca1274272d34ff07d09f58cdb8895b973e980efe..5e2e9eca452913ad37f41cae782889817bfea15f 100644 (file)
@@ -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
  */
similarity index 96%
rename from arch/arm/mach-rmobile/include/mach/rcar-gen4-base.h
rename to arch/arm/mach-renesas/include/mach/rcar-gen4-base.h
index ac57698849ae3594011df96d523df51044312fc2..f34473db35ace0d8725883173d5417510a1da21c 100644 (file)
@@ -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.
  */
similarity index 97%
rename from arch/arm/mach-rmobile/include/mach/rcar-mstp.h
rename to arch/arm/mach-renesas/include/mach/rcar-mstp.h
index d241652641fbed6172b9f3eef2b676eaa64c70d5..7ca362e519c5adb4c3d402913173bd18e7e9f5fa 100644 (file)
@@ -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 c03857cf2fe06b239b114b884bd7bb59191d4629..1eb9e0dda9497c433b84a934b3e01190e5c01726 100644 (file)
@@ -1,7 +1,7 @@
 if TARGET_BEACON_RZG2M
 
 config SYS_SOC
-       default "rmobile"
+       default "renesas"
 
 config SYS_BOARD
        default "beacon-rzg2m"
index ee422ba6c8fa435fc67f3161ce33a530f03bdf74..e15b54ae5ced3d96a8bbdca163e299c5b4a6c616 100644 (file)
@@ -1,7 +1,7 @@
 if TARGET_HIHOPE_RZG2
 
 config SYS_SOC
-       default "rmobile"
+       default "renesas"
 
 config SYS_BOARD
        default "hihope-rzg2"
index 2286d88de7f155b1e8566ba7424548acb7f0b5ad..fbfb12cc4f9291607997c917d8ab8ea3701cd306 100644 (file)
@@ -1,7 +1,7 @@
 if TARGET_CONDOR
 
 config SYS_SOC
-       default "rmobile"
+       default "renesas"
 
 config SYS_BOARD
        default "condor"
index 9106387bb99d2a078f53525e15209afb4c3b6bac..8f3d904f9d7764e135f8e6cd89e7521842c90243 100644 (file)
@@ -1,7 +1,7 @@
 if TARGET_DRAAK
 
 config SYS_SOC
-       default "rmobile"
+       default "renesas"
 
 config SYS_BOARD
        default "draak"
index 4d12843b4e9f2cce34056c675052a8bc0f1b5278..04895d2bb4b77b394510802b4adbb48f63257323 100644 (file)
@@ -1,7 +1,7 @@
 if TARGET_EAGLE
 
 config SYS_SOC
-       default "rmobile"
+       default "renesas"
 
 config SYS_BOARD
        default "eagle"
index f500a94c9a306993988d72c1d82a335d8b1020d0..a9049b6d5addaa6b63005635a32bb9ce7b4dfcdf 100644 (file)
@@ -1,7 +1,7 @@
 if TARGET_EBISU
 
 config SYS_SOC
-       default "rmobile"
+       default "renesas"
 
 config SYS_BOARD
        default "ebisu"
index 1fcefa7e3cd92c7c50334ef179bf4feba2791f24..44a2e5651ae73b47c3e785aa5e8d06aef55ecd0a 100644 (file)
@@ -1,7 +1,7 @@
 if TARGET_FALCON
 
 config SYS_SOC
-       default "rmobile"
+       default "renesas"
 
 config SYS_BOARD
        default "falcon"
index 97621a30ad0e5a10b67c1ad63eff725e6ef824c4..a6dbfb50e73f89d542d2c24ab44f56ffdb2bc1e1 100644 (file)
@@ -1,7 +1,7 @@
 if TARGET_GRAYHAWK
 
 config SYS_SOC
-       default "rmobile"
+       default "renesas"
 
 config SYS_BOARD
        default "grayhawk"
index 1335fc7ae8069638ac5c1eca58ec85a955fbb7b3..c7b75704bebea4e9673027f1187ca81beff2a067 100644 (file)
@@ -4,7 +4,7 @@
 if TARGET_RZG2L_SMARC_EVK
 
 config SYS_SOC
-       default "rmobile"
+       default "renesas"
 
 config SYS_BOARD
        default "rzg2l"
index ed4c479f7cad1412c41ab0a51d29994848961595..52955e144a6d32ac47acf9191ad8f5167bf9a3e7 100644 (file)
@@ -1,7 +1,7 @@
 if TARGET_SALVATOR_X
 
 config SYS_SOC
-       default "rmobile"
+       default "renesas"
 
 config SYS_BOARD
        default "salvator-x"
index 8df2e85fc9c1279b04ef704343f370bcb7371881..bd5825ef56cb428e36fe0c6458d6b1951e1194ac 100644 (file)
@@ -1,7 +1,7 @@
 if TARGET_SPIDER
 
 config SYS_SOC
-       default "rmobile"
+       default "renesas"
 
 config SYS_BOARD
        default "spider"
index 1e9a10d28149a98c44135ec8e1cc7c1b408bd170..318603608cea3cfac06d9abf448cd390d8d18935 100644 (file)
@@ -1,7 +1,7 @@
 if TARGET_ULCB
 
 config SYS_SOC
-       default "rmobile"
+       default "renesas"
 
 config SYS_BOARD
        default "ulcb"
index 531ceb788f44e29097d6ef08d06f5a37752112bb..da595a493b52fe151bd910054babd106d91ef1ad 100644 (file)
@@ -1,7 +1,7 @@
 if TARGET_V3HSK
 
 config SYS_SOC
-       default "rmobile"
+       default "renesas"
 
 config SYS_BOARD
        default "v3hsk"
index fe037fd98f00b2f75fb4fa700dc5fc5c74efaad3..8f423868962b7a123c1097b9ec2ccfc45be5b8a3 100644 (file)
@@ -1,7 +1,7 @@
 if TARGET_V3MSK
 
 config SYS_SOC
-       default "rmobile"
+       default "renesas"
 
 config SYS_BOARD
        default "v3msk"
index 05a87894fac187e73b4fc59172fd90be3e0653a0..8adb24c2d2e7e3d3317b59abf23c989303f1694d 100644 (file)
@@ -1,7 +1,7 @@
 if TARGET_WHITEHAWK
 
 config SYS_SOC
-       default "rmobile"
+       default "renesas"
 
 config SYS_BOARD
        default "whitehawk"
index 60b390a121ea5dc965ad7b94b4efcbff7f73c687..5b34087bff84f79e83274db1df88ac2d157bedd2 100644 (file)
@@ -1,7 +1,7 @@
 if TARGET_SILINUX_EK874
 
 config SYS_SOC
-       default "rmobile"
+       default "renesas"
 
 config SYS_BOARD
        default "ek874"