gatesgarth migration: imx-atf: Upgrade to v2.4
Sync with BSP release rel_imx_5.10.9_1.0.0 https://jira.digi.com/browse/DEL-7508 Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
This commit is contained in:
Arturo Buzarra
parent
f6496788a4
commit
994fc80b27
|
|
@ -1,17 +1,17 @@
|
|||
From: Arturo Buzarra <arturo.buzarra@digi.com>
|
||||
Date: Fri, 16 Apr 2021 15:03:31 +0200
|
||||
Date: Thu, 29 Apr 2021 15:02:19 +0200
|
||||
Subject: [PATCH] imx8mm: Define UART1 as console for boot stage
|
||||
|
||||
UART1 is the default console for ConnectCore i.MX8M Mini
|
||||
|
||||
Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
|
||||
---
|
||||
plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c | 2 +-
|
||||
plat/imx/imx8m/imx8mm/include/platform_def.h | 2 +-
|
||||
plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c | 2 +-
|
||||
plat/imx/imx8m/imx8mm/platform.mk | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c b/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c
|
||||
index 049192880..e16b72eb2 100644
|
||||
index bc2e5a0bf..e9a6a2b7f 100644
|
||||
--- a/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c
|
||||
+++ b/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c
|
||||
@@ -57,11 +57,11 @@ static const struct imx_rdc_cfg rdc[] = {
|
||||
|
|
@ -27,20 +27,20 @@ index 049192880..e16b72eb2 100644
|
|||
|
||||
/* Sentinel */
|
||||
{0},
|
||||
diff --git a/plat/imx/imx8m/imx8mm/include/platform_def.h b/plat/imx/imx8m/imx8mm/include/platform_def.h
|
||||
index 42b03613e..b02dd5202 100644
|
||||
--- a/plat/imx/imx8m/imx8mm/include/platform_def.h
|
||||
+++ b/plat/imx/imx8m/imx8mm/include/platform_def.h
|
||||
@@ -49,11 +49,11 @@
|
||||
#define MAX_XLAT_TABLES 8
|
||||
#define MAX_MMAP_REGIONS 16
|
||||
diff --git a/plat/imx/imx8m/imx8mm/platform.mk b/plat/imx/imx8m/imx8mm/platform.mk
|
||||
index 83ebad65b..f47bdec22 100644
|
||||
--- a/plat/imx/imx8m/imx8mm/platform.mk
|
||||
+++ b/plat/imx/imx8m/imx8mm/platform.mk
|
||||
@@ -60,11 +60,11 @@ BL32_BASE ?= 0xbe000000
|
||||
$(eval $(call add_define,BL32_BASE))
|
||||
|
||||
#define HAB_RVT_BASE U(0x00000900) /* HAB_RVT for i.MX8MM */
|
||||
BL32_SIZE ?= 0x2000000
|
||||
$(eval $(call add_define,BL32_SIZE))
|
||||
|
||||
-#define IMX_BOOT_UART_BASE U(0x30890000)
|
||||
+#define IMX_BOOT_UART_BASE U(0x30860000) /* UART1 for ConnectCore i.MX8M Mini */
|
||||
#define IMX_BOOT_UART_CLK_IN_HZ 24000000 /* Select 24MHz oscillator */
|
||||
-IMX_BOOT_UART_BASE ?= 0x30890000
|
||||
+IMX_BOOT_UART_BASE ?= 0x30860000
|
||||
$(eval $(call add_define,IMX_BOOT_UART_BASE))
|
||||
|
||||
#define PLAT_CRASH_UART_BASE IMX_BOOT_UART_BASE
|
||||
#define PLAT_CRASH_UART_CLK_IN_HZ 24000000
|
||||
#define IMX_CONSOLE_BAUDRATE 115200
|
||||
ifeq (${SPD},trusty)
|
||||
BL31_CFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -1,20 +1,20 @@
|
|||
From: Arturo Buzarra <arturo.buzarra@digi.com>
|
||||
Date: Fri, 16 Apr 2021 15:38:09 +0200
|
||||
Date: Thu, 29 Apr 2021 14:56:47 +0200
|
||||
Subject: [PATCH] imx8mn: Define UART1 as console for boot stage
|
||||
|
||||
UART1 is the default console for ConnectCore i.MX8M Nano
|
||||
|
||||
Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
|
||||
---
|
||||
plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c | 2 +-
|
||||
plat/imx/imx8m/imx8mn/include/platform_def.h | 2 +-
|
||||
plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c | 2 +-
|
||||
plat/imx/imx8m/imx8mn/platform.mk | 2 +-
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c b/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c
|
||||
index 841ec5a3a..1bfacb409 100644
|
||||
index d82d00dc6..c0a3ddc19 100644
|
||||
--- a/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c
|
||||
+++ b/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c
|
||||
@@ -56,11 +56,11 @@ static const struct imx_rdc_cfg rdc[] = {
|
||||
@@ -49,11 +49,11 @@ static const struct imx_rdc_cfg rdc[] = {
|
||||
/* Master domain assignment */
|
||||
RDC_MDAn(RDC_MDA_M7, DID1),
|
||||
|
||||
|
|
@ -27,20 +27,20 @@ index 841ec5a3a..1bfacb409 100644
|
|||
RDC_MEM_REGIONn(16, 0x0, 0x0, 0xff),
|
||||
RDC_MEM_REGIONn(17, 0x0, 0x0, 0xff),
|
||||
RDC_MEM_REGIONn(18, 0x0, 0x0, 0xff),
|
||||
diff --git a/plat/imx/imx8m/imx8mn/include/platform_def.h b/plat/imx/imx8m/imx8mn/include/platform_def.h
|
||||
index 967afbbee..6a07be2a8 100644
|
||||
--- a/plat/imx/imx8m/imx8mn/include/platform_def.h
|
||||
+++ b/plat/imx/imx8m/imx8mn/include/platform_def.h
|
||||
@@ -49,11 +49,11 @@
|
||||
#define MAX_XLAT_TABLES 8
|
||||
#define MAX_MMAP_REGIONS 16
|
||||
diff --git a/plat/imx/imx8m/imx8mn/platform.mk b/plat/imx/imx8m/imx8mn/platform.mk
|
||||
index 22846f289..fb5bef02d 100644
|
||||
--- a/plat/imx/imx8m/imx8mn/platform.mk
|
||||
+++ b/plat/imx/imx8m/imx8mn/platform.mk
|
||||
@@ -60,11 +60,11 @@ BL32_BASE ?= 0x56000000
|
||||
$(eval $(call add_define,BL32_BASE))
|
||||
|
||||
#define HAB_RVT_BASE U(0x00000900) /* HAB_RVT for i.MX8MM */
|
||||
BL32_SIZE ?= 0x2000000
|
||||
$(eval $(call add_define,BL32_SIZE))
|
||||
|
||||
-#define IMX_BOOT_UART_BASE U(0x30890000)
|
||||
+#define IMX_BOOT_UART_BASE U(0x30860000) /* UART1 for ConnectCore i.MX8M Nano */
|
||||
#define IMX_BOOT_UART_CLK_IN_HZ 24000000 /* Select 24MHz oscillator */
|
||||
-IMX_BOOT_UART_BASE ?= 0x30890000
|
||||
+IMX_BOOT_UART_BASE ?= 0x30860000
|
||||
$(eval $(call add_define,IMX_BOOT_UART_BASE))
|
||||
|
||||
#define PLAT_CRASH_UART_BASE IMX_BOOT_UART_BASE
|
||||
#define PLAT_CRASH_UART_CLK_IN_HZ 24000000
|
||||
#define IMX_CONSOLE_BAUDRATE 115200
|
||||
ifeq (${SPD},trusty)
|
||||
BL31_CFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/BSD-3-Clause;m
|
|||
|
||||
PV .= "+git${SRCPV}"
|
||||
|
||||
SRCBRANCH = "imx_5.4.70_2.3.0"
|
||||
SRCBRANCH = "lf_v2.4"
|
||||
ATF_SRC ?= "git://source.codeaurora.org/external/imx/imx-atf.git;protocol=https"
|
||||
SRC_URI = "${ATF_SRC};branch=${SRCBRANCH} \
|
||||
"
|
||||
SRCREV = "f1d7187f261ebf4b8a2a70d638d4bfc0a9b26c29"
|
||||
SRCREV = "ba76d337e9564ea97b5024640b6dcca9bd054ffb"
|
||||
|
||||
SRC_URI_append_ccimx8mn = " file://0001-imx8mn-Define-UART1-as-console-for-boot-stage.patch \
|
||||
file://0002-imx8mn-Disable-M7-debug-console.patch"
|
||||
|
|
@ -36,6 +36,10 @@ PLATFORM_mx8mq = "imx8mq"
|
|||
PLATFORM_mx8qm = "imx8qm"
|
||||
PLATFORM_mx8x = "imx8qx"
|
||||
|
||||
# Clear LDFLAGS to avoid the option -Wl recognize issue
|
||||
# Clear CFLAGS to avoid coherent_arm out of OCRAM size limitation (64KB) - i.MX 8MQ only
|
||||
CLEAR_FLAGS ?= "LDFLAGS"
|
||||
CLEAR_FLAGS_mx8mq = "LDFLAGS CFLAGS"
|
||||
|
||||
EXTRA_OEMAKE += " \
|
||||
CROSS_COMPILE="${TARGET_PREFIX}" \
|
||||
|
|
@ -45,8 +49,8 @@ EXTRA_OEMAKE += " \
|
|||
BUILD_OPTEE = "${@bb.utils.contains('MACHINE_FEATURES', 'optee', 'true', 'false', d)}"
|
||||
|
||||
do_compile() {
|
||||
# Clear LDFLAGS to avoid the option -Wl recognize issue
|
||||
unset LDFLAGS
|
||||
unset ${CLEAR_FLAGS}
|
||||
|
||||
oe_runmake bl31
|
||||
if ${BUILD_OPTEE}; then
|
||||
oe_runmake clean BUILD_BASE=build-optee
|
||||
Loading…
Reference in New Issue