mirror of
https://github.com/Heleguo/lede.git
synced 2025-12-16 10:51:12 +00:00
Merge branch 'coolsnowwolf:master' into master
This commit is contained in:
commit
27c7f2bc9f
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
Loading…
Reference in New Issue
Block a user