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>

diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h
index 6deed0dcd70af394e99b814f2fbcdaa1f6760d21..dd6863e64e3856317e6e5990d1bdff572bfee22e 100644 (file)
--- 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 8616b36ecc0bc8fced5b5a0b7787fcb4eb7c67c3..5004fa31b6d4dfb6e6a1ce8fd32fed16e053f83f 100644 (file)
--- 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 a4795c5ff3bb4a9a92fbb9dd6de48ffb2dff0f15..41ba5972a6ee218fd1c99cf98d1779654c48f2b2 100644 (file)
--- 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