Migrate platform makefile to new console driver location

This patch migrates the upstream platform makefiles to include the
console drivers from the new location in ARM Trusted Firmware code
base.

Change-Id: I866d6c4951e475de1f836ce8a8c1d5e6da9577e3

diff --git a/plat/arm/board/common/board_common.mk b/plat/arm/board/common/board_common.mk
index a5636d5e87d1e4e2812efaed486895c0262c36a3..3d5a985be0a64cb18f19d5248b8ba3e7bd2597f0 100644 (file)
--- a/plat/arm/board/common/board_common.mk
+++ b/plat/arm/board/common/board_common.mk
@@ -31,7 +31,7 @@
 PLAT_INCLUDES          +=      -Iinclude/plat/arm/board/common/                        \
                                -Iinclude/plat/arm/board/common/drivers
 
-PLAT_BL_COMMON_SOURCES +=      drivers/arm/pl011/pl011_console.S                       \
+PLAT_BL_COMMON_SOURCES +=      drivers/arm/pl011/aarch64/pl011_console.S               \
                                plat/arm/board/common/aarch64/board_arm_helpers.S
 
 BL1_SOURCES            +=      plat/arm/board/common/drivers/norflash/norflash.c

diff --git a/plat/mediatek/mt8173/platform.mk b/plat/mediatek/mt8173/platform.mk
index 8f4823040b7287ef9eb34d35481a72769c8c647f..c815110eac6c471a9f76d85cddd4ff3c8f0a8274 100644 (file)
--- a/plat/mediatek/mt8173/platform.mk
+++ b/plat/mediatek/mt8173/platform.mk
@@ -50,7 +50,7 @@ BL31_SOURCES          +=      drivers/arm/cci/cci.c                           \
                                drivers/arm/gic/arm_gic.c                       \
                                drivers/arm/gic/gic_v2.c                        \
                                drivers/arm/gic/gic_v3.c                        \
-                               drivers/console/console.S                       \
+                               drivers/console/aarch64/console.S               \
                                drivers/delay_timer/delay_timer.c               \
                                drivers/delay_timer/generic_delay_timer.c       \
                                lib/cpus/aarch64/aem_generic.S                  \

diff --git a/plat/nvidia/tegra/common/tegra_common.mk b/plat/nvidia/tegra/common/tegra_common.mk
index 03ca7732ae930335048c8909d22543ec913254a3..3c07032d355ae5bee8406b28cd4158352c6e336d 100644 (file)
--- a/plat/nvidia/tegra/common/tegra_common.mk
+++ b/plat/nvidia/tegra/common/tegra_common.mk
@@ -48,9 +48,9 @@ COMMON_DIR            :=      plat/nvidia/tegra/common
 
 BL31_SOURCES           +=      drivers/arm/gic/gic_v2.c                        \
                                drivers/arm/gic/gic_v3.c                        \
-                               drivers/console/console.S                       \
+                               drivers/console/aarch64/console.S               \
                                drivers/delay_timer/delay_timer.c               \
-                               drivers/ti/uart/16550_console.S                 \
+                               drivers/ti/uart/aarch64/16550_console.S         \
                                plat/common/aarch64/platform_mp_stack.S         \
                                plat/common/plat_psci_common.c                  \
                                ${COMMON_DIR}/aarch64/tegra_helpers.S           \

diff --git a/plat/qemu/platform.mk b/plat/qemu/platform.mk
index 95421989e379cab3f6670637e5c9d43578c9ebb0..aa08bd33ef145dc217ea18bb12985a5ad9f6b45c 100644 (file)
--- a/plat/qemu/platform.mk
+++ b/plat/qemu/platform.mk
@@ -37,7 +37,7 @@ PLAT_INCLUDES         :=      -Iinclude/plat/arm/common/              \
 
 
 PLAT_BL_COMMON_SOURCES :=      plat/qemu/qemu_common.c                 \
-                               drivers/arm/pl011/pl011_console.S       \
+                               drivers/arm/pl011/aarch64/pl011_console.S \
                                lib/xlat_tables/xlat_tables_common.c    \
                                lib/xlat_tables/aarch64/xlat_tables.c
 

diff --git a/plat/rockchip/rk3368/platform.mk b/plat/rockchip/rk3368/platform.mk
index 1dca4c5678c7aef9d59c897869cca2410ccca108..73a56e3422ecf0974969235091392c3461ba8b03 100644 (file)
--- a/plat/rockchip/rk3368/platform.mk
+++ b/plat/rockchip/rk3368/platform.mk
@@ -55,8 +55,8 @@ PLAT_BL_COMMON_SOURCES        :=      lib/xlat_tables/xlat_tables_common.c            \
 
 BL31_SOURCES           +=      ${RK_GIC_SOURCES}                               \
                                drivers/arm/cci/cci.c                           \
-                               drivers/console/console.S                       \
-                               drivers/ti/uart/16550_console.S                 \
+                               drivers/console/aarch64/console.S               \
+                               drivers/ti/uart/aarch64/16550_console.S         \
                                drivers/delay_timer/delay_timer.c               \
                                drivers/delay_timer/generic_delay_timer.c       \
                                lib/cpus/aarch64/cortex_a53.S                   \

diff --git a/plat/rockchip/rk3399/platform.mk b/plat/rockchip/rk3399/platform.mk
index 142fe9e22ecac15ed38ceb781150c511846994bd..a3bb426c20c04ddc3bdee16172b0524432f368d7 100644 (file)
--- a/plat/rockchip/rk3399/platform.mk
+++ b/plat/rockchip/rk3399/platform.mk
@@ -54,8 +54,8 @@ PLAT_BL_COMMON_SOURCES  :=    lib/xlat_tables/xlat_tables_common.c            \
 
 BL31_SOURCES            +=      ${RK_GIC_SOURCES}                               \
                                 drivers/arm/cci/cci.c                           \
-                                drivers/console/console.S                       \
-                                drivers/ti/uart/16550_console.S                 \
+                                drivers/console/aarch64/console.S              \
+                                drivers/ti/uart/aarch64/16550_console.S                \
                                 drivers/delay_timer/delay_timer.c               \
                                 drivers/delay_timer/generic_delay_timer.c      \
                                drivers/gpio/gpio.c                             \

diff --git a/plat/xilinx/zynqmp/platform.mk b/plat/xilinx/zynqmp/platform.mk
index fe939c759d9d28038a410772e3c9bce05231af27..9bde5ff661c5a184bdc36ac3744f842be4e011e8 100644 (file)
--- a/plat/xilinx/zynqmp/platform.mk
+++ b/plat/xilinx/zynqmp/platform.mk
@@ -67,8 +67,8 @@ PLAT_BL_COMMON_SOURCES        :=      lib/xlat_tables/xlat_tables_common.c            \
                                drivers/arm/gic/common/gic_common.c             \
                                drivers/arm/gic/v2/gicv2_main.c                 \
                                drivers/arm/gic/v2/gicv2_helpers.c              \
-                               drivers/cadence/uart/cdns_console.S             \
-                               drivers/console/console.S                       \
+                               drivers/cadence/uart/aarch64/cdns_console.S     \
+                               drivers/console/aarch64/console.S               \
                                plat/arm/common/aarch64/arm_helpers.S           \
                                plat/arm/common/arm_cci.c                       \
                                plat/arm/common/arm_common.c                    \