diff options
author | Paul Beesley <paul.beesley@arm.com> | 2019-06-28 11:04:02 +0000 |
---|---|---|
committer | TrustedFirmware Code Review <review@review.trustedfirmware.org> | 2019-06-28 11:04:02 +0000 |
commit | 39c92b6271f4bde4e84f2459dbc18228cedd7825 (patch) | |
tree | 93ee53f056c6fc9a1ca7d0e03c892aa859ea6877 /plat/arm | |
parent | e54b4dd9da3a8e19df497ed6a42a66fa8ec54789 (diff) | |
parent | e6ffc254a9da9ca4623f94903e92e363d30f3d63 (diff) |
Merge changes from topic "av/console-port" into integration
* changes:
qemu: use new console interface in aarch32
warp7: remove old console from makefile
Remove MULTI_CONSOLE_API flag and references to it
Console: removed legacy console API
Diffstat (limited to 'plat/arm')
-rw-r--r-- | plat/arm/board/fvp_ve/platform.mk | 2 | ||||
-rw-r--r-- | plat/arm/common/arm_bl31_setup.c | 4 | ||||
-rw-r--r-- | plat/arm/common/arm_common.mk | 3 | ||||
-rw-r--r-- | plat/arm/common/arm_console.c | 23 | ||||
-rw-r--r-- | plat/arm/common/tsp/arm_tsp_setup.c | 7 |
5 files changed, 0 insertions, 39 deletions
diff --git a/plat/arm/board/fvp_ve/platform.mk b/plat/arm/board/fvp_ve/platform.mk index f9ced2cc..f85452da 100644 --- a/plat/arm/board/fvp_ve/platform.mk +++ b/plat/arm/board/fvp_ve/platform.mk @@ -106,8 +106,6 @@ endif $(eval $(call assert_boolean,ARM_XLAT_TABLES_LIB_V1)) $(eval $(call add_define,ARM_XLAT_TABLES_LIB_V1)) -MULTI_CONSOLE_API := 1 - ifeq (${ARM_XLAT_TABLES_LIB_V1}, 1) # Only use nonlpae version of xlatv1 otherwise use xlat v2 PLAT_BL_COMMON_SOURCES += lib/xlat_tables/${ARCH}/nonlpae_tables.c diff --git a/plat/arm/common/arm_bl31_setup.c b/plat/arm/common/arm_bl31_setup.c index 8e1a2630..ab90f46a 100644 --- a/plat/arm/common/arm_bl31_setup.c +++ b/plat/arm/common/arm_bl31_setup.c @@ -240,11 +240,7 @@ void arm_bl31_platform_setup(void) ******************************************************************************/ void arm_bl31_plat_runtime_setup(void) { -#if MULTI_CONSOLE_API console_switch_state(CONSOLE_FLAG_RUNTIME); -#else - console_uninit(); -#endif /* Initialize the runtime console */ arm_console_runtime_init(); diff --git a/plat/arm/common/arm_common.mk b/plat/arm/common/arm_common.mk index c3d9e030..10b6e512 100644 --- a/plat/arm/common/arm_common.mk +++ b/plat/arm/common/arm_common.mk @@ -125,9 +125,6 @@ ENABLE_PMF := 1 # mapping the former as executable and the latter as execute-never. SEPARATE_CODE_AND_RODATA := 1 -# Use the multi console API, which is only available for AArch64 for now -MULTI_CONSOLE_API := 1 - # Disable ARM Cryptocell by default ARM_CRYPTOCELL_INTEG := 0 $(eval $(call assert_boolean,ARM_CRYPTOCELL_INTEG)) diff --git a/plat/arm/common/arm_console.c b/plat/arm/common/arm_console.c index 580b2ee0..123811d7 100644 --- a/plat/arm/common/arm_console.c +++ b/plat/arm/common/arm_console.c @@ -16,15 +16,12 @@ /******************************************************************************* * Functions that set up the console ******************************************************************************/ -#if MULTI_CONSOLE_API static console_pl011_t arm_boot_console; static console_pl011_t arm_runtime_console; -#endif /* Initialize the console to provide early debug support */ void __init arm_console_boot_init(void) { -#if MULTI_CONSOLE_API int rc = console_pl011_register(PLAT_ARM_BOOT_UART_BASE, PLAT_ARM_BOOT_UART_CLK_IN_HZ, ARM_CONSOLE_BAUDRATE, @@ -39,28 +36,17 @@ void __init arm_console_boot_init(void) } console_set_scope(&arm_boot_console.console, CONSOLE_FLAG_BOOT); -#else - (void)console_init(PLAT_ARM_BOOT_UART_BASE, - PLAT_ARM_BOOT_UART_CLK_IN_HZ, - ARM_CONSOLE_BAUDRATE); -#endif /* MULTI_CONSOLE_API */ } void arm_console_boot_end(void) { (void)console_flush(); - -#if MULTI_CONSOLE_API (void)console_unregister(&arm_boot_console.console); -#else - console_uninit(); -#endif /* MULTI_CONSOLE_API */ } /* Initialize the runtime console */ void arm_console_runtime_init(void) { -#if MULTI_CONSOLE_API int rc = console_pl011_register(PLAT_ARM_RUN_UART_BASE, PLAT_ARM_RUN_UART_CLK_IN_HZ, ARM_CONSOLE_BAUDRATE, @@ -69,18 +55,9 @@ void arm_console_runtime_init(void) panic(); console_set_scope(&arm_runtime_console.console, CONSOLE_FLAG_RUNTIME); -#else - (void)console_init(PLAT_ARM_RUN_UART_BASE, - PLAT_ARM_RUN_UART_CLK_IN_HZ, - ARM_CONSOLE_BAUDRATE); -#endif /* MULTI_CONSOLE_API */ } void arm_console_runtime_end(void) { (void)console_flush(); - -#if !MULTI_CONSOLE_API - console_uninit(); -#endif /* !MULTI_CONSOLE_API */ } diff --git a/plat/arm/common/tsp/arm_tsp_setup.c b/plat/arm/common/tsp/arm_tsp_setup.c index a3dfa1e1..aefdf89c 100644 --- a/plat/arm/common/tsp/arm_tsp_setup.c +++ b/plat/arm/common/tsp/arm_tsp_setup.c @@ -28,13 +28,10 @@ /******************************************************************************* * Initialize the UART ******************************************************************************/ -#if MULTI_CONSOLE_API static console_pl011_t arm_tsp_runtime_console; -#endif void arm_tsp_early_platform_setup(void) { -#if MULTI_CONSOLE_API /* * Initialize a different console than already in use to display * messages from TSP @@ -48,10 +45,6 @@ void arm_tsp_early_platform_setup(void) console_set_scope(&arm_tsp_runtime_console.console, CONSOLE_FLAG_BOOT | CONSOLE_FLAG_RUNTIME); -#else - console_init(PLAT_ARM_TSP_UART_BASE, PLAT_ARM_TSP_UART_CLK_IN_HZ, - ARM_CONSOLE_BAUDRATE); -#endif /* MULTI_CONSOLE_API */ } void tsp_early_platform_setup(void) |