From 7bcdd0c1f82edfcfb4de1c5d5953d9e0954371d2 Mon Sep 17 00:00:00 2001
From: Marek Vasut <marek.vasut+renesas@gmail.com>
Date: Tue, 28 Nov 2017 08:25:21 +0100
Subject: [PATCH] ARM: rmobile: Clean up GIC macros

Pull out the GIC macros from the board configuration files
into the common Gen3 configuration file since these macros
are the same for all Gen3 systems.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
---
 include/configs/rcar-gen3-common.h | 5 +++++
 include/configs/salvator-x.h       | 5 -----
 include/configs/ulcb.h             | 5 -----
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h
index 6deed0dcd7..dd6863e64e 100644
--- a/include/configs/rcar-gen3-common.h
+++ b/include/configs/rcar-gen3-common.h
@@ -31,6 +31,11 @@
 
 #define CONFIG_ARCH_CPU_INIT
 
+/* Generic Interrupt Controller Definitions */
+#define CONFIG_GICV2
+#define GICD_BASE	0xF1010000
+#define GICC_BASE	0xF1020000
+
 /* console */
 #define CONFIG_SYS_CBSIZE		2048
 #define CONFIG_SYS_BARGSIZE		CONFIG_SYS_CBSIZE
diff --git a/include/configs/salvator-x.h b/include/configs/salvator-x.h
index 8616b36ecc..5004fa31b6 100644
--- a/include/configs/salvator-x.h
+++ b/include/configs/salvator-x.h
@@ -42,11 +42,6 @@
 /* Generic Timer Definitions (use in assembler source) */
 #define COUNTER_FREQUENCY	0xFE502A	/* 16.66MHz from CPclk */
 
-/* Generic Interrupt Controller Definitions */
-#define CONFIG_GICV2
-#define GICD_BASE	0xF1010000
-#define GICC_BASE	0xF1020000
-
 /* i2c */
 #define CONFIG_SYS_I2C
 #define CONFIG_SYS_I2C_SH
diff --git a/include/configs/ulcb.h b/include/configs/ulcb.h
index a4795c5ff3..41ba5972a6 100644
--- a/include/configs/ulcb.h
+++ b/include/configs/ulcb.h
@@ -50,11 +50,6 @@
 /* Generic Timer Definitions (use in assembler source) */
 #define COUNTER_FREQUENCY	0xFE502A	/* 16.66MHz from CPclk */
 
-/* Generic Interrupt Controller Definitions */
-#define CONFIG_GICV2
-#define GICD_BASE	0xF1010000
-#define GICC_BASE	0xF1020000
-
 /* CPLD SPI */
 #define CONFIG_CMD_SPI
 #define CONFIG_SOFT_SPI
-- 
2.30.2