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

hardknott: imx-atf: adapt patches to latest revision 

Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
This commit is contained in:
Gabriel Valcazar 2021-12-23 11:22:17 +01:00
parent 8db6ddabd7
commit cf38841b02
4 changed files with 26 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
meta-digi-arm/recipes-bsp/imx-atf/imx-atf/0001-imx8mm-Define-UART1-as-console-for-boot-stage.patch
View File

@ -5,42 +5,21 @@ Subject: [PATCH] imx8mm: Define UART1 as console for boot stage
UART1 is the default console for ConnectCore i.MX8M Mini
Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
---
plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c | 2 +-
plat/imx/imx8m/imx8mm/platform.mk | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
plat/imx/imx8m/imx8mm/platform.mk | 2 +-
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
index bc2e5a0bf..e9a6a2b7f 100644
--- a/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c
+++ b/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c
@@ -57,11 +57,11 @@ static const struct imx_rdc_cfg rdc[] = {
/* Master domain assignment */
RDC_MDAn(RDC_MDA_M4, DID1),
/* peripherals domain permission */
RDC_PDAPn(RDC_PDAP_UART4, D1R | D1W),
- RDC_PDAPn(RDC_PDAP_UART2, D0R | D0W),
+ RDC_PDAPn(RDC_PDAP_UART1, D0R | D0W),
/* memory region */
/* Sentinel */
{0},
diff --git a/plat/imx/imx8m/imx8mm/platform.mk b/plat/imx/imx8m/imx8mm/platform.mk
index 83ebad65b..f47bdec22 100644
--- a/plat/imx/imx8m/imx8mm/platform.mk
+++ b/plat/imx/imx8m/imx8mm/platform.mk
@@ -60,11 +60,11 @@ BL32_BASE ?= 0xbe000000
$(eval $(call add_define,BL32_BASE))
@@ -62,7 +62,7 @@ $(eval $(call add_define,BL32_BASE))
BL32_SIZE ?= 0x2000000
$(eval $(call add_define,BL32_SIZE))
-IMX_BOOT_UART_BASE ?= 0x30890000
+IMX_BOOT_UART_BASE ?= 0x30860000
$(eval $(call add_define,IMX_BOOT_UART_BASE))
ifeq (${SPD},trusty)
BL31_CFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1
endif

25
meta-digi-arm/recipes-bsp/imx-atf/imx-atf/0001-imx8mn-Define-UART1-as-console-for-boot-stage.patch
View File

@ -5,42 +5,35 @@ Subject: [PATCH] imx8mn: Define UART1 as console for boot stage
UART1 is the default console for ConnectCore i.MX8M Nano
Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
---
plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c | 2 +-
plat/imx/imx8m/imx8mn/platform.mk | 2 +-
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
index d82d00dc6..c0a3ddc19 100644
index 71f3758c3..19be3e91c 100644
--- a/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c
+++ b/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c
@@ -49,11 +49,11 @@ static const struct imx_rdc_cfg rdc[] = {
/* Master domain assignment */
RDC_MDAn(RDC_MDA_M7, DID1),
@@ -51,7 +51,7 @@ static const struct imx_rdc_cfg rdc[] = {
/* peripherals domain permission */
RDC_PDAPn(RDC_PDAP_UART4, D1R | D1W),
- RDC_PDAPn(RDC_PDAP_UART2, D0R | D0W),
+ RDC_PDAPn(RDC_PDAP_UART1, D0R | D0W),
RDC_PDAPn(RDC_PDAP_RDC, D0R | D0W | D1R),
/* memory region */
RDC_MEM_REGIONn(16, 0x0, 0x0, 0xff),
RDC_MEM_REGIONn(17, 0x0, 0x0, 0xff),
RDC_MEM_REGIONn(18, 0x0, 0x0, 0xff),
diff --git a/plat/imx/imx8m/imx8mn/platform.mk b/plat/imx/imx8m/imx8mn/platform.mk
index 22846f289..fb5bef02d 100644
--- a/plat/imx/imx8m/imx8mn/platform.mk
+++ b/plat/imx/imx8m/imx8mn/platform.mk
@@ -60,11 +60,11 @@ BL32_BASE ?= 0x56000000
$(eval $(call add_define,BL32_BASE))
@@ -62,7 +62,7 @@ $(eval $(call add_define,BL32_BASE))
BL32_SIZE ?= 0x2000000
$(eval $(call add_define,BL32_SIZE))
-IMX_BOOT_UART_BASE ?= 0x30890000
+IMX_BOOT_UART_BASE ?= 0x30860000
$(eval $(call add_define,IMX_BOOT_UART_BASE))
ifeq (${SPD},trusty)
BL31_CFLAGS += -DPLAT_XLAT_TABLES_DYNAMIC=1
endif

14
meta-digi-arm/recipes-bsp/imx-atf/imx-atf/0002-imx8mm-Disable-M4-debug-console.patch
View File

@ -12,19 +12,15 @@ Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
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
index e16b72eb2..040f1a75f 100644
index f63b9fcad..8c9aa4de1 100644
--- a/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c
+++ b/plat/imx/imx8m/imx8mm/imx8mm_bl31_setup.c
@@ -56,11 +56,11 @@ static const struct aipstz_cfg aipstz[] = {
static const struct imx_rdc_cfg rdc[] = {
/* Master domain assignment */
@@ -58,7 +58,7 @@ static const struct imx_rdc_cfg rdc[] = {
RDC_MDAn(RDC_MDA_M4, DID1),
/* peripherals domain permission */
- RDC_PDAPn(RDC_PDAP_UART4, D1R | D1W),
+ /*RDC_PDAPn(RDC_PDAP_UART4, D1R | D1W),*/
RDC_PDAPn(RDC_PDAP_UART2, D0R | D0W),
RDC_PDAPn(RDC_PDAP_UART1, D0R | D0W),
/* memory region */
/* Sentinel */

15
meta-digi-arm/recipes-bsp/imx-atf/imx-atf/0002-imx8mn-Disable-M7-debug-console.patch
View File

@ -7,24 +7,21 @@ shared with the Cortex-A53.
Signed-off-by: Mike Engel <Mike.Engel@digi.com>
Signed-off-by: Arturo Buzarra <arturo.buzarra@digi.com>
Signed-off-by: Gabriel Valcazar <gabriel.valcazar@digi.com>
---
plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c | 2 +-
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
index 1bfacb409..768eed26a 100644
index 19be3e91c..c7c504788 100644
--- a/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c
+++ b/plat/imx/imx8m/imx8mn/imx8mn_bl31_setup.c
@@ -55,11 +55,11 @@ static const struct aipstz_cfg aipstz[] = {
static const struct imx_rdc_cfg rdc[] = {
/* Master domain assignment */
@@ -50,7 +50,7 @@ static const struct imx_rdc_cfg rdc[] = {
RDC_MDAn(RDC_MDA_M7, DID1),
/* peripherals domain permission */
- RDC_PDAPn(RDC_PDAP_UART4, D1R | D1W),
+ /*RDC_PDAPn(RDC_PDAP_UART4, D1R | D1W),*/
RDC_PDAPn(RDC_PDAP_UART1, D0R | D0W),
/* memory region */
RDC_MEM_REGIONn(16, 0x0, 0x0, 0xff),
RDC_MEM_REGIONn(17, 0x0, 0x0, 0xff),
RDC_PDAPn(RDC_PDAP_RDC, D0R | D0W | D1R),