Merge "uniphier: fix typo and coding style" into integration
diff --git a/plat/arm/board/sgm775/tsp/tsp-sgm775.mk b/plat/arm/board/sgm775/tsp/tsp-sgm775.mk
new file mode 100644
index 0000000..129b586
--- /dev/null
+++ b/plat/arm/board/sgm775/tsp/tsp-sgm775.mk
@@ -0,0 +1,7 @@
+#
+# Copyright (c) 2019, ARM Limited and Contributors. All rights reserved.
+#
+# SPDX-License-Identifier: BSD-3-Clause
+#
+
+include plat/arm/css/sgm/tsp/tsp-sgm.mk
\ No newline at end of file
diff --git a/plat/arm/css/sgm/include/sgm_base_platform_def.h b/plat/arm/css/sgm/include/sgm_base_platform_def.h
index 8581844..4ecfc96 100644
--- a/plat/arm/css/sgm/include/sgm_base_platform_def.h
+++ b/plat/arm/css/sgm/include/sgm_base_platform_def.h
@@ -134,11 +134,6 @@
#endif
/*
- * tspd support is conditional so enable this for CSS sgm platforms.
- */
-#define SPD_tspd
-
-/*
* PLAT_CSS_MAX_SCP_BL2_SIZE is calculated using the current
* SCP_BL2 size plus a little space for growth.
*/
diff --git a/plat/arm/css/sgm/tsp/tsp-sgm.mk b/plat/arm/css/sgm/tsp/tsp-sgm.mk
index a9e4131..de5e5b7 100644
--- a/plat/arm/css/sgm/tsp/tsp-sgm.mk
+++ b/plat/arm/css/sgm/tsp/tsp-sgm.mk
@@ -6,6 +6,6 @@
BL32_SOURCES += ${SGM_GIC_SOURCES} \
${CSS_SGM_BASE}/sgm_plat_config.c \
- plat/arm/board/sgm/tsp/sgm_tsp_setup.c
+ plat/arm/css/sgm/tsp/sgm_tsp_setup.c
include plat/arm/common/tsp/arm_tsp.mk
diff --git a/plat/rockchip/px30/platform.mk b/plat/rockchip/px30/platform.mk
index e947682..ee85cd3 100644
--- a/plat/rockchip/px30/platform.mk
+++ b/plat/rockchip/px30/platform.mk
@@ -30,11 +30,13 @@
plat/common/aarch64/crash_console_helpers.S \
${RK_PLAT}/common/rockchip_gicv2.c
-PLAT_BL_COMMON_SOURCES := lib/xlat_tables/xlat_tables_common.c \
+PLAT_BL_COMMON_SOURCES := lib/bl_aux_params/bl_aux_params.c \
+ lib/xlat_tables/xlat_tables_common.c \
lib/xlat_tables/aarch64/xlat_tables.c \
plat/common/plat_psci_common.c
BL31_SOURCES += ${RK_GIC_SOURCES} \
+ common/desc_image_load.c \
drivers/arm/cci/cci.c \
drivers/delay_timer/delay_timer.c \
drivers/delay_timer/generic_delay_timer.c \