mirror of
https://github.com/ARM-software/arm-trusted-firmware.git
synced 2025-04-17 10:04:26 +00:00
ac9f1b5555
The legacy console is gone. Re-add the console support based on the multi-console framework. I am still keeping the putc, getc, and flush callbacks in uniphier_console.S to use plat/common/aarch64/crash_console_helpers.S The console registration code already relies on that C environment has been set up. So, I just filled the struct console fields with the callback pointers, then called console_register() directly. I also re-implemented the init function in C to improve the readability. Removing the custom crash console implementation has one disadvantage; we cannot use the crash console on very early crashes because crash_console_helpers.S works only after the console is registered. I can live with this limitation. Tested on my boards, and confirmed this worked like before. Change-Id: Ieab9c849853ff6c525c15ea894a85944f257db59 Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
86 lines
1.9 KiB
C
86 lines
1.9 KiB
C
/*
|
|
* Copyright (c) 2017-2019, ARM Limited and Contributors. All rights reserved.
|
|
*
|
|
* SPDX-License-Identifier: BSD-3-Clause
|
|
*/
|
|
|
|
#include <assert.h>
|
|
#include <errno.h>
|
|
|
|
#include <platform_def.h>
|
|
|
|
#include <arch.h>
|
|
#include <common/bl_common.h>
|
|
#include <common/debug.h>
|
|
#include <drivers/console.h>
|
|
#include <lib/mmio.h>
|
|
#include <lib/xlat_tables/xlat_mmu_helpers.h>
|
|
#include <plat/common/platform.h>
|
|
|
|
#include "uniphier.h"
|
|
|
|
#define BL31_SIZE ((BL31_END) - (BL31_BASE))
|
|
|
|
static entry_point_info_t bl32_image_ep_info;
|
|
static entry_point_info_t bl33_image_ep_info;
|
|
|
|
entry_point_info_t *bl31_plat_get_next_image_ep_info(uint32_t type)
|
|
{
|
|
assert(sec_state_is_valid(type));
|
|
return type == NON_SECURE ? &bl33_image_ep_info : &bl32_image_ep_info;
|
|
}
|
|
|
|
void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
|
|
u_register_t arg2, u_register_t arg3)
|
|
{
|
|
void *from_bl2;
|
|
|
|
from_bl2 = (void *) arg0;
|
|
|
|
bl_params_node_t *bl_params = ((bl_params_t *)from_bl2)->head;
|
|
|
|
uniphier_console_setup();
|
|
|
|
while (bl_params) {
|
|
if (bl_params->image_id == BL32_IMAGE_ID)
|
|
bl32_image_ep_info = *bl_params->ep_info;
|
|
|
|
if (bl_params->image_id == BL33_IMAGE_ID)
|
|
bl33_image_ep_info = *bl_params->ep_info;
|
|
|
|
bl_params = bl_params->next_params_info;
|
|
}
|
|
|
|
if (bl33_image_ep_info.pc == 0)
|
|
panic();
|
|
}
|
|
|
|
#define UNIPHIER_SYS_CNTCTL_BASE 0x60E00000
|
|
|
|
void bl31_platform_setup(void)
|
|
{
|
|
unsigned int soc;
|
|
|
|
soc = uniphier_get_soc_id();
|
|
if (soc == UNIPHIER_SOC_UNKNOWN) {
|
|
ERROR("unsupported SoC\n");
|
|
plat_error_handler(-ENOTSUP);
|
|
}
|
|
|
|
uniphier_cci_init(soc);
|
|
uniphier_cci_enable();
|
|
|
|
/* Initialize the GIC driver, cpu and distributor interfaces */
|
|
uniphier_gic_driver_init(soc);
|
|
uniphier_gic_init();
|
|
|
|
/* Enable and initialize the System level generic timer */
|
|
mmio_write_32(UNIPHIER_SYS_CNTCTL_BASE + CNTCR_OFF,
|
|
CNTCR_FCREQ(0U) | CNTCR_EN);
|
|
}
|
|
|
|
void bl31_plat_arch_setup(void)
|
|
{
|
|
uniphier_mmap_setup(BL31_BASE, BL31_SIZE, NULL);
|
|
enable_mmu_el3(0);
|
|
}
|