Tegra: console driver compilation from platform makefiles

This patch includes the console driver from individual platform
makefiles and removes it from tegra_common.mk. This allows future
platforms to include consoles of their choice.

Change-Id: I7506562bfac78421a80fb6782ac8472fbef6cfb0
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 9428f43a717c05621542d6c5efaf1066959ca2cb..d9eec4d37c0701510fd4d87be10710a062584142 100644 (file)
--- a/plat/nvidia/tegra/common/tegra_common.mk
+++ b/plat/nvidia/tegra/common/tegra_common.mk
@@ -22,7 +22,6 @@ TEGRA_GICv2_SOURCES   :=      drivers/arm/gic/common/gic_common.c             \
 
 BL31_SOURCES           +=      drivers/console/aarch64/console.S               \
                                drivers/delay_timer/delay_timer.c               \
-                               drivers/ti/uart/aarch64/16550_console.S         \
                                ${TEGRA_GICv2_SOURCES}                          \
                                ${COMMON_DIR}/aarch64/tegra_helpers.S           \
                                ${COMMON_DIR}/drivers/pmc/pmc.c                 \

diff --git a/plat/nvidia/tegra/soc/t132/platform_t132.mk b/plat/nvidia/tegra/soc/t132/platform_t132.mk
index f15ee747b3427100a5ad25a75adb0c379709c18a..bb7b7ee6615db74418b0993ef84b5a4703f8ede6 100644 (file)
--- a/plat/nvidia/tegra/soc/t132/platform_t132.mk
+++ b/plat/nvidia/tegra/soc/t132/platform_t132.mk
@@ -19,7 +19,8 @@ $(eval $(call add_define,MAX_XLAT_TABLES))
 MAX_MMAP_REGIONS               := 8
 $(eval $(call add_define,MAX_MMAP_REGIONS))
 
-BL31_SOURCES           +=      lib/cpus/aarch64/denver.S               \
+BL31_SOURCES           +=      drivers/ti/uart/aarch64/16550_console.S         \
+                               lib/cpus/aarch64/denver.S               \
                                ${COMMON_DIR}/drivers/flowctrl/flowctrl.c       \
                                ${COMMON_DIR}/drivers/memctrl/memctrl_v1.c      \
                                ${SOC_DIR}/plat_psci_handlers.c         \

diff --git a/plat/nvidia/tegra/soc/t186/platform_t186.mk b/plat/nvidia/tegra/soc/t186/platform_t186.mk
index 9dae8cd672dcc481714af3e39933008c81017347..643443529e62cf85fed58421e95a516107335589 100644 (file)
--- a/plat/nvidia/tegra/soc/t186/platform_t186.mk
+++ b/plat/nvidia/tegra/soc/t186/platform_t186.mk
@@ -45,7 +45,8 @@ $(eval $(call add_define,MAX_MMAP_REGIONS))
 # platform files
 PLAT_INCLUDES          +=      -I${SOC_DIR}/drivers/include
 
-BL31_SOURCES           +=      lib/cpus/aarch64/denver.S               \
+BL31_SOURCES           +=      drivers/ti/uart/aarch64/16550_console.S \
+                               lib/cpus/aarch64/denver.S               \
                                lib/cpus/aarch64/cortex_a57.S           \
                                ${COMMON_DIR}/drivers/gpcdma/gpcdma.c   \
                                ${COMMON_DIR}/drivers/memctrl/memctrl_v2.c \

diff --git a/plat/nvidia/tegra/soc/t210/platform_t210.mk b/plat/nvidia/tegra/soc/t210/platform_t210.mk
index b8dbf183635fedc5c90a03caa550d7396ba7fc2f..e23d7e360b6f1fef6d1f54e7e1046e0d16516142 100644 (file)
--- a/plat/nvidia/tegra/soc/t210/platform_t210.mk
+++ b/plat/nvidia/tegra/soc/t210/platform_t210.mk
@@ -24,9 +24,10 @@ $(eval $(call add_define,MAX_MMAP_REGIONS))
 
 PLAT_INCLUDES          +=      -I${SOC_DIR}/drivers/se
 
-BL31_SOURCES           +=      lib/cpus/aarch64/cortex_a53.S                   \
+BL31_SOURCES           +=      drivers/ti/uart/aarch64/16550_console.S         \
+                               lib/cpus/aarch64/cortex_a53.S                   \
                                lib/cpus/aarch64/cortex_a57.S                   \
-                               ${COMMON_DIR}/drivers/bpmp/bpmp.c       \
+                               ${COMMON_DIR}/drivers/bpmp/bpmp.c               \
                                ${COMMON_DIR}/drivers/flowctrl/flowctrl.c       \
                                ${COMMON_DIR}/drivers/memctrl/memctrl_v1.c      \
                                ${SOC_DIR}/plat_psci_handlers.c                 \