Create arm_common.mk for common source files

Instead of adding all the platform files from each platform.mk, only
add the ones that are actually platform-specific.

Change-Id: I1c9722ce1ab4115cb639115cfef670867ee189b1

5 files changed, 50 insertions, 25 deletions

diff --git a/plat/arm/board/armstrong/platform.mk b/plat/arm/board/armstrong/platform.mk
index c1a2c84..cf029d1 100644
--- a/plat/arm/board/armstrong/platform.mk
+++ b/plat/arm/board/armstrong/platform.mk
@@ -31,10 +31,8 @@
 PLAT_INCLUDES	:=	-Iplat/arm/board/armstrong/include/
 
 PLAT_SOURCES	:=	drivers/arm/gic/arm_gic_v2v3.c			\
-			drivers/arm/gic/gic_common.c			\
 			drivers/arm/gic/gic_v2.c			\
 			drivers/arm/gic/gic_v3.c			\
-			drivers/arm/pl011/aarch64/pl011_console.S	\
 			drivers/arm/sp805/sp805.c			\
 			drivers/arm/timer/system_timer.c		\
 			plat/arm/board/armstrong/aarch64/plat_helpers.S	\
@@ -46,8 +44,7 @@ PLAT_SOURCES	:=	drivers/arm/gic/arm_gic_v2v3.c			\
 PLAT_TESTS_SKIP_LIST	:=	plat/arm/board/armstrong/tests_to_skip.txt
 
 ifeq (${USE_NVM},1)
-PLAT_SOURCES	+=	drivers/io/io_storage.c				\
-			drivers/io/vexpress_nor/io_vexpress_nor_ops.c   \
-			drivers/io/vexpress_nor/io_vexpress_nor_hw.c	\
-			plat/arm/board/armstrong/armstrong_io_storage.c
+PLAT_SOURCES	+=	plat/arm/board/armstrong/armstrong_io_storage.c
 endif
+
+include plat/arm/common/arm_common.mk
diff --git a/plat/arm/board/ashbrook/platform.mk b/plat/arm/board/ashbrook/platform.mk
index 4225f18..4b94be3 100644
--- a/plat/arm/board/ashbrook/platform.mk
+++ b/plat/arm/board/ashbrook/platform.mk
@@ -31,10 +31,8 @@
 PLAT_INCLUDES	:=	-Iplat/arm/board/ashbrook/include/
 
 PLAT_SOURCES	:=	drivers/arm/gic/arm_gic_v2v3.c			\
-			drivers/arm/gic/gic_common.c			\
 			drivers/arm/gic/gic_v2.c			\
 			drivers/arm/gic/gic_v3.c			\
-			drivers/arm/pl011/aarch64/pl011_console.S\
 			drivers/arm/sp805/sp805.c			\
 			drivers/arm/timer/system_timer.c		\
 			plat/arm/board/ashbrook/aarch64/plat_helpers.S	\
@@ -46,8 +44,7 @@ PLAT_SOURCES	:=	drivers/arm/gic/arm_gic_v2v3.c			\
 PLAT_TESTS_SKIP_LIST	:=	plat/arm/board/ashbrook/tests_to_skip.txt
 
 ifeq (${USE_NVM},1)
-PLAT_SOURCES	+=	drivers/io/io_storage.c				\
-			drivers/io/vexpress_nor/io_vexpress_nor_ops.c	\
-			drivers/io/vexpress_nor/io_vexpress_nor_hw.c	\
-			plat/arm/board/ashbrook/ashbrook_io_storage.c
+PLAT_SOURCES	+=	plat/arm/board/ashbrook/ashbrook_io_storage.c
 endif
+
+include plat/arm/common/arm_common.mk
diff --git a/plat/arm/board/fvp/platform.mk b/plat/arm/board/fvp/platform.mk
index 44bf04d..f260c9a 100644
--- a/plat/arm/board/fvp/platform.mk
+++ b/plat/arm/board/fvp/platform.mk
@@ -31,10 +31,8 @@
 PLAT_INCLUDES	:=	-Iplat/arm/board/fvp/include/
 
 PLAT_SOURCES	:=	drivers/arm/gic/arm_gic_v2v3.c			\
-			drivers/arm/gic/gic_common.c			\
 			drivers/arm/gic/gic_v2.c			\
 			drivers/arm/gic/gic_v3.c			\
