Skip to content

Commit 40b9d53

Browse files
Marek Vasuttrini
Marek Vasut
authored andcommitted
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 <[email protected]> Reviewed-by: Paul Barker <[email protected]>
1 parent f9aabd4 commit 40b9d53

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+37
-37
lines changed

MAINTAINERS

+1-1
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ M: Nobuhiro Iwamatsu <[email protected]>
497497
M: Marek Vasut <[email protected]>
498498
S: Maintained
499499
T: git https://source.denx.de/u-boot/custodians/u-boot-sh.git
500-
F: arch/arm/mach-rmobile/
500+
F: arch/arm/mach-renesas/
501501
F: drivers/clk/renesas/
502502
F: drivers/gpio/gpio-rcar.c
503503
F: drivers/i2c/rcar_*

Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1266,7 +1266,7 @@ spl/u-boot-spl.srec: spl/u-boot-spl FORCE
12661266
$(call if_changed,objcopy)
12671267

12681268
%.scif: %.srec
1269-
$(Q)$(MAKE) $(build)=arch/arm/mach-rmobile $@
1269+
$(Q)$(MAKE) $(build)=arch/arm/mach-renesas $@
12701270

12711271
OBJCOPYFLAGS_u-boot-nodtb.bin := -O binary \
12721272
$(if $(CONFIG_X86_16BIT_INIT),-R .start16 -R .resetvec) \

arch/arm/Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -2269,7 +2269,7 @@ source "arch/arm/mach-orion5x/Kconfig"
22692269

22702270
source "arch/arm/mach-owl/Kconfig"
22712271

2272-
source "arch/arm/mach-rmobile/Kconfig"
2272+
source "arch/arm/mach-renesas/Kconfig"
22732273

22742274
source "arch/arm/mach-meson/Kconfig"
22752275

arch/arm/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ machine-$(CONFIG_ARCH_NPCM) += npcm
7575
machine-$(CONFIG_ARCH_OMAP2PLUS) += omap2
7676
machine-$(CONFIG_ARCH_ORION5X) += orion5x
7777
machine-$(CONFIG_ARCH_OWL) += owl
78-
machine-$(CONFIG_ARCH_RENESAS) += rmobile
78+
machine-$(CONFIG_ARCH_RENESAS) += renesas
7979
machine-$(CONFIG_ARCH_ROCKCHIP) += rockchip
8080
machine-$(CONFIG_ARCH_S5PC1XX) += s5pc1xx
8181
machine-$(CONFIG_ARCH_SNAPDRAGON) += snapdragon

arch/arm/mach-rmobile/Kconfig renamed to arch/arm/mach-renesas/Kconfig

+6-6
Original file line numberDiff line numberDiff line change
@@ -88,12 +88,12 @@ config RZG2L
8888
endchoice
8989

9090
config SYS_SOC
91-
default "rmobile" if ARCH_RENESAS
91+
default "renesas" if ARCH_RENESAS
9292

93-
source "arch/arm/mach-rmobile/Kconfig.32"
94-
source "arch/arm/mach-rmobile/Kconfig.64"
95-
source "arch/arm/mach-rmobile/Kconfig.rza1"
96-
source "arch/arm/mach-rmobile/Kconfig.rzn1"
97-
source "arch/arm/mach-rmobile/Kconfig.rzg2l"
93+
source "arch/arm/mach-renesas/Kconfig.32"
94+
source "arch/arm/mach-renesas/Kconfig.64"
95+
source "arch/arm/mach-renesas/Kconfig.rza1"
96+
source "arch/arm/mach-renesas/Kconfig.rzn1"
97+
source "arch/arm/mach-renesas/Kconfig.rzg2l"
9898

9999
endif
File renamed without changes.

arch/arm/mach-rmobile/Kconfig.64 renamed to arch/arm/mach-renesas/Kconfig.64

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ config SYS_MALLOC_F_LEN
66
config OF_LIBFDT_OVERLAY
77
default y if RCAR_64
88

