Tegra: include flowctlr driver from SoC specific makefiles

The Flow Controller hardware block is not present across all Tegra
SoCs, hence include the driver files from SoC specific makefiles.

T132/T210 are the SoCs which include this hardware block while future
SoCs have removed it.

Change-Id: Iaca25766a4fa51567293d10cf14dae968b0fae80
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>

diff --git a/plat/nvidia/tegra/common/tegra_common.mk b/plat/nvidia/tegra/common/tegra_common.mk
index 3c07032d355ae5bee8406b28cd4158352c6e336d..2b4a2471f5a6cdd52dcaf5d805a0e02cf6718b97 100644 (file)
--- a/plat/nvidia/tegra/common/tegra_common.mk
+++ b/plat/nvidia/tegra/common/tegra_common.mk
@@ -56,7 +56,6 @@ BL31_SOURCES          +=      drivers/arm/gic/gic_v2.c                        \
                                ${COMMON_DIR}/aarch64/tegra_helpers.S           \
                                ${COMMON_DIR}/drivers/memctrl/memctrl.c         \
                                ${COMMON_DIR}/drivers/pmc/pmc.c                 \
-                               ${COMMON_DIR}/drivers/flowctrl/flowctrl.c       \
                                ${COMMON_DIR}/tegra_bl31_setup.c                \
                                ${COMMON_DIR}/tegra_delay_timer.c               \
                                ${COMMON_DIR}/tegra_gic.c                       \

diff --git a/plat/nvidia/tegra/soc/t132/platform_t132.mk b/plat/nvidia/tegra/soc/t132/platform_t132.mk
index 69d62964fe9b08482b9085ece50fbee8ff2a23b0..64db8c0873d9d3ad0baa1dd1d741c03eeb054c55 100644 (file)
--- a/plat/nvidia/tegra/soc/t132/platform_t132.mk
+++ b/plat/nvidia/tegra/soc/t132/platform_t132.mk
@@ -41,6 +41,7 @@ PLATFORM_MAX_CPUS_PER_CLUSTER := 2
 $(eval $(call add_define,PLATFORM_MAX_CPUS_PER_CLUSTER))
 
 BL31_SOURCES           +=      lib/cpus/aarch64/denver.S               \
+                               ${COMMON_DIR}/drivers/flowctrl/flowctrl.c       \
                                ${SOC_DIR}/plat_psci_handlers.c         \
                                ${SOC_DIR}/plat_setup.c                 \
                                ${SOC_DIR}/plat_secondary.c

diff --git a/plat/nvidia/tegra/soc/t210/platform_t210.mk b/plat/nvidia/tegra/soc/t210/platform_t210.mk
index 5001629d42a1bf73db29fbaf1d2e437966289154..f58baaf4a57e81cc1d838cfe8ce505fd6c067ea4 100644 (file)
--- a/plat/nvidia/tegra/soc/t210/platform_t210.mk
+++ b/plat/nvidia/tegra/soc/t210/platform_t210.mk
@@ -54,6 +54,7 @@ $(eval $(call add_define,PLATFORM_MAX_CPUS_PER_CLUSTER))
 
 BL31_SOURCES           +=      lib/cpus/aarch64/cortex_a53.S           \
                                lib/cpus/aarch64/cortex_a57.S           \
+                               ${COMMON_DIR}/drivers/flowctrl/flowctrl.c       \
                                ${SOC_DIR}/plat_psci_handlers.c         \
                                ${SOC_DIR}/plat_setup.c                 \
                                ${SOC_DIR}/plat_secondary.c