diff options
author | Marek Vasut <marek.vasut+renesas@mailbox.org> | 2024-02-27 17:05:56 +0100 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2024-03-02 14:29:36 -0500 |
commit | 40b9d53c7402c2ceac03c4c2af77a025ce11a0ca (patch) | |
tree | 0b44b5aff4e364837093910bb38102d53c18d4ec /arch/arm | |
parent | f9aabd457930f5569297f8a0c4449b9768c1e0cf (diff) | |
download | u-boot-40b9d53c7402c2ceac03c4c2af77a025ce11a0ca.zip u-boot-40b9d53c7402c2ceac03c4c2af77a025ce11a0ca.tar.gz u-boot-40b9d53c7402c2ceac03c4c2af77a025ce11a0ca.tar.bz2 |
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>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/Kconfig | 2 | ||||
-rw-r--r-- | arch/arm/Makefile | 2 | ||||
-rw-r--r-- | arch/arm/mach-renesas/Kconfig (renamed from arch/arm/mach-rmobile/Kconfig) | 12 | ||||
-rw-r--r-- | arch/arm/mach-renesas/Kconfig.32 (renamed from arch/arm/mach-rmobile/Kconfig.32) | 0 | ||||
-rw-r--r-- | arch/arm/mach-renesas/Kconfig.64 (renamed from arch/arm/mach-rmobile/Kconfig.64) | 4 | ||||
-rw-r--r-- | arch/arm/mach-renesas/Kconfig.rcar3 (renamed from arch/arm/mach-rmobile/Kconfig.rcar3) | 0 | ||||
-rw-r--r-- | arch/arm/mach-renesas/Kconfig.rcar4 (renamed from arch/arm/mach-rmobile/Kconfig.rcar4) | 0 | ||||
-rw-r--r-- | arch/arm/mach-renesas/Kconfig.rza1 (renamed from arch/arm/mach-rmobile/Kconfig.rza1) | 0 | ||||
-rw-r--r-- | arch/arm/mach-renesas/Kconfig.rzg2l (renamed from arch/arm/mach-rmobile/Kconfig.rzg2l) | 0 | ||||
-rw-r--r-- | arch/arm/mach-renesas/Kconfig.rzn1 (renamed from arch/arm/mach-rmobile/Kconfig.rzn1) | 0 | ||||
-rw-r--r-- | arch/arm/mach-renesas/Makefile (renamed from arch/arm/mach-rmobile/Makefile) | 0 | ||||
-rw-r--r-- | arch/arm/mach-renesas/board.c (renamed from arch/arm/mach-rmobile/board.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-renesas/cpu_info-rcar.c (renamed from arch/arm/mach-rmobile/cpu_info-rcar.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-renesas/cpu_info-rzg.c (renamed from arch/arm/mach-rmobile/cpu_info-rzg.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-renesas/cpu_info-rzg2l.c (renamed from arch/arm/mach-rmobile/cpu_info-rzg2l.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-renesas/cpu_info.c (renamed from arch/arm/mach-rmobile/cpu_info.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-renesas/emac.c (renamed from arch/arm/mach-rmobile/emac.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-renesas/include/mach/boot0.h (renamed from arch/arm/mach-rmobile/include/mach/boot0.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-renesas/include/mach/gpio.h (renamed from arch/arm/mach-rmobile/include/mach/gpio.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-renesas/include/mach/irqs.h (renamed from arch/arm/mach-rmobile/include/mach/irqs.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-renesas/include/mach/r8a7790.h (renamed from arch/arm/mach-rmobile/include/mach/r8a7790.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-renesas/include/mach/r8a7791.h (renamed from arch/arm/mach-rmobile/include/mach/r8a7791.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-renesas/include/mach/r8a7792.h (renamed from arch/arm/mach-rmobile/include/mach/r8a7792.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-renesas/include/mach/r8a7793.h (renamed from arch/arm/mach-rmobile/include/mach/r8a7793.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-renesas/include/mach/r8a7794.h (renamed from arch/arm/mach-rmobile/include/mach/r8a7794.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-renesas/include/mach/rcar-base.h (renamed from arch/arm/mach-rmobile/include/mach/rcar-base.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-renesas/include/mach/rcar-gen3-base.h (renamed from arch/arm/mach-rmobile/include/mach/rcar-gen3-base.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-renesas/include/mach/rcar-gen4-base.h (renamed from arch/arm/mach-rmobile/include/mach/rcar-gen4-base.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-renesas/include/mach/rcar-mstp.h (renamed from arch/arm/mach-rmobile/include/mach/rcar-mstp.h) | 2 | ||||
-rw-r--r-- | arch/arm/mach-renesas/include/mach/renesas.h (renamed from arch/arm/mach-rmobile/include/mach/renesas.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-renesas/include/mach/rzg2l.h (renamed from arch/arm/mach-rmobile/include/mach/rzg2l.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-renesas/include/mach/sys_proto.h (renamed from arch/arm/mach-rmobile/include/mach/sys_proto.h) | 0 | ||||
-rw-r--r-- | arch/arm/mach-renesas/lowlevel_init_ca15.S (renamed from arch/arm/mach-rmobile/lowlevel_init_ca15.S) | 0 | ||||
-rw-r--r-- | arch/arm/mach-renesas/lowlevel_init_gen3.S (renamed from arch/arm/mach-rmobile/lowlevel_init_gen3.S) | 0 | ||||
-rw-r--r-- | arch/arm/mach-renesas/memmap-gen3.c (renamed from arch/arm/mach-rmobile/memmap-gen3.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-renesas/memmap-rzg2l.c (renamed from arch/arm/mach-rmobile/memmap-rzg2l.c) | 0 | ||||
-rw-r--r-- | arch/arm/mach-renesas/psci-r8a779a0.c (renamed from arch/arm/mach-rmobile/psci-r8a779a0.c) | 0 |
37 files changed, 19 insertions, 19 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index dbd7e01..01d6556 100644 --- 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" diff --git a/arch/arm/Makefile b/arch/arm/Makefile index d7ca871..a4266a3 100644 --- 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 diff --git a/arch/arm/mach-rmobile/Kconfig b/arch/arm/mach-renesas/Kconfig index c1db953..5aacc6f 100644 --- a/arch/arm/mach-rmobile/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 diff --git a/arch/arm/mach-rmobile/Kconfig.32 b/arch/arm/mach-renesas/Kconfig.32 index 693a5ab..693a5ab 100644 --- a/arch/arm/mach-rmobile/Kconfig.32 +++ b/arch/arm/mach-renesas/Kconfig.32 diff --git a/arch/arm/mach-rmobile/Kconfig.64 b/arch/arm/mach-renesas/Kconfig.64 index 57ed1d6..b5067d0 100644 --- a/arch/arm/mach-rmobile/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 diff --git a/arch/arm/mach-rmobile/Kconfig.rcar3 b/arch/arm/mach-renesas/Kconfig.rcar3 index ad35d10..ad35d10 100644 --- a/arch/arm/mach-rmobile/Kconfig.rcar3 +++ b/arch/arm/mach-renesas/Kconfig.rcar3 diff --git a/arch/arm/mach-rmobile/Kconfig.rcar4 b/arch/arm/mach-renesas/Kconfig.rcar4 index e80dce1..e80dce1 100644 --- a/arch/arm/mach-rmobile/Kconfig.rcar4 +++ b/arch/arm/mach-renesas/Kconfig.rcar4 diff --git a/arch/arm/mach-rmobile/Kconfig.rza1 b/arch/arm/mach-renesas/Kconfig.rza1 index e88f9a2..e88f9a2 100644 --- a/arch/arm/mach-rmobile/Kconfig.rza1 +++ b/arch/arm/mach-renesas/Kconfig.rza1 diff --git a/arch/arm/mach-rmobile/Kconfig.rzg2l b/arch/arm/mach-renesas/Kconfig.rzg2l index dc30bdf..dc30bdf 100644 --- a/arch/arm/mach-rmobile/Kconfig.rzg2l +++ b/arch/arm/mach-renesas/Kconfig.rzg2l diff --git a/arch/arm/mach-rmobile/Kconfig.rzn1 b/arch/arm/mach-renesas/Kconfig.rzn1 index 73138d6..73138d6 100644 --- a/arch/arm/mach-rmobile/Kconfig.rzn1 +++ b/arch/arm/mach-renesas/Kconfig.rzn1 diff --git a/arch/arm/mach-rmobile/Makefile b/arch/arm/mach-renesas/Makefile index 71e12e0..71e12e0 100644 --- a/arch/arm/mach-rmobile/Makefile +++ b/arch/arm/mach-renesas/Makefile diff --git a/arch/arm/mach-rmobile/board.c b/arch/arm/mach-renesas/board.c index f061e41..f061e41 100644 --- a/arch/arm/mach-rmobile/board.c +++ b/arch/arm/mach-renesas/board.c diff --git a/arch/arm/mach-rmobile/cpu_info-rcar.c b/arch/arm/mach-renesas/cpu_info-rcar.c index 9418836..9418836 100644 --- a/arch/arm/mach-rmobile/cpu_info-rcar.c +++ b/arch/arm/mach-renesas/cpu_info-rcar.c diff --git a/arch/arm/mach-rmobile/cpu_info-rzg.c b/arch/arm/mach-renesas/cpu_info-rzg.c index 4ade4bc..4ade4bc 100644 --- a/arch/arm/mach-rmobile/cpu_info-rzg.c +++ b/arch/arm/mach-renesas/cpu_info-rzg.c diff --git a/arch/arm/mach-rmobile/cpu_info-rzg2l.c b/arch/arm/mach-renesas/cpu_info-rzg2l.c index ab95ce7..ab95ce7 100644 --- a/arch/arm/mach-rmobile/cpu_info-rzg2l.c +++ b/arch/arm/mach-renesas/cpu_info-rzg2l.c diff --git a/arch/arm/mach-rmobile/cpu_info.c b/arch/arm/mach-renesas/cpu_info.c index 2f9a437..2f9a437 100644 --- a/arch/arm/mach-rmobile/cpu_info.c +++ b/arch/arm/mach-renesas/cpu_info.c diff --git a/arch/arm/mach-rmobile/emac.c b/arch/arm/mach-renesas/emac.c index 9565162..9565162 100644 --- a/arch/arm/mach-rmobile/emac.c +++ b/arch/arm/mach-renesas/emac.c diff --git a/arch/arm/mach-rmobile/include/mach/boot0.h b/arch/arm/mach-renesas/include/mach/boot0.h index 1d8c3ee..1d8c3ee 100644 --- a/arch/arm/mach-rmobile/include/mach/boot0.h +++ b/arch/arm/mach-renesas/include/mach/boot0.h diff --git a/arch/arm/mach-rmobile/include/mach/gpio.h b/arch/arm/mach-renesas/include/mach/gpio.h index efdde0a..efdde0a 100644 --- a/arch/arm/mach-rmobile/include/mach/gpio.h +++ b/arch/arm/mach-renesas/include/mach/gpio.h diff --git a/arch/arm/mach-rmobile/include/mach/irqs.h b/arch/arm/mach-renesas/include/mach/irqs.h index dcb714f..dcb714f 100644 --- a/arch/arm/mach-rmobile/include/mach/irqs.h +++ b/arch/arm/mach-renesas/include/mach/irqs.h diff --git a/arch/arm/mach-rmobile/include/mach/r8a7790.h b/arch/arm/mach-renesas/include/mach/r8a7790.h index 233531c..61101df 100644 --- a/arch/arm/mach-rmobile/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 */ diff --git a/arch/arm/mach-rmobile/include/mach/r8a7791.h b/arch/arm/mach-renesas/include/mach/r8a7791.h index 78a910c..40524d7 100644 --- a/arch/arm/mach-rmobile/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 */ diff --git a/arch/arm/mach-rmobile/include/mach/r8a7792.h b/arch/arm/mach-renesas/include/mach/r8a7792.h index cc1b00d..51c0d63 100644 --- a/arch/arm/mach-rmobile/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 */ diff --git a/arch/arm/mach-rmobile/include/mach/r8a7793.h b/arch/arm/mach-renesas/include/mach/r8a7793.h index 4cb0647..f15f823 100644 --- a/arch/arm/mach-rmobile/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 */ diff --git a/arch/arm/mach-rmobile/include/mach/r8a7794.h b/arch/arm/mach-renesas/include/mach/r8a7794.h index 6d0d729..592625e 100644 --- a/arch/arm/mach-rmobile/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 */ diff --git a/arch/arm/mach-rmobile/include/mach/rcar-base.h b/arch/arm/mach-renesas/include/mach/rcar-base.h index e422e91..4c2ee81 100644 --- a/arch/arm/mach-rmobile/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 */ diff --git a/arch/arm/mach-rmobile/include/mach/rcar-gen3-base.h b/arch/arm/mach-renesas/include/mach/rcar-gen3-base.h index ca12742..5e2e9ec 100644 --- a/arch/arm/mach-rmobile/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 */ diff --git a/arch/arm/mach-rmobile/include/mach/rcar-gen4-base.h b/arch/arm/mach-renesas/include/mach/rcar-gen4-base.h index ac57698..f34473d 100644 --- a/arch/arm/mach-rmobile/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. */ diff --git a/arch/arm/mach-rmobile/include/mach/rcar-mstp.h b/arch/arm/mach-renesas/include/mach/rcar-mstp.h index d241652..7ca362e 100644 --- a/arch/arm/mach-rmobile/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 diff --git a/arch/arm/mach-rmobile/include/mach/renesas.h b/arch/arm/mach-renesas/include/mach/renesas.h index c69c764..c69c764 100644 --- a/arch/arm/mach-rmobile/include/mach/renesas.h +++ b/arch/arm/mach-renesas/include/mach/renesas.h diff --git a/arch/arm/mach-rmobile/include/mach/rzg2l.h b/arch/arm/mach-renesas/include/mach/rzg2l.h index 057df5c..057df5c 100644 --- a/arch/arm/mach-rmobile/include/mach/rzg2l.h +++ b/arch/arm/mach-renesas/include/mach/rzg2l.h diff --git a/arch/arm/mach-rmobile/include/mach/sys_proto.h b/arch/arm/mach-renesas/include/mach/sys_proto.h index ec8036a..ec8036a 100644 --- a/arch/arm/mach-rmobile/include/mach/sys_proto.h +++ b/arch/arm/mach-renesas/include/mach/sys_proto.h diff --git a/arch/arm/mach-rmobile/lowlevel_init_ca15.S b/arch/arm/mach-renesas/lowlevel_init_ca15.S index a52b761..a52b761 100644 --- a/arch/arm/mach-rmobile/lowlevel_init_ca15.S +++ b/arch/arm/mach-renesas/lowlevel_init_ca15.S diff --git a/arch/arm/mach-rmobile/lowlevel_init_gen3.S b/arch/arm/mach-renesas/lowlevel_init_gen3.S index 0d77800..0d77800 100644 --- a/arch/arm/mach-rmobile/lowlevel_init_gen3.S +++ b/arch/arm/mach-renesas/lowlevel_init_gen3.S diff --git a/arch/arm/mach-rmobile/memmap-gen3.c b/arch/arm/mach-renesas/memmap-gen3.c index 4dff9e0..4dff9e0 100644 --- a/arch/arm/mach-rmobile/memmap-gen3.c +++ b/arch/arm/mach-renesas/memmap-gen3.c diff --git a/arch/arm/mach-rmobile/memmap-rzg2l.c b/arch/arm/mach-renesas/memmap-rzg2l.c index 9934a77..9934a77 100644 --- a/arch/arm/mach-rmobile/memmap-rzg2l.c +++ b/arch/arm/mach-renesas/memmap-rzg2l.c diff --git a/arch/arm/mach-rmobile/psci-r8a779a0.c b/arch/arm/mach-renesas/psci-r8a779a0.c index b6c49e7..b6c49e7 100644 --- a/arch/arm/mach-rmobile/psci-r8a779a0.c +++ b/arch/arm/mach-renesas/psci-r8a779a0.c |