-			drivers/arm/pl011/${ARCH}/pl011_console.S	\
 			drivers/arm/sp805/sp805.c			\
 			drivers/arm/timer/system_timer.c		\
 			lib/semihosting/${ARCH}/semihosting_call.S	\
@@ -47,11 +45,10 @@ PLAT_SOURCES	:=	drivers/arm/gic/arm_gic_v2v3.c			\
 PLAT_TESTS_SKIP_LIST	:=	plat/arm/board/fvp/tests_to_skip.txt
 
 ifeq (${USE_NVM},1)
-PLAT_SOURCES	+=	drivers/io/io_storage.c				\
-			drivers/io/vexpress_nor/io_vexpress_nor_ops.c   \
-			drivers/io/vexpress_nor/io_vexpress_nor_hw.c	\
-			plat/arm/board/fvp/fvp_io_storage.c
+PLAT_SOURCES	+=	plat/arm/board/fvp/fvp_io_storage.c
 endif
 
 # Firmware update is implemented on FVP.
 FIRMWARE_UPDATE := 1
+
+include plat/arm/common/arm_common.mk
diff --git a/plat/arm/board/juno/platform.mk b/plat/arm/board/juno/platform.mk
index 22f489a..3bb7b78 100644
--- a/plat/arm/board/juno/platform.mk
+++ b/plat/arm/board/juno/platform.mk
@@ -31,9 +31,7 @@
 PLAT_INCLUDES	:=	-Iplat/arm/board/juno/include/
 
 PLAT_SOURCES	:=	drivers/arm/gic/arm_gic_v2.c			\
-			drivers/arm/gic/gic_common.c			\
 			drivers/arm/gic/gic_v2.c			\
-			drivers/arm/pl011/aarch64/pl011_console.S\
 			drivers/arm/sp805/sp805.c			\
 			drivers/arm/timer/sp804.c			\
 			plat/arm/board/juno/aarch64/plat_helpers.S	\
@@ -43,13 +41,9 @@ PLAT_SOURCES	:=	drivers/arm/gic/arm_gic_v2.c			\
 			plat/arm/board/juno/plat_setup.c
 
 ifeq (${USE_NVM},1)
-PLAT_SOURCES	+=	drivers/io/io_storage.c				\
-			drivers/io/vexpress_nor/io_vexpress_nor_ops.c   \
-			drivers/io/vexpress_nor/io_vexpress_nor_hw.c	\
-			plat/arm/board/juno/juno_io_storage.c
+PLAT_SOURCES	+=	plat/arm/board/juno/juno_io_storage.c
 endif
 
-
 PLAT_SUPPORTS_NS_RESET	:=	1
 
 # Process PLAT_SUPPORTS_NS_RESET flag
@@ -58,3 +52,5 @@ $(eval $(call add_define,PLAT_SUPPORTS_NS_RESET))
 
 # Firmware update is implemented on Juno.
 FIRMWARE_UPDATE := 1
+
+include plat/arm/common/arm_common.mk
diff --git a/plat/arm/common/arm_common.mk b/plat/arm/common/arm_common.mk
new file mode 100644
index 0000000..7cb3664
--- /dev/null
+++ b/plat/arm/common/arm_common.mk
@@ -0,0 +1,38 @@
+#
+# Copyright (c) 2016, ARM Limited and Contributors. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+#
+# Redistributions of source code must retain the above copyright notice, this
+# list of conditions and the following disclaimer.
+#
+# Redistributions in binary form must reproduce the above copyright notice,
+# this list of conditions and the following disclaimer in the documentation
+# and/or other materials provided with the distribution.
+#
+# Neither the name of ARM nor the names of its contributors may be used
+# to endorse or promote products derived from this software without specific
+# prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGE.
+#
+
+PLAT_SOURCES	+=	drivers/arm/gic/gic_common.c			\
+			drivers/arm/pl011/${ARCH}/pl011_console.S
+
+ifeq (${USE_NVM},1)
+PLAT_SOURCES	+=	drivers/io/io_storage.c				\
+			drivers/io/vexpress_nor/io_vexpress_nor_ops.c	\
+			drivers/io/vexpress_nor/io_vexpress_nor_hw.c
+endif