andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "amlogic: console: Move console driver to common directory" into integration

This commit is contained in:
Soby Mathew 2019-09-13 14:17:26 +00:00 committed by TrustedFirmware Code Review
parent 42cdeb9308 a759d34519
commit 1ac928ce41
5 changed files with 35 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
plat/amlogic/common/aml_console.c Normal file
View File

@ -0,0 +1,33 @@
/*
* Copyright (c) 2019, Carlo Caione <ccaione@baylibre.com>
*
* SPDX-License-Identifier: BSD-3-Clause
*/
#include <common/debug.h>
#include <meson_console.h>
#include <platform_def.h>
/*******************************************************************************
* Function that sets up the console
******************************************************************************/
static console_meson_t aml_console;
void aml_console_init(void)
{
int rc = console_meson_register(AML_UART0_AO_BASE,
AML_UART0_AO_CLK_IN_HZ,
AML_UART_BAUDRATE,
&aml_console);
if (rc == 0) {
/*
* The crash console doesn't use the multi console API, it uses
* the core console functions directly. It is safe to call panic
* and let it print debug information.
*/
panic();
}
console_set_scope(&aml_console.console,
CONSOLE_FLAG_BOOT | CONSOLE_FLAG_RUNTIME);
}

26
plat/amlogic/gxbb/gxbb_common.c
View File

@ -7,9 +7,7 @@
#include <assert.h>
#include <bl31/interrupt_mgmt.h>
#include <common/bl_common.h>
#include <common/debug.h>
#include <common/ep_info.h>
#include <drivers/amlogic/meson_console.h>
#include <lib/mmio.h>
#include <lib/xlat_tables/xlat_tables_v2.h>
#include <platform_def.h>
@ -100,30 +98,6 @@ void aml_setup_page_tables(void)
init_xlat_tables();
}
/*******************************************************************************
* Function that sets up the console
******************************************************************************/
static console_meson_t gxbb_console;
void aml_console_init(void)
{
int rc = console_meson_register(AML_UART0_AO_BASE,
AML_UART0_AO_CLK_IN_HZ,
AML_UART_BAUDRATE,
&gxbb_console);
if (rc == 0) {
/*
* The crash console doesn't use the multi console API, it uses
* the core console functions directly. It is safe to call panic
* and let it print debug information.
*/
panic();
}
console_set_scope(&gxbb_console.console,
CONSOLE_FLAG_BOOT | CONSOLE_FLAG_RUNTIME);
}
/*******************************************************************************
* Function that returns the system counter frequency
******************************************************************************/

1
plat/amlogic/gxbb/platform.mk
View File

@ -32,6 +32,7 @@ BL31_SOURCES += lib/cpus/aarch64/cortex_a53.S \
${AML_PLAT_COMMON}/aml_sip_svc.c \
${AML_PLAT_COMMON}/aml_thermal.c \
${AML_PLAT_COMMON}/aml_topology.c \
${AML_PLAT_COMMON}/aml_console.c \
${XLAT_TABLES_LIB_SRCS} \
${GIC_SOURCES}

26
plat/amlogic/gxl/gxl_common.c
View File

@ -7,11 +7,9 @@
#include <assert.h>
#include <bl31/interrupt_mgmt.h>
#include <common/bl_common.h>
#include <common/debug.h>
#include <common/ep_info.h>
#include <lib/mmio.h>
#include <lib/xlat_tables/xlat_tables_v2.h>
#include <meson_console.h>
#include <platform_def.h>
#include <stdint.h>
@ -100,30 +98,6 @@ void aml_setup_page_tables(void)
init_xlat_tables();
}
/*******************************************************************************
* Function that sets up the console
******************************************************************************/
static console_meson_t gxl_console;
void aml_console_init(void)
{
int rc = console_meson_register(AML_UART0_AO_BASE,
AML_UART0_AO_CLK_IN_HZ,
AML_UART_BAUDRATE,
&gxl_console);
if (rc == 0) {
/*
* The crash console doesn't use the multi console API, it uses
* the core console functions directly. It is safe to call panic
* and let it print debug information.
*/
panic();
}
console_set_scope(&gxl_console.console,
CONSOLE_FLAG_BOOT | CONSOLE_FLAG_RUNTIME);
}
/*******************************************************************************
* Function that returns the system counter frequency
******************************************************************************/

1
plat/amlogic/gxl/platform.mk
View File

@ -35,6 +35,7 @@ BL31_SOURCES += lib/cpus/aarch64/cortex_a53.S \
${AML_PLAT_COMMON}/aml_sip_svc.c \
${AML_PLAT_COMMON}/aml_thermal.c \
${AML_PLAT_COMMON}/aml_topology.c \
${AML_PLAT_COMMON}/aml_console.c \
drivers/amlogic/crypto/sha_dma.c \
${XLAT_TABLES_LIB_SRCS} \
${GIC_SOURCES}