him411/lede-Heleguo
1
0
Fork 0
mirror of https://github.com/Heleguo/lede.git synced 2025-12-16 10:51:12 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'coolsnowwolf:master' into master

Browse Source
This commit is contained in:
mclk623 2025-11-14 22:51:03 +08:00 committed by GitHub
commit 27c7f2bc9f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/boot/uboot-rk35xx/Makefile
View File

@ -8,7 +8,7 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=uboot-rk35xx PKG_NAME:=uboot-rk35xx
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/radxa/u-boot PKG_SOURCE_URL:=https://github.com/radxa/u-boot

18
package/boot/uboot-rk35xx/patches/100-disable-optee-build.patch
View File

@ -6,6 +6,15 @@
CONFIG_RK_AVB_LIBAVB_USER=y CONFIG_RK_AVB_LIBAVB_USER=y
-CONFIG_OPTEE_CLIENT=y -CONFIG_OPTEE_CLIENT=y
-CONFIG_OPTEE_V2=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 --- a/configs/rk3576_defconfig
+++ b/configs/rk3576_defconfig +++ b/configs/rk3576_defconfig
@@ -224,6 +224,3 @@ CONFIG_AVB_LIBAVB_AB=y @@ -224,6 +224,3 @@ CONFIG_AVB_LIBAVB_AB=y
@ -15,3 +24,12 @@
-CONFIG_OPTEE_CLIENT=y -CONFIG_OPTEE_CLIENT=y
-CONFIG_OPTEE_V2=y -CONFIG_OPTEE_V2=y
-CONFIG_OPTEE_ALWAYS_USE_SECURITY_PARTITION=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