From: Zhang Zhijie <zhangzj@rock-chips.com>
Date: Wed, 19 Apr 2017 02:25:33 +0000 (+0800)
Subject: ARM: rockchip_defconfig: default to enable optee driver
X-Git-Tag: release-20171130_firefly~4^2~767
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=744ef6b734a6f130902fcab588ee555ee1e5768e;p=firefly-linux-kernel-4.4.55.git

ARM: rockchip_defconfig: default to enable optee driver

Change-Id: I9364ddb9e7f05a20d5e283b9386b98b10d9c5552
Signed-off-by: Zhang Zhijie <zhangzj@rock-chips.com>
---

diff --git a/arch/arm/configs/rockchip_defconfig b/arch/arm/configs/rockchip_defconfig
index 143b91bdfd2e..333e5d5e7872 100644
--- a/arch/arm/configs/rockchip_defconfig
+++ b/arch/arm/configs/rockchip_defconfig
@@ -640,6 +640,7 @@ CONFIG_ENABLE_DEFAULT_TRACERS=y
 CONFIG_KEYS=y
 CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y
 CONFIG_SECURITY=y
+CONFIG_TEE_SUPPORT=y
 CONFIG_SECURITY_NETWORK=y
 CONFIG_LSM_MMAP_MIN_ADDR=4096
 CONFIG_HARDENED_USERCOPY=y