From b65219d64e433be385bcf64343c4cfd84f31b6d4 Mon Sep 17 00:00:00 2001 From: "Huang, Tao" Date: Tue, 5 Jul 2016 19:06:08 +0800 Subject: [PATCH] arm64: rockchip_defconfig: merge android config enable CONFIG_QUOTA enable CONFIG_IP_NF_NAT remove CONFIG_UID_STAT enable CONFIG_SECURITY_PERF_EVENTS_RESTRICT Change-Id: I989605e59b77294b70d40a8ab67760eae30ec6e4 Signed-off-by: Huang, Tao --- arch/arm64/configs/rockchip_defconfig | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/arm64/configs/rockchip_defconfig b/arch/arm64/configs/rockchip_defconfig index 0ccc3d543890..1a77a3d9ed74 100644 --- a/arch/arm64/configs/rockchip_defconfig +++ b/arch/arm64/configs/rockchip_defconfig @@ -150,13 +150,16 @@ CONFIG_NETFILTER_XT_MATCH_STRING=y CONFIG_NETFILTER_XT_MATCH_TIME=y CONFIG_NETFILTER_XT_MATCH_U32=y CONFIG_NF_CONNTRACK_IPV4=y -CONFIG_NF_NAT_IPV4=y CONFIG_IP_NF_IPTABLES=y CONFIG_IP_NF_MATCH_AH=y CONFIG_IP_NF_MATCH_ECN=y CONFIG_IP_NF_MATCH_TTL=y CONFIG_IP_NF_FILTER=y CONFIG_IP_NF_TARGET_REJECT=y +CONFIG_IP_NF_NAT=y +CONFIG_IP_NF_TARGET_MASQUERADE=y +CONFIG_IP_NF_TARGET_NETMAP=y +CONFIG_IP_NF_TARGET_REDIRECT=y CONFIG_IP_NF_MANGLE=y CONFIG_IP_NF_RAW=y CONFIG_IP_NF_SECURITY=y @@ -205,7 +208,6 @@ CONFIG_ZRAM_LZ4_COMPRESS=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_SIZE=8192 -CONFIG_UID_STAT=y CONFIG_SRAM=y CONFIG_ROCKCHIP_SCR=y CONFIG_SCSI=y @@ -569,6 +571,7 @@ CONFIG_EXT2_FS=y CONFIG_EXT2_FS_XATTR=y CONFIG_EXT3_FS=y CONFIG_EXT4_FS_SECURITY=y +CONFIG_QUOTA=y CONFIG_FUSE_FS=y CONFIG_ISO9660_FS=y CONFIG_JOLIET=y @@ -602,6 +605,7 @@ CONFIG_TIMER_STATS=y CONFIG_ENABLE_DEFAULT_TRACERS=y CONFIG_DEBUG_RODATA=y CONFIG_KEYS=y +CONFIG_SECURITY_PERF_EVENTS_RESTRICT=y CONFIG_SECURITY=y CONFIG_SECURITY_NETWORK=y CONFIG_LSM_MMAP_MIN_ADDR=4096 -- 2.34.1