diff options
| author | Alistair Delva <adelva@google.com> | 2021-02-16 21:01:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-02-16 21:01:22 +0000 |
| commit | efb2826bb8160e2d8e0fcec85133a7468484f9fd (patch) | |
| tree | 37a21c69306801ee7cdda5167a30896c8740155b /plat/amlogic/common/aml_console.c | |
| parent | b00a71fc312c9781fa6f404dccfb55b062b2ccac (diff) | |
| parent | faa476c0caaa598afa5a6109d17102db5fe35ec6 (diff) | |
| download | platform_external_arm-trusted-firmware-master.tar.gz platform_external_arm-trusted-firmware-master.tar.bz2 platform_external_arm-trusted-firmware-master.zip | |
Merge branch 'aosp/upstream-master' into HEAD am: faa476c0caHEADandroid-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1mastermain-cg-testing-releaseandroid-s-beta-5android-s-beta-4
Original change: https://android-review.googlesource.com/c/platform/external/arm-trusted-firmware/+/1589611
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I3a25534ceed4f8e188510641080d8b8ed49b8f62
Diffstat (limited to 'plat/amlogic/common/aml_console.c')
| -rw-r--r-- | plat/amlogic/common/aml_console.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/plat/amlogic/common/aml_console.c b/plat/amlogic/common/aml_console.c index 352279b6c..e21d707a0 100644 --- a/plat/amlogic/common/aml_console.c +++ b/plat/amlogic/common/aml_console.c @@ -11,7 +11,7 @@ /******************************************************************************* * Function that sets up the console ******************************************************************************/ -static console_meson_t aml_console; +static console_t aml_console; void aml_console_init(void) { @@ -28,6 +28,6 @@ void aml_console_init(void) panic(); } - console_set_scope(&aml_console.console, + console_set_scope(&aml_console, CONSOLE_FLAG_BOOT | CONSOLE_FLAG_RUNTIME); } |