From 63c0702508ac2034c7f578c2658a06b17685c11f Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Wed, 21 Aug 2024 18:44:21 +0200 Subject: [PATCH] imx-atf: add new version 2.10 recipe for ccimx91 Signed-off-by: Javier Viguera --- meta-digi-arm/conf/machine/ccimx91-dvk.conf | 2 +- ...91-use-UART6-for-the-default-console.patch | 22 +++++++++++++++++++ .../recipes-bsp/imx-atf/imx-atf_%.bbappend | 5 ++++- .../recipes-bsp/imx-atf/imx-atf_2.10.bb | 13 +++++++++++ .../recipes-bsp/imx-atf/imx-atf_2.8.bb | 2 +- 5 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf/0001-ccimx91-use-UART6-for-the-default-console.patch create mode 100644 meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf_2.10.bb diff --git a/meta-digi-arm/conf/machine/ccimx91-dvk.conf b/meta-digi-arm/conf/machine/ccimx91-dvk.conf index 797634c9a..9e2376d63 100644 --- a/meta-digi-arm/conf/machine/ccimx91-dvk.conf +++ b/meta-digi-arm/conf/machine/ccimx91-dvk.conf @@ -44,4 +44,4 @@ IMXBOOT_TARGETS = "flash_singleboot" IMX_BOOT_SOC_TARGET = "iMX91" # Set ATF platform name -ATF_PLATFORM = "imx91p" +ATF_PLATFORM = "imx91" diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf/0001-ccimx91-use-UART6-for-the-default-console.patch b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf/0001-ccimx91-use-UART6-for-the-default-console.patch new file mode 100644 index 000000000..9890f8b71 --- /dev/null +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf/0001-ccimx91-use-UART6-for-the-default-console.patch @@ -0,0 +1,22 @@ +From: Javier Viguera +Date: Mon, 19 Aug 2024 16:50:20 +0200 +Subject: [PATCH] ccimx91: use UART6 for the default console + +Signed-off-by: Javier Viguera +--- + plat/imx/imx91/include/platform_def.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/plat/imx/imx91/include/platform_def.h b/plat/imx/imx91/include/platform_def.h +index 0ddd699f5e0b..6de23d8ef06f 100644 +--- a/plat/imx/imx91/include/platform_def.h ++++ b/plat/imx/imx91/include/platform_def.h +@@ -55,7 +55,7 @@ + #define MAX_MMAP_REGIONS 17 + #endif + +-#define IMX_LPUART_BASE 0x44380000 ++#define IMX_LPUART_BASE 0x425a0000 + #define IMX_BOOT_UART_CLK_IN_HZ 24000000 /* Select 24MHz oscillator */ + #define IMX_CONSOLE_BAUDRATE 115200 + diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf_%.bbappend b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf_%.bbappend index 0da3fb164..83e975e5f 100644 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf_%.bbappend +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf_%.bbappend @@ -8,7 +8,10 @@ SRC_URI:append:ccimx8m = " \ file://0003-imx8mn-Define-UART1-as-console-for-boot-stage.patch \ file://0004-imx8mn-Disable-M7-debug-console.patch \ " -SRC_URI:append:ccimx9 = " \ +SRC_URI:append:ccimx91 = " \ + file://0001-ccimx91-use-UART6-for-the-default-console.patch \ +" +SRC_URI:append:ccimx93 = " \ file://0001-ccimx93-use-UART6-for-the-default-console.patch \ file://0002-imx93-bring-back-ELE-clock-workaround-for-soc-revisi.patch \ " diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf_2.10.bb b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf_2.10.bb new file mode 100644 index 000000000..7f089a5f2 --- /dev/null +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf_2.10.bb @@ -0,0 +1,13 @@ +# Copyright (C) 2024, Digi International Inc. + +# +# Reuse meta-freescale's imx-atf_2.6.bb +# +require recipes-bsp/imx-atf/imx-atf_2.6.bb + +SRC_URI = "git://github.com/nxp-imx/imx-atf.git;protocol=https;branch=${SRCBRANCH}" +SRCBRANCH = "lf_v2.10" +# Tag: lf-6.6.23-2.0.0 +SRCREV = "49143a1701d9ccd3239e3f95f3042897ca889ea8" + +COMPATIBLE_MACHINE = "(ccimx91)" diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf_2.8.bb b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf_2.8.bb index d5c06c92d..52689e681 100644 --- a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf_2.8.bb +++ b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf_2.8.bb @@ -10,4 +10,4 @@ SRCBRANCH = "lf_v2.8" # Tag: lf-6.1.55-2.2.0 SRCREV = "08e9d4eef2262c0dd072b4325e8919e06d349e02" -COMPATIBLE_MACHINE = "(ccimx9)" +COMPATIBLE_MACHINE = "(ccimx93)"