summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmanuele Ghidoli <emanuele.ghidoli@toradex.com>2022-11-15 12:13:17 +0100
committerEmanuele Ghidoli <emanuele.ghidoli@toradex.com>2022-11-16 10:17:15 +0100
commitb2db48cac3b2384857e9b6c2b418533122c5e03a (patch)
treea5ffe82b67452f8a0c9ea22be458beec4707ff9e
parent7f7d8b15549a9f2bf0a07b4b8729acc72e59a06d (diff)
machine: verdin-imx8m*: Move AT-F boot UART configuration to machine conf
Add SOC_ATF_BOOT_UART_BASE in relevant machine conf instead of having IMX_BOOT_UART_BASE added to EXTRA_OEMAKE in imx_atf_%bbappend, this change remove the dependency on our .bbappend to have a working ATF binary. SOC_ATF_BOOT_UART_BASE variable support was introduce in commit 453def7956c8 ("imx-atf: allow setting the UART used during boot") in meta-freescale. Related-to: ELB-4889 Signed-off-by: Emanuele Ghidoli <emanuele.ghidoli@toradex.com>
-rw-r--r--conf/machine/verdin-imx8mm.conf1
-rw-r--r--conf/machine/verdin-imx8mp.conf1
-rw-r--r--recipes-bsp/imx-atf/imx-atf_%.bbappend6
3 files changed, 2 insertions, 6 deletions
diff --git a/conf/machine/verdin-imx8mm.conf b/conf/machine/verdin-imx8mm.conf
index 162ee77..74410df 100644
--- a/conf/machine/verdin-imx8mm.conf
+++ b/conf/machine/verdin-imx8mm.conf
@@ -48,6 +48,7 @@ DDR_FIRMWARE_NAME = " \
"
ATF_PLATFORM = "imx8mm"
+SOC_ATF_BOOT_UART_BASE:verdin-imx8mm = "0x30860000"
BOOT_SPACE = "65536"
diff --git a/conf/machine/verdin-imx8mp.conf b/conf/machine/verdin-imx8mp.conf
index ce6f596..f75c763 100644
--- a/conf/machine/verdin-imx8mp.conf
+++ b/conf/machine/verdin-imx8mp.conf
@@ -49,6 +49,7 @@ DDR_FIRMWARE_NAME = " \
"
ATF_PLATFORM = "imx8mp"
+SOC_ATF_BOOT_UART_BASE:verdin-imx8mp = "0x30880000"
BOOT_SPACE = "65536"
IMAGE_BOOTLOADER = "imx-boot"
diff --git a/recipes-bsp/imx-atf/imx-atf_%.bbappend b/recipes-bsp/imx-atf/imx-atf_%.bbappend
index 1f204a2..0e88a32 100644
--- a/recipes-bsp/imx-atf/imx-atf_%.bbappend
+++ b/recipes-bsp/imx-atf/imx-atf_%.bbappend
@@ -7,9 +7,3 @@ SRC_URI:append:tdx = " \
EXTRA_OEMAKE:append:tdx = " \
BUILD_STRING="${SRCBRANCH}-g${@'${SRCPV}'.replace('AUTOINC+', '')}" \
"
-EXTRA_OEMAKE:append:verdin-imx8mm = " \
- IMX_BOOT_UART_BASE=0x30860000 \
-"
-EXTRA_OEMAKE:append:verdin-imx8mp = " \
- IMX_BOOT_UART_BASE=0x30880000 \
-"