aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMark Dykes <mardyk01@review.trustedfirmware.org>2020-02-25 21:08:21 +0000
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2020-02-25 21:08:21 +0000
commitad8922fcd915491587e86295b43b91d9d399407c (patch)
treea7687dfb90255304c17e53b6713d0e6eedaeadf4 /include
parentb857b833f67e3615e62e97352c1806adc0d94bbc (diff)
parent489e298744fa668bd46661237f81cd9ba05e3b4e (diff)
downloadplatform_external_arm-trusted-firmware-ad8922fcd915491587e86295b43b91d9d399407c.tar.gz
platform_external_arm-trusted-firmware-ad8922fcd915491587e86295b43b91d9d399407c.tar.bz2
platform_external_arm-trusted-firmware-ad8922fcd915491587e86295b43b91d9d399407c.zip
Merge "meson: Use generic console_t data structure" into integration
Diffstat (limited to 'include')
-rw-r--r--include/drivers/amlogic/meson_console.h9
1 files changed, 1 insertions, 8 deletions
diff --git a/include/drivers/amlogic/meson_console.h b/include/drivers/amlogic/meson_console.h
index 70e3b0bd4..8d52d794b 100644
--- a/include/drivers/amlogic/meson_console.h
+++ b/include/drivers/amlogic/meson_console.h
@@ -9,17 +9,10 @@
#include <drivers/console.h>
-#define CONSOLE_T_MESON_BASE CONSOLE_T_DRVDATA
-
#ifndef __ASSEMBLER__
#include <stdint.h>
-typedef struct {
- console_t console;
- uintptr_t base;
-} console_meson_t;
-
/*
* Initialize a new meson console instance and register it with the console
* framework. The |console| pointer must point to storage that will be valid
@@ -30,7 +23,7 @@ typedef struct {
* order to make this function future-proof.
*/
int console_meson_register(uintptr_t baseaddr, uint32_t clock, uint32_t baud,
- console_meson_t *console);
+ console_t *console);
#endif /*__ASSEMBLER__*/