Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

freescale-layer: imx-atf: adapt patches for 2.10 

While at it, add the "Upstream-Status" tag to the patches to avoid QA errors

https://onedigi.atlassian.net/browse/DEL-9011
https://onedigi.atlassian.net/browse/DEL-9081

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
This commit is contained in:
Gabriel Valcazar 2024-05-21 14:02:23 +02:00
parent 554729c92d
commit 2fb01c8f3e
6 changed files with 45 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf/0001-ccimx93-use-UART6-for-the-default-console.patch
View File

@ -2,21 +2,23 @@ From: Javier Viguera <javier.viguera@digi.com>
Date: Thu, 20 Oct 2022 17:04:37 +0200 Date: Thu, 20 Oct 2022 17:04:37 +0200
Subject: [PATCH] ccimx93: use UART6 for the default console Subject: [PATCH] ccimx93: use UART6 for the default console
Upstream-Status: Inappropriate [digi specific]
Signed-off-by: Javier Viguera <javier.viguera@digi.com> Signed-off-by: Javier Viguera <javier.viguera@digi.com>
--- ---
plat/imx/imx93/include/platform_def.h | 2 +- plat/imx/imx93/include/platform_def.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plat/imx/imx93/include/platform_def.h b/plat/imx/imx93/include/platform_def.h diff --git a/plat/imx/imx93/include/platform_def.h b/plat/imx/imx93/include/platform_def.h
index 9bbee908fe80..8eba2f6d917a 100644 index 2d140400d..cb5b6eba0 100644
--- a/plat/imx/imx93/include/platform_def.h --- a/plat/imx/imx93/include/platform_def.h
+++ b/plat/imx/imx93/include/platform_def.h +++ b/plat/imx/imx93/include/platform_def.h
@@ -61,7 +61,7 @@ @@ -53,7 +53,7 @@
#define MAX_MMAP_REGIONS 17 #define MAX_MMAP_REGIONS 16
#endif #endif
-#define IMX_LPUART_BASE 0x44380000 -#define IMX_LPUART_BASE U(0x44380000)
+#define IMX_LPUART_BASE 0x425a0000 +#define IMX_LPUART_BASE U(0x425a0000)
#define IMX_BOOT_UART_CLK_IN_HZ 24000000 /* Select 24MHz oscillator */ #define IMX_BOOT_UART_CLK_IN_HZ U(24000000) /* Select 24MHz oscillator */
#define IMX_CONSOLE_BAUDRATE 115200 #define IMX_CONSOLE_BAUDRATE 115200

12
meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf/0001-imx8mm-Define-UART1-as-console-for-boot-stage.patch
View File

@ -4,6 +4,8 @@ Subject: [PATCH] imx8mm: Define UART1 as console for boot stage
UART1 is the default console for ConnectCore i.MX8M Mini UART1 is the default console for ConnectCore i.MX8M Mini
Upstream-Status: Inappropriate [digi specific]
Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com> Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com> Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
--- ---
@ -11,15 +13,15 @@ Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plat/imx/imx8m/imx8mm/platform.mk b/plat/imx/imx8m/imx8mm/platform.mk diff --git a/plat/imx/imx8m/imx8mm/platform.mk b/plat/imx/imx8m/imx8mm/platform.mk
index a24e41fd77e9..1c8c66435db7 100644 index 0a8f12a26..55f83f462 100644
--- a/plat/imx/imx8m/imx8mm/platform.mk --- a/plat/imx/imx8m/imx8mm/platform.mk
+++ b/plat/imx/imx8m/imx8mm/platform.mk +++ b/plat/imx/imx8m/imx8mm/platform.mk
@@ -153,7 +153,7 @@ $(eval $(call add_define,BL32_BASE)) @@ -159,7 +159,7 @@ $(eval $(call add_define,BL32_BASE))
BL32_SIZE ?= 0x2000000 BL32_SIZE ?= 0x2000000
$(eval $(call add_define,BL32_SIZE)) $(eval $(call add_define,BL32_SIZE))
-IMX_BOOT_UART_BASE ?= 0x30890000 -IMX_BOOT_UART_BASE ?= 0x30890000
+IMX_BOOT_UART_BASE ?= 0x30860000 +IMX_BOOT_UART_BASE ?= 0x30860000
$(eval $(call add_define,IMX_BOOT_UART_BASE)) ifeq (${IMX_BOOT_UART_BASE},auto)
override IMX_BOOT_UART_BASE := 0
$(eval $(call add_define,IMX8M_DDR4_DVFS)) endif

6
meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf/0002-imx8mm-Disable-M4-debug-console.patch
View File

