aboutsummaryrefslogtreecommitdiffstats
path: root/plat
diff options
context:
space:
mode:
authorAndre Przywara <andre.przywara@arm.com>2020-01-25 00:58:35 +0000
committerAndre Przywara <andre.przywara@arm.com>2020-02-25 09:34:38 +0000
commitc10db6deb1867d79c843391b29866a8119bc85b3 (patch)
treebdb59012aa5294b5cfc56a1b1cca116167ba33fd /plat
parentc01ee06b53451d8792958b30b8ebce3e0e930359 (diff)
downloadplatform_external_arm-trusted-firmware-c10db6deb1867d79c843391b29866a8119bc85b3.tar.gz
platform_external_arm-trusted-firmware-c10db6deb1867d79c843391b29866a8119bc85b3.tar.bz2
platform_external_arm-trusted-firmware-c10db6deb1867d79c843391b29866a8119bc85b3.zip
stm32: Use generic console_t data structure
Since now the generic console_t structure holds the UART base address as well, let's use that generic location and drop the UART driver specific data structure at all. Change-Id: Iea6ca26ff4903c33f0fad27fec96fdbabd4e0a91 Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Diffstat (limited to 'plat')
-rw-r--r--plat/st/stm32mp1/bl2_plat_setup.c4
-rw-r--r--plat/st/stm32mp1/sp_min/sp_min_setup.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/plat/st/stm32mp1/bl2_plat_setup.c b/plat/st/stm32mp1/bl2_plat_setup.c
index d9e29b4e8..024dbe076 100644
--- a/plat/st/stm32mp1/bl2_plat_setup.c
+++ b/plat/st/stm32mp1/bl2_plat_setup.c
@@ -31,7 +31,7 @@
#include <stm32mp1_context.h>
#include <stm32mp1_dbgmcu.h>
-static struct console_stm32 console;
+static console_t console;
static struct stm32mp_auth_ops stm32mp1_auth_ops;
static void print_reset_reason(void)
@@ -273,7 +273,7 @@ void bl2_el3_plat_arch_setup(void)
panic();
}
- console_set_scope(&console.console, CONSOLE_FLAG_BOOT |
+ console_set_scope(&console, CONSOLE_FLAG_BOOT |
CONSOLE_FLAG_CRASH | CONSOLE_FLAG_TRANSLATE_CRLF);
stm32mp_print_cpuinfo();
diff --git a/plat/st/stm32mp1/sp_min/sp_min_setup.c b/plat/st/stm32mp1/sp_min/sp_min_setup.c
index e10dfbfc0..4e74c275d 100644
--- a/plat/st/stm32mp1/sp_min/sp_min_setup.c
+++ b/plat/st/stm32mp1/sp_min/sp_min_setup.c
@@ -35,7 +35,7 @@
******************************************************************************/
static entry_point_info_t bl33_image_ep_info;
-static struct console_stm32 console;
+static console_t console;
/*******************************************************************************
* Interrupt handler for FIQ (secure IRQ)
@@ -142,7 +142,7 @@ void sp_min_early_platform_setup2(u_register_t arg0, u_register_t arg1,
#ifdef DEBUG
console_flags |= CONSOLE_FLAG_RUNTIME;
#endif
- console_set_scope(&console.console, console_flags);
+ console_set_scope(&console, console_flags);
}
}