diff options
| author | Soby Mathew <soby.mathew@arm.com> | 2018-12-10 14:00:01 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-10 14:00:01 +0000 |
| commit | 85456a92015f00c397fcc09cc81886f2a5fde18c (patch) | |
| tree | 4f8fcb9001f879a38e9fb052676532b23b30f52f /drivers/arm | |
| parent | f7ed4ab07a169d45a5f8375198a4fa5f3f3cd02b (diff) | |
| parent | 65d8582b32865f8be772ac56ab8c9ac9cd3d3035 (diff) | |
| download | platform_external_arm-trusted-firmware-85456a92015f00c397fcc09cc81886f2a5fde18c.tar.gz platform_external_arm-trusted-firmware-85456a92015f00c397fcc09cc81886f2a5fde18c.tar.bz2 platform_external_arm-trusted-firmware-85456a92015f00c397fcc09cc81886f2a5fde18c.zip | |
Merge pull request #1700 from jwerner-chromium/JW_crashfix
MULTI_CONSOLE_API fixes and cleanups
Diffstat (limited to 'drivers/arm')
| -rw-r--r-- | drivers/arm/pl011/aarch32/pl011_console.S | 2 | ||||
| -rw-r--r-- | drivers/arm/pl011/aarch64/pl011_console.S | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/arm/pl011/aarch32/pl011_console.S b/drivers/arm/pl011/aarch32/pl011_console.S index 46ff22587..5d6b95fe3 100644 --- a/drivers/arm/pl011/aarch32/pl011_console.S +++ b/drivers/arm/pl011/aarch32/pl011_console.S @@ -10,11 +10,13 @@ #include <console_macros.S> #include <pl011.h> +#if !MULTI_CONSOLE_API /* * Pull in generic functions to provide backwards compatibility for * platform makefiles */ #include "../../../console/aarch32/console.S" +#endif /* * "core" functions are low-level implementations that don't require diff --git a/drivers/arm/pl011/aarch64/pl011_console.S b/drivers/arm/pl011/aarch64/pl011_console.S index 3886f3b77..7fec0904d 100644 --- a/drivers/arm/pl011/aarch64/pl011_console.S +++ b/drivers/arm/pl011/aarch64/pl011_console.S @@ -10,11 +10,13 @@ #include <console_macros.S> #include <pl011.h> +#if !MULTI_CONSOLE_API /* * Pull in generic functions to provide backwards compatibility for * platform makefiles */ #include "../../../console/aarch64/console.S" +#endif /* * "core" functions are low-level implementations that don't require |