9-
source "arch/arm/mach-rmobile/Kconfig.rcar3"
10-
source "arch/arm/mach-rmobile/Kconfig.rcar4"
9+
source "arch/arm/mach-renesas/Kconfig.rcar3"
10+
source "arch/arm/mach-renesas/Kconfig.rcar4"
1111

1212
endif
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

arch/arm/mach-rmobile/include/mach/r8a7790.h renamed to arch/arm/mach-renesas/include/mach/r8a7790.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* SPDX-License-Identifier: GPL-2.0 */
22
/*
3-
* arch/arm/include/asm/arch-rmobile/r8a7790.h
3+
* arch/arm/include/asm/arch-renesas/r8a7790.h
44
*
55
* Copyright (C) 2013,2014 Renesas Electronics Corporation
66
*/

arch/arm/mach-rmobile/include/mach/r8a7791.h renamed to arch/arm/mach-renesas/include/mach/r8a7791.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* SPDX-License-Identifier: GPL-2.0 */
22
/*
3-
* arch/arm/include/asm/arch-rmobile/r8a7791.h
3+
* arch/arm/include/asm/arch-renesas/r8a7791.h
44
*
55
* Copyright (C) 2013,2014 Renesas Electronics Corporation
66
*/

arch/arm/mach-rmobile/include/mach/r8a7792.h renamed to arch/arm/mach-renesas/include/mach/r8a7792.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* SPDX-License-Identifier: GPL-2.0 */
22
/*
3-
* arch/arm/include/asm/arch-rmobile/r8a7792.h
3+
* arch/arm/include/asm/arch-renesas/r8a7792.h
44
*
55
* Copyright (C) 2016 Renesas Electronics Corporation
66
*/

arch/arm/mach-rmobile/include/mach/r8a7793.h renamed to arch/arm/mach-renesas/include/mach/r8a7793.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* SPDX-License-Identifier: GPL-2.0 */
22
/*
3-
* arch/arm/include/asm/arch-rmobile/r8a7793.h
3+
* arch/arm/include/asm/arch-renesas/r8a7793.h
44
*
55
* Copyright (C) 2014 Renesas Electronics Corporation
66
*/

arch/arm/mach-rmobile/include/mach/r8a7794.h renamed to arch/arm/mach-renesas/include/mach/r8a7794.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* SPDX-License-Identifier: GPL-2.0 */
22
/*
3-
* arch/arm/include/asm/arch-rmobile/r8a7794.h
3+
* arch/arm/include/asm/arch-renesas/r8a7794.h
44
*
55
* Copyright (C) 2014 Renesas Electronics Corporation
66
*/

arch/arm/mach-rmobile/include/mach/rcar-base.h renamed to arch/arm/mach-renesas/include/mach/rcar-base.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* SPDX-License-Identifier: GPL-2.0 */
22
/*
3-
* arch/arm/include/asm/arch-rmobile/rcar-base.h
3+
* arch/arm/include/asm/arch-renesas/rcar-base.h
44
*
55
* Copyright (C) 2013,2014 Renesas Electronics Corporation
66
*/

arch/arm/mach-rmobile/include/mach/rcar-gen3-base.h renamed to arch/arm/mach-renesas/include/mach/rcar-gen3-base.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* SPDX-License-Identifier: GPL-2.0+ */
22
/*
3-
* ./arch/arm/mach-rmobile/include/mach/rcar-gen3-base.h
3+
* ./arch/arm/mach-renesas/include/mach/rcar-gen3-base.h
44
*
55
* Copyright (C) 2015 Renesas Electronics Corporation
66
*/

arch/arm/mach-rmobile/include/mach/rcar-gen4-base.h renamed to arch/arm/mach-renesas/include/mach/rcar-gen4-base.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* SPDX-License-Identifier: GPL-2.0+ */
22
/*
3-
* ./arch/arm/mach-rmobile/include/mach/rcar-gen4-base.h
3+
* ./arch/arm/mach-renesas/include/mach/rcar-gen4-base.h
44
*
55
* Copyright (C) 2021 Renesas Electronics Corp.
66
*/

