diff options
author | Emanuele Ghidoli <emanuele.ghidoli@toradex.com> | 2022-11-15 12:13:17 +0100 |
---|---|---|
committer | Max Krummenacher <max.krummenacher@toradex.com> | 2022-12-07 15:30:17 +0100 |
commit | cfda3fb0fb647f40dafbb603689b5e25d8ad6156 (patch) | |
tree | 607f8b3032dbbb557490036b5b3786d9363c5d17 | |
parent | 44029374db511893bd16190d09daec14c8d5a822 (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>
(cherry picked from commit b2db48cac3b2384857e9b6c2b418533122c5e03a)
-rw-r--r-- | conf/machine/verdin-imx8mm.conf | 1 | ||||
-rw-r--r-- | conf/machine/verdin-imx8mp.conf | 1 | ||||
-rw-r--r-- | recipes-bsp/imx-atf/imx-atf_%.bbappend | 6 |
3 files changed, 2 insertions, 6 deletions
diff --git a/conf/machine/verdin-imx8mm.conf b/conf/machine/verdin-imx8mm.conf index 24536a0..5428b85 100644 --- a/conf/machine/verdin-imx8mm.conf +++ b/conf/machine/verdin-imx8mm.conf @@ -49,6 +49,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 abee1b3..9870393 100644 --- a/conf/machine/verdin-imx8mp.conf +++ b/conf/machine/verdin-imx8mp.conf @@ -50,6 +50,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 \ -" |