From 1c332d92647638e09a3b42f5b9077b5f97e8f21f Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Fri, 14 Nov 2025 19:04:08 +0800 Subject: [PATCH] uboot-rk35xx: disabe optee build for rk35xx by default --- package/boot/uboot-rk35xx/Makefile | 2 +- .../patches/100-disable-optee-build.patch | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/package/boot/uboot-rk35xx/Makefile b/package/boot/uboot-rk35xx/Makefile index 10867bf7d..2aa3be017 100644 --- a/package/boot/uboot-rk35xx/Makefile +++ b/package/boot/uboot-rk35xx/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=uboot-rk35xx -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/radxa/u-boot diff --git a/package/boot/uboot-rk35xx/patches/100-disable-optee-build.patch b/package/boot/uboot-rk35xx/patches/100-disable-optee-build.patch index 97a4c5e78..6b3baf6eb 100644 --- a/package/boot/uboot-rk35xx/patches/100-disable-optee-build.patch +++ b/package/boot/uboot-rk35xx/patches/100-disable-optee-build.patch @@ -6,6 +6,15 @@ CONFIG_RK_AVB_LIBAVB_USER=y -CONFIG_OPTEE_CLIENT=y -CONFIG_OPTEE_V2=y +--- a/configs/rk3568_defconfig ++++ b/configs/rk3568_defconfig +@@ -222,6 +222,3 @@ + CONFIG_AVB_LIBAVB_ATX=y + CONFIG_AVB_LIBAVB_USER=y + CONFIG_RK_AVB_LIBAVB_USER=y +-CONFIG_OPTEE_CLIENT=y +-CONFIG_OPTEE_V2=y +-CONFIG_OPTEE_ALWAYS_USE_SECURITY_PARTITION=y --- a/configs/rk3576_defconfig +++ b/configs/rk3576_defconfig @@ -224,6 +224,3 @@ CONFIG_AVB_LIBAVB_AB=y @@ -15,3 +24,12 @@ -CONFIG_OPTEE_CLIENT=y -CONFIG_OPTEE_V2=y -CONFIG_OPTEE_ALWAYS_USE_SECURITY_PARTITION=y +--- a/configs/rk3588_defconfig ++++ b/configs/rk3588_defconfig +@@ -232,6 +232,3 @@ + CONFIG_AVB_LIBAVB_ATX=y + CONFIG_AVB_LIBAVB_USER=y + CONFIG_RK_AVB_LIBAVB_USER=y +-CONFIG_OPTEE_CLIENT=y +-CONFIG_OPTEE_V2=y +-CONFIG_OPTEE_ALWAYS_USE_SECURITY_PARTITION=y