From 59e02043bceb17d5645486caaffe5c72da90007b Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Wed, 10 Sep 2025 09:04:43 +0200 Subject: [PATCH] imx-atf: reorder patches and apply independently of platform The Digi commits on the imx-atf repository are now part of the same branch and apply on top of each other since they do not collide with each other. Signed-off-by: Hector Palacios --- ...-ccimx93-use-UART6-for-the-default-console.patch} | 0 ...g-back-ELE-clock-workaround-for-soc-revisi.patch} | 0 ...-ccimx91-use-UART6-for-the-default-console.patch} | 0 .../recipes-bsp/imx-atf/imx-atf_%.bbappend | 12 ++++-------- 4 files changed, 4 insertions(+), 8 deletions(-) rename meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf/{0001-ccimx93-use-UART6-for-the-default-console.patch => 0006-ccimx93-use-UART6-for-the-default-console.patch} (100%) rename meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf/{0002-imx93-bring-back-ELE-clock-workaround-for-soc-revisi.patch => 0007-imx93-bring-back-ELE-clock-workaround-for-soc-revisi.patch} (100%) rename meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf/{0001-ccimx91-use-UART6-for-the-default-console.patch => 0008-ccimx91-use-UART6-for-the-default-console.patch} (100%) diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf/0001-ccimx93-use-UART6-for-the-default-console.patch b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf/0006-ccimx93-use-UART6-for-the-default-console.patch similarity index 100% rename from meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf/0001-ccimx93-use-UART6-for-the-default-console.patch rename to meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf/0006-ccimx93-use-UART6-for-the-default-console.patch diff --git a/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf/0002-imx93-bring-back-ELE-clock-workaround-for-soc-revisi.patch b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf/0007-imx93-bring-back-ELE-clock-workaround-for-soc-revisi.patch similarity index 100% rename from meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf/0002-imx93-bring-back-ELE-clock-workaround-for-soc-revisi.patch rename to meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf/0007-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/0001-ccimx91-use-UART6-for-the-default-console.patch b/meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf/0008-ccimx91-use-UART6-for-the-default-console.patch similarity index 100% rename from meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf/0001-ccimx91-use-UART6-for-the-default-console.patch rename to meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf/0008-ccimx91-use-UART6-for-the-default-console.patch 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 5071523ce..6f2cdec31 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 @@ -2,19 +2,15 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" -SRC_URI:append:ccimx8m = " \ +SRC_URI:append:dey = " \ file://0001-imx8mm-Define-UART1-as-console-for-boot-stage.patch \ file://0002-imx8mm-Disable-M4-debug-console.patch \ file://0003-imx8mn-Define-UART1-as-console-for-boot-stage.patch \ file://0004-imx8mn-Disable-M7-debug-console.patch \ file://0005-imx8mm-set-BL32_BASE-and-map-high-DRAM-for-ccimx8mm-.patch \ -" -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 \ + file://0006-ccimx93-use-UART6-for-the-default-console.patch \ + file://0007-imx93-bring-back-ELE-clock-workaround-for-soc-revisi.patch \ + file://0008-ccimx91-use-UART6-for-the-default-console.patch \ " BOOT_TOOLS = "imx-boot-tools"