@ -5,6 +5,8 @@ Subject: [PATCH] imx8mm: Disable M4 debug console
The Cortex-M4 uses the UART4 as debug console, and it is The Cortex-M4 uses the UART4 as debug console, and it is
shared with the Cortex-A53. shared with the Cortex-A53.
Upstream-Status: Inappropriate [digi specific]
Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com> Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com> Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
--- ---
@ -12,10 +14,10 @@ Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c b/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c diff --git a/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c b/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c
index 8702d5160a45..8ffeed204e90 100644 index 179b6226f..388deae2b 100644
--- a/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c --- a/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c
+++ b/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c +++ b/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c
@@ -108,7 +108,7 @@ static const struct imx_rdc_cfg rdc[] = { @@ -117,7 +117,7 @@ static const struct imx_rdc_cfg rdc[] = {
RDC_MDAn(RDC_MDA_M4, DID1), RDC_MDAn(RDC_MDA_M4, DID1),
/* peripherals domain permission */ /* peripherals domain permission */

24
meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf/0002-imx93-bring-back-ELE-clock-workaround-for-soc-revisi.patch
View File

@ -5,6 +5,8 @@ Subject: [PATCH] imx93: bring back ELE clock workaround for soc revision A0
Revert commit 7411561db535a20f61ff6621fec5b374130d34f9 to allow building Revert commit 7411561db535a20f61ff6621fec5b374130d34f9 to allow building
for soc revision A0 using a compilation flag. for soc revision A0 using a compilation flag.
Upstream-Status: Inappropriate [digi specific]
Signed-off-by: Javier Viguera <javier.viguera@digi.com> Signed-off-by: Javier Viguera <javier.viguera@digi.com>
--- ---
plat/imx/imx93/imx93_psci.c | 10 ++++++++++ plat/imx/imx93/imx93_psci.c | 10 ++++++++++
@ -12,12 +14,12 @@ Signed-off-by: Javier Viguera <javier.viguera@digi.com>
2 files changed, 14 insertions(+) 2 files changed, 14 insertions(+)
diff --git a/plat/imx/imx93/imx93_psci.c b/plat/imx/imx93/imx93_psci.c diff --git a/plat/imx/imx93/imx93_psci.c b/plat/imx/imx93/imx93_psci.c
index 6a21ee970079..b9c4e0a1752b 100644 index 68eb49cc2..cc482a17d 100644
--- a/plat/imx/imx93/imx93_psci.c --- a/plat/imx/imx93/imx93_psci.c
+++ b/plat/imx/imx93/imx93_psci.c +++ b/plat/imx/imx93/imx93_psci.c
@@ -794,6 +794,11 @@ void imx_pwr_domain_suspend(const psci_power_state_t *target_state) @@ -739,6 +739,11 @@ void imx_pwr_domain_suspend(const psci_power_state_t *target_state)
} else { if (is_local_state_retn(CLUSTER_PWR_STATE(target_state))) {
write_clusterpwrdn(DSU_CLUSTER_PWR_OFF); write_clusterpwrdn(DSU_CLUSTER_PWR_OFF | BIT(1));
} }
+ +
+#ifdef SOC_REV_A0 +#ifdef SOC_REV_A0
@ -27,23 +29,23 @@ index 6a21ee970079..b9c4e0a1752b 100644
} }
if (is_local_state_retn(SYSTEM_PWR_STATE(target_state))) { if (is_local_state_retn(SYSTEM_PWR_STATE(target_state))) {
@@ -924,6 +929,11 @@ void imx_pwr_domain_suspend_finish(const psci_power_state_t *target_state) @@ -870,6 +875,11 @@ void imx_pwr_domain_suspend_finish(const psci_power_state_t *target_state)
mmio_write_32(IMX_GPC_BASE + A55C0_CMC_OFFSET + 0x800 * 2 + CM_MODE_CTRL, CM_MODE_RUN); if (!is_local_state_run(CLUSTER_PWR_STATE(target_state))) {
/* clear L3 retention */ /* set the cluster's target mode to RUN */
mmio_clrbits_32(IMX_SRC_BASE + A55C0_MEM + 0x400 * 3 + 0x4, MEM_LP_RETENTION); gpc_set_cpu_mode(CPU_A55_PLAT, CM_MODE_RUN);
+ +
+#ifdef SOC_REV_A0 +#ifdef SOC_REV_A0
+ /* FIXME: set S401 clock back */ + /* FIXME: set S401 clock back */
+ mmio_setbits_32(0x44450200, BIT(9)); + mmio_setbits_32(0x44450200, BIT(9));
+#endif +#endif
} }
/* do core level */ /* do core level */
if (is_local_state_off(CORE_PWR_STATE(target_state))) {
diff --git a/plat/imx/imx93/platform.mk b/plat/imx/imx93/platform.mk diff --git a/plat/imx/imx93/platform.mk b/plat/imx/imx93/platform.mk
index be09b9f0be7a..440c13c1dbe1 100644 index a43d3c4f5..d69f7e2de 100644
--- a/plat/imx/imx93/platform.mk --- a/plat/imx/imx93/platform.mk
+++ b/plat/imx/imx93/platform.mk +++ b/plat/imx/imx93/platform.mk
@@ -57,3 +57,7 @@ BL32_BASE ?= 0x96000000 @@ -61,3 +61,7 @@ BL32_BASE ?= 0x96000000
BL32_SIZE ?= 0x02000000 BL32_SIZE ?= 0x02000000
$(eval $(call add_define,BL32_BASE)) $(eval $(call add_define,BL32_BASE))
$(eval $(call add_define,BL32_SIZE)) $(eval $(call add_define,BL32_SIZE))

16
meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf/0003-imx8mn-Define-UART1-as-console-for-boot-stage.patch
View File

@ -4,6 +4,8 @@ Subject: [PATCH] imx8mn: Define UART1 as console for boot stage
UART1 is the default console for ConnectCore i.MX8M Nano UART1 is the default console for ConnectCore i.MX8M Nano
Upstream-Status: Inappropriate [digi specific]
Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com> Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com> Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
--- ---
@ -12,10 +14,10 @@ Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
2 files changed, 2 insertions(+), 2 deletions(-) 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 diff --git a/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c b/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c
index c87748a1888a..2dd3ab409e97 100644 index 312eb32d1..9a82be010 100644
--- a/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c --- a/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c
+++ b/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c +++ b/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c
@@ -106,7 +106,7 @@ static const struct imx_rdc_cfg rdc[] = { @@ -110,7 +110,7 @@ static const struct imx_rdc_cfg rdc[] = {
/* peripherals domain permission */ /* peripherals domain permission */
RDC_PDAPn(RDC_PDAP_UART4, D1R | D1W), RDC_PDAPn(RDC_PDAP_UART4, D1R | D1W),
@ -25,15 +27,15 @@ index c87748a1888a..2dd3ab409e97 100644
/* memory region */ /* memory region */
diff --git a/plat/imx/imx8m/imx8mn/platform.mk b/plat/imx/imx8m/imx8mn/platform.mk diff --git a/plat/imx/imx8m/imx8mn/platform.mk b/plat/imx/imx8m/imx8mn/platform.mk
index 8da9b298cfba..90c8bd0bab6b 100644 index da4e40aa3..0e38cfa0b 100644
--- a/plat/imx/imx8m/imx8mn/platform.mk --- a/plat/imx/imx8m/imx8mn/platform.mk
+++ b/plat/imx/imx8m/imx8mn/platform.mk +++ b/plat/imx/imx8m/imx8mn/platform.mk
@@ -63,7 +63,7 @@ $(eval $(call add_define,BL32_BASE)) @@ -65,7 +65,7 @@ $(eval $(call add_define,BL32_BASE))
BL32_SIZE ?= 0x2000000 BL32_SIZE ?= 0x2000000
$(eval $(call add_define,BL32_SIZE)) $(eval $(call add_define,BL32_SIZE))
-IMX_BOOT_UART_BASE ?= 0x30890000 -IMX_BOOT_UART_BASE ?= 0x30890000
+IMX_BOOT_UART_BASE ?= 0x30860000 +IMX_BOOT_UART_BASE ?= 0x30860000
$(eval $(call add_define,IMX_BOOT_UART_BASE)) ifeq (${IMX_BOOT_UART_BASE},auto)
override IMX_BOOT_UART_BASE := 0
$(eval $(call add_define,IMX8M_DDR4_DVFS)) endif

6
meta-digi-arm/dynamic-layers/freescale-layer/recipes-bsp/imx-atf/imx-atf/0004-imx8mn-Disable-M7-debug-console.patch
View File

@ -5,6 +5,8 @@ Subject: [PATCH] imx8mn: Disable M7 debug console
The Cortex-M7 uses the UART4 as debug console, and it is The Cortex-M7 uses the UART4 as debug console, and it is
shared with the Cortex-A53. shared with the Cortex-A53.
Upstream-Status: Inappropriate [digi specific]
Signed-off-by: Mike Engel <Mike.Engel@digi.com> Signed-off-by: Mike Engel <Mike.Engel@digi.com>
Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com> Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com> Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
@ -13,10 +15,10 @@ Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c b/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c diff --git a/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c b/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c
index 2dd3ab409e97..0ad3bd9edf83 100644 index 9a82be010..7f9a0f5f4 100644
--- a/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c --- a/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c
+++ b/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c +++ b/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c
@@ -105,7 +105,7 @@ static const struct imx_rdc_cfg rdc[] = { @@ -109,7 +109,7 @@ static const struct imx_rdc_cfg rdc[] = {
RDC_MDAn(RDC_MDA_M7, DID1), RDC_MDAn(RDC_MDA_M7, DID1),
/* peripherals domain permission */ /* peripherals domain permission */