Djam/arm-trusted-firmware
1
0
Fork 0
mirror of https://github.com/ARM-software/arm-trusted-firmware.git synced 2025-04-23 13:36:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge "fix(imx8m): make IMX_BOOT_UART_BASE autodetection option more obvious" into integration

Browse source
This commit is contained in:
Madhukar Pappireddy 2023-08-03 18:02:58 +02:00 • committed by TrustedFirmware Code Review
commit 12900c4ab6
6 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c
View file

@ -131,7 +131,7 @@ void bl31_tzc380_setup(void)
void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
u_register_t arg2, u_register_t arg3)
{
unsigned int console_base = 0U;
unsigned int console_base = IMX_BOOT_UART_BASE;
static console_t console;
int i;
@ -146,9 +146,6 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
imx_csu_init(csu_cfg);
#if IMX_BOOT_UART_BASE
console_base = IMX_BOOT_UART_BASE;
#endif
if (console_base == 0U) {
console_base = imx8m_uart_get_base();
}

3
plat/imx/imx8m/imx8mm/platform.mk
View file

@ -159,6 +159,9 @@ BL32_SIZE ?= 0x2000000
$(eval $(call add_define,BL32_SIZE))
IMX_BOOT_UART_BASE ?= 0x30890000
ifeq (${IMX_BOOT_UART_BASE},auto)
override IMX_BOOT_UART_BASE := 0
endif
$(eval $(call add_define,IMX_BOOT_UART_BASE))
EL3_EXCEPTION_HANDLING := $(SDEI_SUPPORT)

5
plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c
View file

@ -122,7 +122,7 @@ static void bl31_tzc380_setup(void)
void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
u_register_t arg2, u_register_t arg3)
{
unsigned int console_base = 0U;
unsigned int console_base = IMX_BOOT_UART_BASE;
static console_t console;
unsigned int val;
int i;
@ -143,9 +143,6 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
val = mmio_read_32(IMX_IOMUX_GPR_BASE + 0x2c);
mmio_write_32(IMX_IOMUX_GPR_BASE + 0x2c, val | 0x3DFF0000);
#if IMX_BOOT_UART_BASE
console_base = IMX_BOOT_UART_BASE;
#endif
if (console_base == 0U) {
console_base = imx8m_uart_get_base();
}

3
plat/imx/imx8m/imx8mn/platform.mk
View file

@ -65,6 +65,9 @@ BL32_SIZE ?= 0x2000000
$(eval $(call add_define,BL32_SIZE))
IMX_BOOT_UART_BASE ?= 0x30890000
ifeq (${IMX_BOOT_UART_BASE},auto)
override IMX_BOOT_UART_BASE := 0
endif
$(eval $(call add_define,IMX_BOOT_UART_BASE))
EL3_EXCEPTION_HANDLING := $(SDEI_SUPPORT)

5
plat/imx/imx8m/imx8mp/imx8mp_bl31_setup.c
View file

@ -118,7 +118,7 @@ static void bl31_tzc380_setup(void)
void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
u_register_t arg2, u_register_t arg3)
{
unsigned int console_base = 0U;
unsigned int console_base = IMX_BOOT_UART_BASE;
static console_t console;
unsigned int val;
unsigned int i;
@ -139,9 +139,6 @@ void bl31_early_platform_setup2(u_register_t arg0, u_register_t arg1,
val = mmio_read_32(IMX_IOMUX_GPR_BASE + 0x2c);
mmio_write_32(IMX_IOMUX_GPR_BASE + 0x2c, val | 0x3DFF0000);
#if IMX_BOOT_UART_BASE
console_base = IMX_BOOT_UART_BASE;
#endif
if (console_base == 0U) {
console_base = imx8m_uart_get_base();
}

3
plat/imx/imx8m/imx8mp/platform.mk
View file

@ -156,6 +156,9 @@ BL32_SIZE ?= 0x2000000
$(eval $(call add_define,BL32_SIZE))
IMX_BOOT_UART_BASE ?= 0x30890000
ifeq (${IMX_BOOT_UART_BASE},auto)
override IMX_BOOT_UART_BASE := 0
endif
$(eval $(call add_define,IMX_BOOT_UART_BASE))
EL3_EXCEPTION_HANDLING := $(SDEI_SUPPORT)