Include `plat_psci_common.c` from the new location

The `plat_psci_common.c` was moved to the new location `plat/common`
and a stub file was retained at previous location for compatibility. This
patch modifies the platform makefiles to include the file from the new
location.

Change-Id: Iabddeeb824e9a5d72d176d7c644735966c8c0699

diff --git a/plat/arm/common/arm_common.mk b/plat/arm/common/arm_common.mk
index 9e5ddea7703c68d748e6dd108793262ab7f96699..249a40684d80eb7bb0fdba6f07725636b98aaf5b 100644 (file)
--- a/plat/arm/common/arm_common.mk
+++ b/plat/arm/common/arm_common.mk
@@ -128,7 +128,7 @@ BL31_SOURCES                +=      plat/arm/common/arm_bl31_setup.c                \
                                plat/arm/common/arm_pm.c                        \
                                plat/arm/common/arm_topology.c                  \
                                plat/common/aarch64/platform_mp_stack.S         \
-                               plat/common/aarch64/plat_psci_common.c
+                               plat/common/plat_psci_common.c
 
 ifneq (${TRUSTED_BOARD_BOOT},0)
 

diff --git a/plat/compat/plat_compat.mk b/plat/compat/plat_compat.mk
index c0c8ecef1d687f63d2c7a284b65270cc0d7427bb..d9d50f6e0027f2f88d689935845f716523e48beb 100644 (file)
--- a/plat/compat/plat_compat.mk
+++ b/plat/compat/plat_compat.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, ARM Limited and Contributors. All rights reserved.
+# Copyright (c) 2015-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:
@@ -36,6 +36,6 @@ endif
 
 PLAT_BL_COMMON_SOURCES +=      plat/compat/aarch64/plat_helpers_compat.S
 
-BL31_SOURCES           +=      plat/common/aarch64/plat_psci_common.c  \
+BL31_SOURCES           +=      plat/common/plat_psci_common.c          \
                                plat/compat/plat_pm_compat.c            \
                                plat/compat/plat_topology_compat.c

diff --git a/plat/nvidia/tegra/common/tegra_common.mk b/plat/nvidia/tegra/common/tegra_common.mk
index 2ecf5f5e799d7d558f6fe6e6bb4b674be9085956..03ca7732ae930335048c8909d22543ec913254a3 100644 (file)
--- a/plat/nvidia/tegra/common/tegra_common.mk
+++ b/plat/nvidia/tegra/common/tegra_common.mk
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2015, ARM Limited and Contributors. All rights reserved.
+# Copyright (c) 2015-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:
@@ -52,7 +52,7 @@ BL31_SOURCES          +=      drivers/arm/gic/gic_v2.c                        \
                                drivers/delay_timer/delay_timer.c               \
                                drivers/ti/uart/16550_console.S                 \
                                plat/common/aarch64/platform_mp_stack.S         \
-                               plat/common/aarch64/plat_psci_common.c          \
+                               plat/common/plat_psci_common.c                  \
                                ${COMMON_DIR}/aarch64/tegra_helpers.S           \
                                ${COMMON_DIR}/drivers/memctrl/memctrl.c         \
                                ${COMMON_DIR}/drivers/pmc/pmc.c                 \

diff --git a/plat/rockchip/rk3368/platform.mk b/plat/rockchip/rk3368/platform.mk
index 50eda3223d0e2f9610fd65e9737fee932a1cce46..c9ec56421eb4970da8da0a0510a4bd4578a1453a 100644 (file)
--- a/plat/rockchip/rk3368/platform.mk
+++ b/plat/rockchip/rk3368/platform.mk
@@ -51,7 +51,7 @@ RK_GIC_SOURCES         :=     drivers/arm/gic/common/gic_common.c             \
 PLAT_BL_COMMON_SOURCES :=      lib/xlat_tables/xlat_tables_common.c            \
                                lib/xlat_tables/aarch64/xlat_tables.c           \
                                plat/common/aarch64/plat_common.c               \
-                               plat/common/aarch64/plat_psci_common.c
+                               plat/common/plat_psci_common.c
 
 BL31_SOURCES           +=      ${RK_GIC_SOURCES}                               \
                                drivers/arm/cci/cci.c                           \

diff --git a/plat/rockchip/rk3399/platform.mk b/plat/rockchip/rk3399/platform.mk
index b0ce56f3af44f0ac85db4cf438df2032e43e911c..dc544f8d3aa6570d34d4c6fad078c4f08ddb3e67 100644 (file)
--- a/plat/rockchip/rk3399/platform.mk
+++ b/plat/rockchip/rk3399/platform.mk
@@ -50,7 +50,7 @@ RK_GIC_SOURCES          :=      drivers/arm/gic/common/gic_common.c     \
 PLAT_BL_COMMON_SOURCES  :=     lib/xlat_tables/xlat_tables_common.c            \
                                lib/xlat_tables/aarch64/xlat_tables.c           \
                                 plat/common/aarch64/plat_common.c               \
-                               plat/common/aarch64/plat_psci_common.c
+                               plat/common/plat_psci_common.c
 
 BL31_SOURCES            +=      ${RK_GIC_SOURCES}                               \
                                 drivers/arm/cci/cci.c                           \

diff --git a/plat/xilinx/zynqmp/platform.mk b/plat/xilinx/zynqmp/platform.mk
index ad87cd94089cf80abd2af518e3c78cf930d1d410..b27586f77627ad97d8e5856f8a0594dae8deb503 100644 (file)
--- a/plat/xilinx/zynqmp/platform.mk
+++ b/plat/xilinx/zynqmp/platform.mk
@@ -80,7 +80,7 @@ PLAT_BL_COMMON_SOURCES        :=      lib/xlat_tables/xlat_tables_common.c            \
 BL31_SOURCES           +=      drivers/arm/cci/cci.c                           \
                                lib/cpus/aarch64/aem_generic.S                  \
                                lib/cpus/aarch64/cortex_a53.S                   \
-                               plat/common/aarch64/plat_psci_common.c          \
+                               plat/common/plat_psci_common.c                  \
                                plat/common/aarch64/platform_mp_stack.S         \
                                plat/xilinx/zynqmp/bl31_zynqmp_setup.c          \
                                plat/xilinx/zynqmp/plat_psci.c                  \