4 files changed, 20 insertions, 22 deletions
diff --git a/arch/arm/mach-renesas/include/mach/rcar-gen3-base.h b/arch/arm/mach-renesas/include/mach/rcar-gen3-base.h
index 5e2e9eca452..7b4f5f0c651 100644
--- a/arch/arm/mach-renesas/include/mach/rcar-gen3-base.h
+++ b/arch/arm/mach-renesas/include/mach/rcar-gen3-base.h
@@ -67,6 +67,11 @@
 #define SMSTPCR10		0xE6150998
 #define SMSTPCR11		0xE615099C
 
+/* GICv3 */
+/* Distributor Registers */
+#define GICD_BASE		0xF1010000
+#define GICC_BASE		0xF1020000
+
 /* PFC */
 #define PFC_PUEN5	0xE6060414
 #define PUEN_SSI_SDATA4	BIT(17)
diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h
index 67c9faeca57..020e79ca2a8 100644
--- a/include/configs/rcar-gen2-common.h
+++ b/include/configs/rcar-gen2-common.h
@@ -1,8 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0 */
 /*
  * include/configs/rcar-gen2-common.h
+ *	This file is R-Car Gen2 common configuration file.
  *
- * Copyright (C) 2013,2014 Renesas Electronics Corporation
+ * Copyright (C) 2013-2024 Renesas Electronics Corporation
  */
 
 #ifndef __RCAR_GEN2_COMMON_H
@@ -10,14 +11,15 @@
 
 #include <asm/arch/renesas.h>
 
-/* console */
-#define CFG_SYS_BAUDRATE_TABLE	{ 38400, 115200 }
+/* Console */
+#define CFG_SYS_BAUDRATE_TABLE		{ 38400, 115200 }
 
+/* Memory */
 #define CFG_SYS_SDRAM_BASE		(RCAR_GEN2_SDRAM_BASE)
 #define CFG_SYS_SDRAM_SIZE		(RCAR_GEN2_UBOOT_SDRAM_SIZE)
 
 /* Timer */
-#define CFG_SYS_TIMER_COUNTER	(TMU_BASE + 0xc)	/* TCNT0 */
+#define CFG_SYS_TIMER_COUNTER		(TMU_BASE + 0xc)	/* TCNT0 */
 #define CFG_SYS_TIMER_RATE		(get_board_sys_clk() / 8)
 
 #endif	/* __RCAR_GEN2_COMMON_H */
diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h
index 3f0831a901c..bedb1c0843e 100644
--- a/include/configs/rcar-gen3-common.h
+++ b/include/configs/rcar-gen3-common.h
@@ -3,7 +3,7 @@
  * include/configs/rcar-gen3-common.h
  *	This file is R-Car Gen3 common configuration file.
  *
- * Copyright (C) 2015-2017 Renesas Electronics Corporation
+ * Copyright (C) 2015-2024 Renesas Electronics Corporation
  */
 
 #ifndef __RCAR_GEN3_COMMON_H
@@ -11,24 +11,17 @@
 
 #include <asm/arch/renesas.h>
 
-/* boot option */
+/* Console */
+#define CFG_SYS_BAUDRATE_TABLE		{ 115200, 38400 }
 
-/* Generic Interrupt Controller Definitions */
-#define GICD_BASE	0xF1010000
-#define GICC_BASE	0xF1020000
-
-/* console */
-#define CFG_SYS_BAUDRATE_TABLE	{ 115200, 38400 }
-
-/* MEMORY */
+/* Memory */
 #define DRAM_RSV_SIZE			0x08000000
 #define CFG_SYS_SDRAM_BASE		(0x40000000 + DRAM_RSV_SIZE)
 #define CFG_SYS_SDRAM_SIZE		(0x80000000u - DRAM_RSV_SIZE)
 #define CFG_MAX_MEM_MAPPED		(0x80000000u - DRAM_RSV_SIZE)
 
-/* ENV setting */
-
-#define CFG_EXTRA_ENV_SETTINGS	\
+/* Environment setting */
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"bootm_size=0x10000000\0"
 
 #endif	/* __RCAR_GEN3_COMMON_H */
diff --git a/include/configs/rcar-gen4-common.h b/include/configs/rcar-gen4-common.h
index 37a37c013df..1a00adb79d1 100644
--- a/include/configs/rcar-gen4-common.h
+++ b/include/configs/rcar-gen4-common.h
@@ -3,7 +3,7 @@
  * include/configs/rcar-gen4-common.h
  *	This file is R-Car Gen4 common configuration file.
  *
- * Copyright (C) 2021 Renesas Electronics Corporation
+ * Copyright (C) 2021-2024 Renesas Electronics Corporation
  */
 
 #ifndef __RCAR_GEN4_COMMON_H
@@ -12,7 +12,7 @@
 #include <asm/arch/renesas.h>
 
 /* Console */
-#define CFG_SYS_BAUDRATE_TABLE	{ 38400, 115200, 921600, 1843200 }
+#define CFG_SYS_BAUDRATE_TABLE		{ 38400, 115200, 921600, 1843200 }
 
 /* Memory */
 #define DRAM_RSV_SIZE			0x08000000
@@ -20,10 +20,8 @@
 #define CFG_SYS_SDRAM_SIZE		(0x80000000u - DRAM_RSV_SIZE)
 #define CFG_MAX_MEM_MAPPED		(0x80000000u - DRAM_RSV_SIZE)
 
-/* PHY needs a longer autoneg timeout */
-
 /* Environment setting */
-#define CFG_EXTRA_ENV_SETTINGS					\
+#define CFG_EXTRA_ENV_SETTINGS		\
 	"bootm_size=0x10000000\0"
 
 #endif	/* __RCAR_GEN4_COMMON_H */