diff options
| author | Ambroise Vincent <ambroise.vincent@arm.com> | 2019-04-04 09:13:28 +0100 |
|---|---|---|
| committer | Ambroise Vincent <ambroise.vincent@arm.com> | 2019-06-28 10:52:48 +0100 |
| commit | 5b6ebeec9c99f8d6a539d3b15e5dfb827891174a (patch) | |
| tree | 1e72bd9f7afdc361596977491a88e6ee89176658 /plat/common | |
| parent | 51e24ec2c6f4d72df50cf62766311f3773d4e117 (diff) | |
Remove MULTI_CONSOLE_API flag and references to it
The new API becomes the default one.
Change-Id: Ic1d602da3dff4f4ebbcc158b885295c902a24fec
Signed-off-by: Ambroise Vincent <ambroise.vincent@arm.com>
Diffstat (limited to 'plat/common')
| -rw-r--r-- | plat/common/aarch32/crash_console_helpers.S | 24 | ||||
| -rw-r--r-- | plat/common/aarch32/plat_sp_min_common.c | 4 | ||||
| -rw-r--r-- | plat/common/aarch64/crash_console_helpers.S | 4 | ||||
| -rw-r--r-- | plat/common/aarch64/plat_common.c | 4 |
4 files changed, 0 insertions, 36 deletions
diff --git a/plat/common/aarch32/crash_console_helpers.S b/plat/common/aarch32/crash_console_helpers.S index c9ad12cc..ea04f56b 100644 --- a/plat/common/aarch32/crash_console_helpers.S +++ b/plat/common/aarch32/crash_console_helpers.S @@ -16,8 +16,6 @@ .globl plat_crash_console_putc .globl plat_crash_console_flush -#if MULTI_CONSOLE_API - /* ----------------------------------------------------- * int plat_crash_console_init(void) * Use normal console by default. Switch it to crash @@ -68,25 +66,3 @@ endfunc plat_crash_console_putc func plat_crash_console_flush b console_flush endfunc plat_crash_console_flush - -#else /* MULTI_CONSOLE_API */ - - /* ----------------------------------------------------- - * In the old API these are all no-op stubs that need to - * be overridden by the platform to be useful. - * ----------------------------------------------------- - */ -func plat_crash_console_init - mov r0, #0 - bx lr -endfunc plat_crash_console_init - -func plat_crash_console_putc - bx lr -endfunc plat_crash_console_putc - -func plat_crash_console_flush - bx lr -endfunc plat_crash_console_flush - -#endif diff --git a/plat/common/aarch32/plat_sp_min_common.c b/plat/common/aarch32/plat_sp_min_common.c index 3bc84b1a..94935873 100644 --- a/plat/common/aarch32/plat_sp_min_common.c +++ b/plat/common/aarch32/plat_sp_min_common.c @@ -21,9 +21,5 @@ void sp_min_plat_runtime_setup(void) * Finish the use of console driver in SP_MIN so that any runtime logs * from SP_MIN will be suppressed. */ -#if MULTI_CONSOLE_API console_switch_state(CONSOLE_FLAG_RUNTIME); -#else - console_uninit(); -#endif } diff --git a/plat/common/aarch64/crash_console_helpers.S b/plat/common/aarch64/crash_console_helpers.S index 491a99d3..2a48baf0 100644 --- a/plat/common/aarch64/crash_console_helpers.S +++ b/plat/common/aarch64/crash_console_helpers.S @@ -16,10 +16,6 @@ .globl plat_crash_console_putc .globl plat_crash_console_flush -#if !MULTI_CONSOLE_API -#error "This crash console implementation only works with the MULTI_CONSOLE_API!" -#endif - /* * Spinlock to syncronize access to crash_console_triggered. We cannot * acquire spinlocks when the cache is disabled, so in some cases (like diff --git a/plat/common/aarch64/plat_common.c b/plat/common/aarch64/plat_common.c index 1424c789..f8d31295 100644 --- a/plat/common/aarch64/plat_common.c +++ b/plat/common/aarch64/plat_common.c @@ -30,11 +30,7 @@ void bl31_plat_runtime_setup(void) { -#if MULTI_CONSOLE_API console_switch_state(CONSOLE_FLAG_RUNTIME); -#else - console_uninit(); -#endif } /* |