diff options
| author | danh-arm <dan.handley@arm.com> | 2014-04-22 11:02:13 +0100 |
|---|---|---|
| committer | danh-arm <dan.handley@arm.com> | 2014-04-22 11:02:13 +0100 |
| commit | 12ae170e24f521420169d03da69c2965dc511e43 (patch) | |
| tree | d2148dc6ef70728fdd47f595d98dcb6b0c3b1008 | |
| parent | bc1a42b7c26beae06b672e5d3e51223592410ee6 (diff) | |
| parent | d72f6e31b0b2b45c087ff7baf437f03b0d57a882 (diff) | |
Merge pull request #43 from danh-arm/dh/tf-issues#129
Move console.c to pl011 specific driver location
| -rw-r--r-- | drivers/arm/peripherals/pl011/pl011_console.c (renamed from drivers/console/console.c) | 0 | ||||
| -rw-r--r-- | plat/fvp/platform.mk | 5 |
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/console/console.c b/drivers/arm/peripherals/pl011/pl011_console.c index 1a684ff6..1a684ff6 100644 --- a/drivers/console/console.c +++ b/drivers/arm/peripherals/pl011/pl011_console.c diff --git a/plat/fvp/platform.mk b/plat/fvp/platform.mk index 3a918e9b..36090f20 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 \ |