From 3d4ee0bdf7bc5d3ec549b6cf3a06d5324f730d69 Mon Sep 17 00:00:00 2001
From: Josep Orga <jorga@somdevices.com>
Date: Thu, 30 Dec 2021 18:52:13 +0100
Subject: [PATCH] meta-somdevices: Changes to optee and imx-atf to be able to
 enable optee with 1GB configuration.

Signed-off-by: Josep Orga <jorga@somdevices.com>
---
 ...l32-base-address-for-imx8mm-platform.patch | 24 +++++++++++++++++++
 recipes-bsp/imx-atf/imx-atf_%.bbappend        |  5 ++++
 ...memory-size-form-2GB-to-1GB-mx8mmevk.patch | 24 +++++++++++++++++++
 .../optee-imx/optee-os_3.13.0.imx.bbappend    |  5 ++++
 4 files changed, 58 insertions(+)
 create mode 100644 recipes-bsp/imx-atf/files/0001-Change-bl32-base-address-for-imx8mm-platform.patch
 create mode 100644 recipes-bsp/imx-atf/imx-atf_%.bbappend
 create mode 100644 recipes-security/optee-imx/files/0001-Change-memory-size-form-2GB-to-1GB-mx8mmevk.patch
 create mode 100644 recipes-security/optee-imx/optee-os_3.13.0.imx.bbappend

diff --git a/recipes-bsp/imx-atf/files/0001-Change-bl32-base-address-for-imx8mm-platform.patch b/recipes-bsp/imx-atf/files/0001-Change-bl32-base-address-for-imx8mm-platform.patch
new file mode 100644
index 0000000..352ce22
--- /dev/null
+++ b/recipes-bsp/imx-atf/files/0001-Change-bl32-base-address-for-imx8mm-platform.patch
@@ -0,0 +1,24 @@
+From 785e5a221d65b9543664da89cbfefc7ad5532555 Mon Sep 17 00:00:00 2001
+Date: Thu, 1 Apr 2021 23:50:32 +0000
+Subject: [PATCH] Change bl32 base address for imx8mm platform
+
+---
+ plat/imx/imx8m/imx8mm/platform.mk | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plat/imx/imx8m/imx8mm/platform.mk b/plat/imx/imx8m/imx8mm/platform.mk
+index 83ebad65b..d330fc560 100644
+--- a/plat/imx/imx8m/imx8mm/platform.mk
++++ b/plat/imx/imx8m/imx8mm/platform.mk
+@@ -56,7 +56,7 @@ ERRATA_A53_835769	:=	1
+ ERRATA_A53_843419	:=	1
+ ERRATA_A53_855873	:=	1
+ 
+-BL32_BASE		?=	0xbe000000
++BL32_BASE		?=	0x7e000000
+ $(eval $(call add_define,BL32_BASE))
+ 
+ BL32_SIZE		?=	0x2000000
+-- 
+2.25.1
+
diff --git a/recipes-bsp/imx-atf/imx-atf_%.bbappend b/recipes-bsp/imx-atf/imx-atf_%.bbappend
new file mode 100644
index 0000000..bcd6b87
--- /dev/null
+++ b/recipes-bsp/imx-atf/imx-atf_%.bbappend
@@ -0,0 +1,5 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+# COMPATIBLE_MACHINE = "(imx8|imx8mm-somdevices-c0p1)"
+SRC_URI += " \
+    file://0001-Change-bl32-base-address-for-imx8mm-platform.patch \
+"
diff --git a/recipes-security/optee-imx/files/0001-Change-memory-size-form-2GB-to-1GB-mx8mmevk.patch b/recipes-security/optee-imx/files/0001-Change-memory-size-form-2GB-to-1GB-mx8mmevk.patch
new file mode 100644
index 0000000..806c48a
--- /dev/null
+++ b/recipes-security/optee-imx/files/0001-Change-memory-size-form-2GB-to-1GB-mx8mmevk.patch
@@ -0,0 +1,24 @@
+From 361fab22212a33d7b720d71186a19cae4ffb4cab Mon Sep 17 00:00:00 2001
+Date: Fri, 2 Apr 2021 21:11:48 +0000
+Subject: [PATCH] Change memory size form 2GB to 1GB mx8mmevk
+
+---
+ core/arch/arm/plat-imx/conf.mk | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/core/arch/arm/plat-imx/conf.mk b/core/arch/arm/plat-imx/conf.mk
+index b4fbfed5..8652146f 100644
+--- a/core/arch/arm/plat-imx/conf.mk
++++ b/core/arch/arm/plat-imx/conf.mk
+@@ -343,7 +343,7 @@ CFG_UART_BASE ?= UART1_BASE
+ endif
+ 
+ ifneq (,$(filter $(PLATFORM_FLAVOR),mx8mmevk))
+-CFG_DDR_SIZE ?= 0x80000000
++CFG_DDR_SIZE ?= 0x40000000
+ CFG_UART_BASE ?= UART2_BASE
+ endif
+ 
+-- 
+2.25.1
+
diff --git a/recipes-security/optee-imx/optee-os_3.13.0.imx.bbappend b/recipes-security/optee-imx/optee-os_3.13.0.imx.bbappend
new file mode 100644
index 0000000..9b76caf
--- /dev/null
+++ b/recipes-security/optee-imx/optee-os_3.13.0.imx.bbappend
@@ -0,0 +1,5 @@
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+SRC_URI += "file://0001-Change-memory-size-form-2GB-to-1GB-mx8mmevk.patch \
+            "
+
+PLATFORM_FLAVOR_imx8mm-somdevices-c0p1 = "mx8mmevk"
-- 
2.17.1