From d72f6e31b0b2b45c087ff7baf437f03b0d57a882 Mon Sep 17 00:00:00 2001
From: Dan Handley <dan.handley@arm.com>
Date: Mon, 14 Apr 2014 17:03:01 +0100
Subject: [PATCH] Move console.c to pl011 specific driver location
Rename drivers/console/console.c to
drivers/arm/peripherals/pl011/pl011_console.c. This makes it clear
that this is a pl011 specific console implementation.
Fixes ARM-software/tf-issues#129
Change-Id: Ie2f8109602134c5b86993e32452c70734c45a3ed
---
.../console.c => arm/peripherals/pl011/pl011_console.c} | 0
plat/fvp/platform.mk | 5 +----
2 files changed, 1 insertion(+), 4 deletions(-)
rename drivers/{console/console.c => arm/peripherals/pl011/pl011_console.c} (100%)
diff --git a/drivers/console/console.c b/drivers/arm/peripherals/pl011/pl011_console.c
similarity index 100%
rename from drivers/console/console.c
rename to drivers/arm/peripherals/pl011/pl011_console.c
diff --git a/plat/fvp/platform.mk b/plat/fvp/platform.mk
index e8de0986e..e3b484852 100644
--- a/plat/fvp/platform.mk
+++ b/plat/fvp/platform.mk
@@ -34,7 +34,6 @@ PLAT_INCLUDES := -Idrivers/arm/interconnect/cci-400 \
-Idrivers/power
PLAT_BL1_C_VPATH := drivers/arm/interconnect/cci-400 \
- drivers/console \
drivers/arm/peripherals/pl011 \
lib/arch/${ARCH} \
lib/semihosting \
@@ -44,7 +43,6 @@ PLAT_BL1_C_VPATH := drivers/arm/interconnect/cci-400 \
PLAT_BL1_S_VPATH := lib/semihosting/${ARCH}
PLAT_BL2_C_VPATH := drivers/arm/interconnect/cci-400 \
- drivers/console \
drivers/arm/peripherals/pl011 \
lib/arch/${ARCH} \
lib/stdlib \
@@ -54,7 +52,6 @@ PLAT_BL2_C_VPATH := drivers/arm/interconnect/cci-400 \
PLAT_BL2_S_VPATH := lib/semihosting/${ARCH}
PLAT_BL31_C_VPATH := drivers/arm/interconnect/cci-400 \
- drivers/console \
drivers/arm/peripherals/pl011 \
lib/arch/${ARCH} \
lib/semihosting \
@@ -66,7 +63,7 @@ PLAT_BL31_S_VPATH := lib/semihosting/${ARCH}
PLAT_BL_COMMON_SOURCES := semihosting_call.S \
mmio.c \
- console.c \
+ pl011_console.c \
pl011.c \
semihosting.c \
sysreg_helpers.S \
--
GitLab