Merge "morello: Add changes to fix build of Morello Platform" into integration

plat/arm/board/morello/include/platform_def.h

@@ -93,4 +93,7 @@
 #define PLAT_ARM_GICC_BASE			UL(0x2C000000)
 #define PLAT_ARM_GICR_BASE			UL(0x300C0000)
 
+/* Number of SCMI channels on the platform */
+#define PLAT_ARM_SCMI_CHANNEL_COUNT		U(1)
+
 #endif /* PLATFORM_DEF_H */

plat/arm/board/morello/morello_bl31_setup.c

@@ -48,7 +48,7 @@ static scmi_channel_plat_info_t morello_scmi_plat_info = {
 	.ring_doorbell = &mhu_ring_doorbell
 };
 
-scmi_channel_plat_info_t *plat_css_get_scmi_info()
+scmi_channel_plat_info_t *plat_css_get_scmi_info(int channel_id)
 {
 	return &morello_scmi_plat_info;
 }

plat/arm/board/morello/platform.mk

@@ -12,12 +12,15 @@ PLAT_INCLUDES		:=	-I${MORELLO_BASE}/include
 
 MORELLO_CPU_SOURCES	:=	lib/cpus/aarch64/rainier.S
 
-MORELLO_GIC_SOURCES	:=	drivers/arm/gic/common/gic_common.c	\
-				drivers/arm/gic/v3/gicv3_main.c		\
-				drivers/arm/gic/v3/gicv3_helpers.c	\
+# GIC-600 configuration
+GICV3_SUPPORT_GIC600	:=	1
+
+# Include GICv3 driver files
+include drivers/arm/gic/v3/gicv3.mk
+
+MORELLO_GIC_SOURCES	:=	${GICV3_SOURCES}			\
 				plat/common/plat_gicv3.c		\
 				plat/arm/common/arm_gicv3.c		\
-				drivers/arm/gic/v3/gic600.c
 
 PLAT_BL_COMMON_SOURCES	:=	${MORELLO_BASE}/morello_plat.c		\
 				${MORELLO_BASE}/aarch64/morello_helper.S