From: Yann Dirson <y...@blade-group.com> This is the current state of working patches being discussed in https://github.com/OP-TEE/optee_os/issues/4542 --- conf/machine/include/rk3399.inc | 2 + ...399-enable-serial-console-by-default.patch | 46 +++++++++++++++++++ .../optee/files/rk3399-boot-fix.patch | 13 ++++++ recipes-security/optee/optee%.bbappend | 2 + recipes-security/optee/optee-os_%.bbappend | 9 ++++ 5 files changed, 72 insertions(+) create mode 100644 recipes-security/optee/files/0001-rk3399-enable-serial-console-by-default.patch create mode 100644 recipes-security/optee/files/rk3399-boot-fix.patch create mode 100644 recipes-security/optee/optee-os_%.bbappend
diff --git a/conf/machine/include/rk3399.inc b/conf/machine/include/rk3399.inc index f6b7826..9ac434e 100644 --- a/conf/machine/include/rk3399.inc +++ b/conf/machine/include/rk3399.inc @@ -13,6 +13,8 @@ KBUILD_DEFCONFIG ?= "defconfig" KERNEL_CLASSES = "kernel-fitimage" KERNEL_IMAGETYPE = "fitImage" +OPTEEMACHINE = "rockchip-rk3399" + TFA_PLATFORM = "rk3399" TFA_BUILD_TARGET = "bl31" diff --git a/recipes-security/optee/files/0001-rk3399-enable-serial-console-by-default.patch b/recipes-security/optee/files/0001-rk3399-enable-serial-console-by-default.patch new file mode 100644 index 0000000..31daef7 --- /dev/null +++ b/recipes-security/optee/files/0001-rk3399-enable-serial-console-by-default.patch @@ -0,0 +1,46 @@ +From 0e2cbe08532a1344aab62f21b032ce6171e50f49 Mon Sep 17 00:00:00 2001 +From: Yann Dirson <y...@blade-group.com> +Date: Mon, 12 Apr 2021 10:49:18 +0200 +Subject: [PATCH] rk3399: enable serial console by default +Upstream-Status: Submitted [https://github.com/OP-TEE/optee_os/pull/4551] + +Signed-off-by: Yann Dirson <y...@blade-group.com> +--- + core/arch/arm/plat-rockchip/conf.mk | 6 ++++++ + 1 file changed, 6 insertions(+) + +Index: git/core/arch/arm/plat-rockchip/conf.mk +=================================================================== +--- git.orig/core/arch/arm/plat-rockchip/conf.mk ++++ git/core/arch/arm/plat-rockchip/conf.mk +@@ -26,8 +26,6 @@ CFG_EARLY_CONSOLE_BAUDRATE ?= 1500000 + CFG_EARLY_CONSOLE_CLK_IN_HZ ?= 24000000 + endif + +-CFG_EARLY_CONSOLE ?= n +- + ifeq ($(PLATFORM_FLAVOR),rk3399) + include core/arch/arm/cpu/cortex-armv8-0.mk + $(call force,CFG_TEE_CORE_NB_CORE,6) +@@ -37,6 +35,12 @@ CFG_TZDRAM_START ?= 0x30000000 + CFG_TZDRAM_SIZE ?= 0x02000000 + CFG_SHMEM_START ?= 0x32000000 + CFG_SHMEM_SIZE ?= 0x00400000 ++ ++CFG_EARLY_CONSOLE ?= y ++CFG_EARLY_CONSOLE_BASE ?= UART2_BASE ++CFG_EARLY_CONSOLE_SIZE ?= UART2_SIZE ++CFG_EARLY_CONSOLE_BAUDRATE ?= 1500000 ++CFG_EARLY_CONSOLE_CLK_IN_HZ ?= 24000000 + endif + + ifeq ($(PLATFORM_FLAVOR),px30) +@@ -47,6 +51,8 @@ CFG_TZDRAM_START ?= 0x30000000 + CFG_TZDRAM_SIZE ?= 0x02000000 + CFG_SHMEM_START ?= 0x32000000 + CFG_SHMEM_SIZE ?= 0x00400000 ++ ++CFG_EARLY_CONSOLE ?= n + endif + + ifeq ($(platform-flavor-armv8),1) diff --git a/recipes-security/optee/files/rk3399-boot-fix.patch b/recipes-security/optee/files/rk3399-boot-fix.patch new file mode 100644 index 0000000..d346157 --- /dev/null +++ b/recipes-security/optee/files/rk3399-boot-fix.patch @@ -0,0 +1,13 @@ +Index: git/core/arch/arm/kernel/entry_a64.S +=================================================================== +--- git.orig/core/arch/arm/kernel/entry_a64.S ++++ git/core/arch/arm/kernel/entry_a64.S +@@ -219,7 +219,7 @@ clear_nex_bss: + adr_l x0, __text_start + ldr x1, cached_mem_end + sub x1, x1, x0 +- bl dcache_cleaninv_range ++/* bl dcache_cleaninv_range*/ + + + /* diff --git a/recipes-security/optee/optee%.bbappend b/recipes-security/optee/optee%.bbappend index 2a8722a..ec11863 100644 --- a/recipes-security/optee/optee%.bbappend +++ b/recipes-security/optee/optee%.bbappend @@ -1,2 +1,4 @@ +COMPATIBLE_MACHINE_rk3399 ?= "rk3399" + inherit features_check REQUIRED_DISTRO_FEATURES = "optee" diff --git a/recipes-security/optee/optee-os_%.bbappend b/recipes-security/optee/optee-os_%.bbappend new file mode 100644 index 0000000..eceb694 --- /dev/null +++ b/recipes-security/optee/optee-os_%.bbappend @@ -0,0 +1,9 @@ +EXTRA_OEMAKE_append_rk3399 = " \ + CFG_CORE_ASLR=n \ +" + +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" +SRC_URI += "\ + file://rk3399-boot-fix.patch \ + file://0001-rk3399-enable-serial-console-by-default.patch \ +" -- 2.30.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#53134): https://lists.yoctoproject.org/g/yocto/message/53134 Mute This Topic: https://lists.yoctoproject.org/mt/82092716/21656 Group Owner: yocto+ow...@lists.yoctoproject.org Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
