optee-imx: reorder patches and apply independently of platform

The Digi commits on the optee-os repository are 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 <hector.palacios@digi.com>

meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-os/0002-core-imx-support-ccimx91-dvk.patch

@@ -11,10 +11,10 @@ Signed-off-by: Javier Viguera <javier.viguera@digi.com>
  2 files changed, 7 insertions(+)
 
 diff --git a/core/arch/arm/plat-imx/conf.mk b/core/arch/arm/plat-imx/conf.mk
-index d1fc2882e598..ffa39129e0be 100644
+index 62cc51b61063..c65e383edf38 100644
 --- a/core/arch/arm/plat-imx/conf.mk
 +++ b/core/arch/arm/plat-imx/conf.mk
-@@ -95,6 +95,7 @@ mx95-flavorlist = \
+@@ -96,6 +96,7 @@ mx95-flavorlist = \
  	mx95evk \
  
  mx91-flavorlist = \
@@ -22,7 +22,7 @@ index d1fc2882e598..ffa39129e0be 100644
  	mx91evk \
  
  ifneq (,$(filter $(PLATFORM_FLAVOR),$(mx6ul-flavorlist)))
-@@ -494,6 +495,11 @@ CFG_DDR_SIZE ?= 0x80000000
+@@ -504,6 +505,11 @@ CFG_DDR_SIZE ?= 0x80000000
  CFG_UART_BASE ?= UART1_BASE
  endif
  

meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-os/0003-core-imx-support-ccimx93-dvk.patch

@@ -7,16 +7,17 @@ SOC revision A0 requires a different build.
 Upstream-Status: Inappropriate [DEY specific]
 
 Signed-off-by: Javier Viguera <javier.viguera@digi.com>
+Signed-off-by: Hector Palacios <hector.palacios@digi.com>
 ---
  core/arch/arm/plat-imx/conf.mk           | 13 +++++++++++++
- core/arch/arm/plat-imx/registers/imx93.h |  5 +++++
+ core/arch/arm/plat-imx/registers/imx93.h |  4 ++++
- 2 files changed, 18 insertions(+)
+ 2 files changed, 17 insertions(+)
 
 diff --git a/core/arch/arm/plat-imx/conf.mk b/core/arch/arm/plat-imx/conf.mk
-index d1fc2882e598..4e7b065ec180 100644
+index c65e383edf38..ee0b6d6a0463 100644
 --- a/core/arch/arm/plat-imx/conf.mk
 +++ b/core/arch/arm/plat-imx/conf.mk
-@@ -89,6 +89,8 @@ mx8ulp-flavorlist = \
+@@ -90,6 +90,8 @@ mx8ulp-flavorlist = \
  	mx8ulpevk \
  
  mx93-flavorlist = \
@@ -25,8 +26,8 @@ index d1fc2882e598..4e7b065ec180 100644
  	mx93evk \
  
  mx95-flavorlist = \
-@@ -494,6 +496,17 @@ CFG_DDR_SIZE ?= 0x80000000
+@@ -510,6 +512,17 @@ CFG_DDR_SIZE ?= 0x20000000
- CFG_UART_BASE ?= UART1_BASE
+ CFG_UART_BASE ?= UART6_BASE
  endif
  
 +ifneq (,$(filter $(PLATFORM_FLAVOR),ccimx93dvk))
@@ -44,15 +45,10 @@ index d1fc2882e598..4e7b065ec180 100644
  CFG_DDR_SIZE ?= 0x80000000
  CFG_UART_BASE ?= UART1_BASE
 diff --git a/core/arch/arm/plat-imx/registers/imx93.h b/core/arch/arm/plat-imx/registers/imx93.h
-index 21080da82d04..29070eb917ac 100644
+index 17f4d8f5755e..29070eb917ac 100644
 --- a/core/arch/arm/plat-imx/registers/imx93.h
 +++ b/core/arch/arm/plat-imx/registers/imx93.h
-@@ -9,11 +9,16 @@
+@@ -14,7 +14,11 @@
- #define GICR_BASE 0x48040000
- 
- #define UART1_BASE 0x44380000
-+#define UART6_BASE 0x425a0000
- /*
   * For Normal MU - Use MU_BASE as 0x47520000
   * For Trust MU - Use MU_BASE as 0x47530000
   */

meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-os/0004-core-ccimx93-enable-AES_HUK-trusted-application.patch

@@ -26,10 +26,10 @@ Signed-off-by: Javier Viguera <javier.viguera@digi.com>
  create mode 100644 ta/aes_huk/user_ta_header_defines.h
 
 diff --git a/core/arch/arm/plat-imx/conf.mk b/core/arch/arm/plat-imx/conf.mk
-index 4e7b065ec180..4e8b351bd877 100644
+index ee0b6d6a0463..916b6b6a1fbb 100644
 --- a/core/arch/arm/plat-imx/conf.mk
 +++ b/core/arch/arm/plat-imx/conf.mk
-@@ -499,12 +499,14 @@ endif
+@@ -515,12 +515,14 @@ endif
  ifneq (,$(filter $(PLATFORM_FLAVOR),ccimx93dvk))
  CFG_DDR_SIZE ?= 0x40000000
  CFG_UART_BASE ?= UART6_BASE

meta-digi-arm/dynamic-layers/freescale-layer/recipes-security/optee-imx/optee-os_4.4.0.imx.bbappend

@@ -3,17 +3,11 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:"
 
 SRC_URI += "file://environment.d-optee-sdk.sh"
 
-SRC_URI:append:ccimx8mm = " \
+SRC_URI:append:dey = " \
     file://0001-plat-imx-add-support-for-ConnectCore-8M-Mini.patch \
-"
+    file://0002-core-imx-support-ccimx91-dvk.patch \
-
+    file://0003-core-imx-support-ccimx93-dvk.patch \
-SRC_URI:append:ccimx91 = " \
+    file://0004-core-ccimx93-enable-AES_HUK-trusted-application.patch \
-    file://0001-core-imx-support-ccimx91-dvk.patch \
-"
-
-SRC_URI:append:ccimx93 = " \
-    file://0001-core-imx-support-ccimx93-dvk.patch \
-    file://0002-core-ccimx93-enable-AES_HUK-trusted-application.patch \
 "
 
 PLATFORM_FLAVOR:ccimx8mm = "ccimx8mmdvk"