From: Huang, Tao <huangtao@rock-chips.com>
Date: Sat, 6 May 2017 06:20:20 +0000 (+0800)
Subject: ARM: rockchip_defconfig: update by savedefconfig
X-Git-Tag: release-20171130_firefly~4^2~657
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=7afca43604f8b6e5de669d27020f2a975d2373a1;p=firefly-linux-kernel-4.4.55.git

ARM: rockchip_defconfig: update by savedefconfig

Change-Id: I96ee84cfa4b40b10f5fb273044a81b22f20f4efb
Signed-off-by: Huang, Tao <huangtao@rock-chips.com>
---

diff --git a/arch/arm/configs/rockchip_defconfig b/arch/arm/configs/rockchip_defconfig
index 333e5d5e7872..4d1d01b7ed42 100644
--- a/arch/arm/configs/rockchip_defconfig
+++ b/arch/arm/configs/rockchip_defconfig
@@ -348,7 +348,6 @@ CONFIG_POWER_RESET=y
 CONFIG_SYSCON_REBOOT_MODE=y
 CONFIG_POWER_AVS=y
 CONFIG_ROCKCHIP_IODOMAIN=y
-CONFIG_ROCKCHIP_CPU_AVS=y
 CONFIG_THERMAL=y
 CONFIG_THERMAL_WRITABLE_TRIPS=y
 CONFIG_THERMAL_DEFAULT_GOV_POWER_ALLOCATOR=y
@@ -640,11 +639,11 @@ 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
 CONFIG_SECURITY_SELINUX=y
+CONFIG_TEE_SUPPORT=y
 CONFIG_CRYPTO_ECHAINIV=y
 CONFIG_CRYPTO_SHA512=y
 CONFIG_CRYPTO_TWOFISH=y