diff options
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 |