55 files changed, 37 insertions, 37 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 0b08ca1..cd9b2d4 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -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_*
diff --git a/Makefile b/Makefile
index 3b5db90..f308d78 100644
--- 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) \
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
diff --git a/board/beacon/beacon-rzg2m/Kconfig b/board/beacon/beacon-rzg2m/Kconfig
index c03857c..1eb9e0d 100644
--- 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"
diff --git a/board/hoperun/hihope-rzg2/Kconfig b/board/hoperun/hihope-rzg2/Kconfig
index ee422ba..e15b54a 100644
--- 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"
diff --git a/board/renesas/condor/Kconfig b/board/renesas/condor/Kconfig
index 2286d88..fbfb12c 100644
--- 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"
diff --git a/board/renesas/draak/Kconfig b/board/renesas/draak/Kconfig
index 9106387..8f3d904 100644
--- 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"
diff --git a/board/renesas/eagle/Kconfig b/board/renesas/eagle/Kconfig
index 4d12843..04895d2 100644
--- 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"
diff --git a/board/renesas/ebisu/Kconfig b/board/renesas/ebisu/Kconfig
index f500a94..a9049b6 100644
--- 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"
diff --git a/board/renesas/falcon/Kconfig b/board/renesas/falcon/Kconfig
index 1fcefa7..44a2e56 100644
--- 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"
diff --git a/board/renesas/grayhawk/Kconfig b/board/renesas/grayhawk/Kconfig
index 97621a3..a6dbfb5 100644
--- 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"
diff --git a/board/renesas/rzg2l/Kconfig b/board/renesas/rzg2l/Kconfig
index 1335fc7..c7b7570 100644
--- 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"
diff --git a/board/renesas/salvator-x/Kconfig b/board/renesas/salvator-x/Kconfig
index ed4c479..52955e1 100644
--- 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"
diff --git a/board/renesas/spider/Kconfig b/board/renesas/spider/Kconfig
index 8df2e85..bd5825e 100644
--- 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"
diff --git a/board/renesas/ulcb/Kconfig b/board/renesas/ulcb/Kconfig
index 1e9a10d..3186036 100644
--- 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"
diff --git a/board/renesas/v3hsk/Kconfig b/board/renesas/v3hsk/Kconfig
index 531ceb7..da595a4 100644
--- 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"
diff --git a/board/renesas/v3msk/Kconfig b/board/renesas/v3msk/Kconfig
index fe037fd..8f42386 100644
--- 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"
diff --git a/board/renesas/whitehawk/Kconfig b/board/renesas/whitehawk/Kconfig
index 05a8789..8adb24c 100644
--- 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"
diff --git a/board/silinux/ek874/Kconfig b/board/silinux/ek874/Kconfig
index 60b390a..5b34087 100644
--- 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"