diff options
| -rw-r--r-- | meta-arm-bsp/recipes-security/optee/files/optee-os/n1sdp/0003-HACK-disable-instruction-cache-and-data-cache.patch | 46 | ||||
| -rw-r--r-- | meta-arm-bsp/recipes-security/optee/files/optee-os/n1sdp/0003-Handle-logging-syscall.patch (renamed from meta-arm-bsp/recipes-security/optee/files/optee-os/n1sdp/0004-Handle-logging-syscall.patch) | 0 | ||||
| -rw-r--r-- | meta-arm-bsp/recipes-security/optee/files/optee-os/n1sdp/0004-plat-n1sdp-register-DRAM1-to-optee-os.patch (renamed from meta-arm-bsp/recipes-security/optee/files/optee-os/n1sdp/0005-plat-n1sdp-register-DRAM1-to-optee-os.patch) | 0 | ||||
| -rw-r--r-- | meta-arm-bsp/recipes-security/optee/files/optee-os/n1sdp/0005-plat-n1sdp-add-external-device-tree-base-and-size.patch (renamed from meta-arm-bsp/recipes-security/optee/files/optee-os/n1sdp/0006-plat-n1sdp-add-external-device-tree-base-and-size.patch) | 0 | ||||
| -rw-r--r-- | meta-arm-bsp/recipes-security/optee/optee-os-n1sdp.inc | 7 |
5 files changed, 3 insertions, 50 deletions
diff --git a/meta-arm-bsp/recipes-security/optee/files/optee-os/n1sdp/0003-HACK-disable-instruction-cache-and-data-cache.patch b/meta-arm-bsp/recipes-security/optee/files/optee-os/n1sdp/0003-HACK-disable-instruction-cache-and-data-cache.patch deleted file mode 100644 index e8f4cc44..00000000 --- a/meta-arm-bsp/recipes-security/optee/files/optee-os/n1sdp/0003-HACK-disable-instruction-cache-and-data-cache.patch +++ /dev/null @@ -1,46 +0,0 @@ -Upstream-Status: Pending [Not submitted to upstream yet] -Signed-off-by: Vishnu Banavath <vishnu.banavath@arm.com> - -From 0c3ce4c09cd7d2ff4cd2e62acab899dd88dc9514 Mon Sep 17 00:00:00 2001 -From: Vishnu Banavath <vishnu.banavath@arm.com> -Date: Wed, 20 Jul 2022 16:45:59 +0100 -Subject: [PATCH] HACK: disable instruction cache and data cache. - -For some reason, n1sdp fails to boot with instruction cache and -data cache enabled. This is a temporary change to disable I cache -and D cache until a proper fix is found. - -Signed-off-by: Vishnu Banavath <vishnu.banavath@arm.com> - -%% original patch: 0003-HACK-disable-instruction-cache-and-data-cache.patch - -diff --git a/core/arch/arm/kernel/entry_a64.S b/core/arch/arm/kernel/entry_a64.S -index 875b6e69..594d6928 100644 ---- a/core/arch/arm/kernel/entry_a64.S -+++ b/core/arch/arm/kernel/entry_a64.S -@@ -52,7 +52,7 @@ - - .macro set_sctlr_el1 - mrs x0, sctlr_el1 -- orr x0, x0, #SCTLR_I -+ bic x0, x0, #SCTLR_I - orr x0, x0, #SCTLR_SA - orr x0, x0, #SCTLR_SPAN - #if defined(CFG_CORE_RWDATA_NOEXEC) -@@ -490,11 +490,11 @@ LOCAL_FUNC enable_mmu , : , .identity_map - isb - - /* Enable I and D cache */ -- mrs x1, sctlr_el1 -+ /* mrs x1, sctlr_el1 - orr x1, x1, #SCTLR_I - orr x1, x1, #SCTLR_C - msr sctlr_el1, x1 -- isb -+ isb */ - - /* Adjust stack pointers and return address */ - msr spsel, #1 --- -2.17.1 - diff --git a/meta-arm-bsp/recipes-security/optee/files/optee-os/n1sdp/0004-Handle-logging-syscall.patch b/meta-arm-bsp/recipes-security/optee/files/optee-os/n1sdp/0003-Handle-logging-syscall.patch index 67d98725..67d98725 100644 --- a/meta-arm-bsp/recipes-security/optee/files/optee-os/n1sdp/0004-Handle-logging-syscall.patch +++ b/meta-arm-bsp/recipes-security/optee/files/optee-os/n1sdp/0003-Handle-logging-syscall.patch diff --git a/meta-arm-bsp/recipes-security/optee/files/optee-os/n1sdp/0005-plat-n1sdp-register-DRAM1-to-optee-os.patch b/meta-arm-bsp/recipes-security/optee/files/optee-os/n1sdp/0004-plat-n1sdp-register-DRAM1-to-optee-os.patch index d9e20f8c..d9e20f8c 100644 --- a/meta-arm-bsp/recipes-security/optee/files/optee-os/n1sdp/0005-plat-n1sdp-register-DRAM1-to-optee-os.patch +++ b/meta-arm-bsp/recipes-security/optee/files/optee-os/n1sdp/0004-plat-n1sdp-register-DRAM1-to-optee-os.patch diff --git a/meta-arm-bsp/recipes-security/optee/files/optee-os/n1sdp/0006-plat-n1sdp-add-external-device-tree-base-and-size.patch b/meta-arm-bsp/recipes-security/optee/files/optee-os/n1sdp/0005-plat-n1sdp-add-external-device-tree-base-and-size.patch index 74c94e0a..74c94e0a 100644 --- a/meta-arm-bsp/recipes-security/optee/files/optee-os/n1sdp/0006-plat-n1sdp-add-external-device-tree-base-and-size.patch +++ b/meta-arm-bsp/recipes-security/optee/files/optee-os/n1sdp/0005-plat-n1sdp-add-external-device-tree-base-and-size.patch diff --git a/meta-arm-bsp/recipes-security/optee/optee-os-n1sdp.inc b/meta-arm-bsp/recipes-security/optee/optee-os-n1sdp.inc index a40c93dc..4045f355 100644 --- a/meta-arm-bsp/recipes-security/optee/optee-os-n1sdp.inc +++ b/meta-arm-bsp/recipes-security/optee/optee-os-n1sdp.inc @@ -8,10 +8,9 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files/optee-os/n1sdp:" SRC_URI:append = " \ file://0001-core-arm-add-MPIDR-affinity-shift-and-mask-for-32-bi.patch \ file://0002-plat-n1sdp-add-N1SDP-platform-support.patch \ - file://0003-HACK-disable-instruction-cache-and-data-cache.patch \ - file://0004-Handle-logging-syscall.patch \ - file://0005-plat-n1sdp-register-DRAM1-to-optee-os.patch \ - file://0006-plat-n1sdp-add-external-device-tree-base-and-size.patch \ + file://0003-Handle-logging-syscall.patch \ + file://0004-plat-n1sdp-register-DRAM1-to-optee-os.patch \ + file://0005-plat-n1sdp-add-external-device-tree-base-and-size.patch \ " EXTRA_OEMAKE += " CFG_TEE_CORE_LOG_LEVEL=4" |