arch/arm/mach-rmobile/include/mach/rcar-mstp.h renamed to arch/arm/mach-renesas/include/mach/rcar-mstp.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* SPDX-License-Identifier: GPL-2.0 */
22
/*
3-
* arch/arm/include/asm/arch-rmobile/rcar-mstp.h
3+
* arch/arm/include/asm/arch-renesas/rcar-mstp.h
44
*
55
* Copyright (C) 2013, 2014 Nobuhiro Iwamatsu <[email protected]>
66
* Copyright (C) 2013, 2014 Renesas Electronics Corporation

board/beacon/beacon-rzg2m/Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
if TARGET_BEACON_RZG2M
22

33
config SYS_SOC
4-
default "rmobile"
4+
default "renesas"
55

66
config SYS_BOARD
77
default "beacon-rzg2m"

board/hoperun/hihope-rzg2/Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
if TARGET_HIHOPE_RZG2
22

33
config SYS_SOC
4-
default "rmobile"
4+
default "renesas"
55

66
config SYS_BOARD
77
default "hihope-rzg2"

board/renesas/condor/Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
if TARGET_CONDOR
22

33
config SYS_SOC
4-
default "rmobile"
4+
default "renesas"
55

66
config SYS_BOARD
77
default "condor"

board/renesas/draak/Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
if TARGET_DRAAK
22

33
config SYS_SOC
4-
default "rmobile"
4+
default "renesas"
55

66
config SYS_BOARD
77
default "draak"

board/renesas/eagle/Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
if TARGET_EAGLE
22

33
config SYS_SOC
4-
default "rmobile"
4+
default "renesas"
55

66
config SYS_BOARD
77
default "eagle"

board/renesas/ebisu/Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
if TARGET_EBISU
22

33
config SYS_SOC
4-
default "rmobile"
4+
default "renesas"
55

66
config SYS_BOARD
77
default "ebisu"

board/renesas/falcon/Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
if TARGET_FALCON
22

33
config SYS_SOC
4-
default "rmobile"
4+
default "renesas"
55

66
config SYS_BOARD
77
default "falcon"

board/renesas/grayhawk/Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
if TARGET_GRAYHAWK
22

33
config SYS_SOC
4-
default "rmobile"
4+
default "renesas"
55

66
config SYS_BOARD
77
default "grayhawk"

board/renesas/rzg2l/Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
if TARGET_RZG2L_SMARC_EVK
55

66
config SYS_SOC
7-
default "rmobile"
7+
default "renesas"
88

99
config SYS_BOARD
1010
default "rzg2l"

board/renesas/salvator-x/Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
if TARGET_SALVATOR_X
22

33
config SYS_SOC
4-
default "rmobile"
4+
default "renesas"
55

66
config SYS_BOARD
77
default "salvator-x"

board/renesas/spider/Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
if TARGET_SPIDER
22

33
config SYS_SOC
4-
default "rmobile"
4+
default "renesas"
55

66
config SYS_BOARD
77
default "spider"

board/renesas/ulcb/Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
if TARGET_ULCB
22

33
config SYS_SOC
4-
default "rmobile"
4+
default "renesas"
55

66
config SYS_BOARD
77
default "ulcb"

board/renesas/v3hsk/Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
if TARGET_V3HSK
22

33
config SYS_SOC
4-
default "rmobile"
4+
default "renesas"
55

66
config SYS_BOARD
77
default "v3hsk"

board/renesas/v3msk/Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
if TARGET_V3MSK
22

33
config SYS_SOC
4-
default "rmobile"
4+
default "renesas"
55

66
config SYS_BOARD
77
default "v3msk"

board/renesas/whitehawk/Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
if TARGET_WHITEHAWK
22

33
config SYS_SOC
4-
default "rmobile"
4+
default "renesas"
55

66
config SYS_BOARD
77
default "whitehawk"

board/silinux/ek874/Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
if TARGET_SILINUX_EK874
22

33
config SYS_SOC
4-
default "rmobile"
4+
default "renesas"
55

66
config SYS_BOARD
77
default "ek874"

0 commit comments

Comments
 (0)