kernel
Revisión | bdf7a59a2adbc83bfa52c67994024d0c25f904f9 (tree) |
---|---|
Tiempo | 2015-07-17 09:30:18 |
Autor | Chih-Wei Huang <cwhuang@linu...> |
Commiter | Chih-Wei Huang |
android-x86: update defconfig for the 4.4-r3 release
@@ -769,6 +769,7 @@ CONFIG_NET_PTP_CLASSIFY=y | ||
769 | 769 | CONFIG_NETFILTER=y |
770 | 770 | # CONFIG_NETFILTER_DEBUG is not set |
771 | 771 | CONFIG_NETFILTER_ADVANCED=y |
772 | +CONFIG_BRIDGE_NETFILTER=m | |
772 | 773 | |
773 | 774 | # |
774 | 775 | # Core Netfilter Configuration |
@@ -882,6 +883,7 @@ CONFIG_NETFILTER_XT_MATCH_MARK=y | ||
882 | 883 | # CONFIG_NETFILTER_XT_MATCH_OSF is not set |
883 | 884 | # CONFIG_NETFILTER_XT_MATCH_OWNER is not set |
884 | 885 | CONFIG_NETFILTER_XT_MATCH_POLICY=y |
886 | +# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set | |
885 | 887 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y |
886 | 888 | CONFIG_NETFILTER_XT_MATCH_QUOTA=y |
887 | 889 | # CONFIG_NETFILTER_XT_MATCH_RATEEST is not set |
@@ -963,16 +965,20 @@ CONFIG_IP6_NF_RAW=y | ||
963 | 965 | CONFIG_IP6_NF_NAT=y |
964 | 966 | CONFIG_IP6_NF_TARGET_MASQUERADE=y |
965 | 967 | CONFIG_IP6_NF_TARGET_NPT=y |
968 | +# CONFIG_BRIDGE_NF_EBTABLES is not set | |
966 | 969 | # CONFIG_IP_DCCP is not set |
967 | 970 | # CONFIG_IP_SCTP is not set |
968 | 971 | # CONFIG_RDS is not set |
969 | 972 | # CONFIG_TIPC is not set |
970 | 973 | # CONFIG_ATM is not set |
971 | 974 | # CONFIG_L2TP is not set |
972 | -# CONFIG_BRIDGE is not set | |
975 | +CONFIG_STP=m | |
976 | +CONFIG_BRIDGE=m | |
977 | +CONFIG_BRIDGE_IGMP_SNOOPING=y | |
973 | 978 | CONFIG_HAVE_NET_DSA=y |
974 | 979 | # CONFIG_VLAN_8021Q is not set |
975 | 980 | # CONFIG_DECNET is not set |
981 | +CONFIG_LLC=m | |
976 | 982 | # CONFIG_LLC2 is not set |
977 | 983 | # CONFIG_IPX is not set |
978 | 984 | # CONFIG_ATALK is not set |
@@ -1077,7 +1083,7 @@ CONFIG_NET_FLOW_LIMIT=y | ||
1077 | 1083 | # CONFIG_HAMRADIO is not set |
1078 | 1084 | # CONFIG_CAN is not set |
1079 | 1085 | # CONFIG_IRDA is not set |
1080 | -CONFIG_BT=m | |
1086 | +CONFIG_BT=y | |
1081 | 1087 | CONFIG_BT_BREDR=y |
1082 | 1088 | CONFIG_BT_RFCOMM=m |
1083 | 1089 | CONFIG_BT_RFCOMM_TTY=y |
@@ -1098,7 +1104,7 @@ CONFIG_BT_HCIUART_H4=y | ||
1098 | 1104 | CONFIG_BT_HCIUART_BCSP=y |
1099 | 1105 | CONFIG_BT_HCIUART_ATH3K=y |
1100 | 1106 | CONFIG_BT_HCIUART_LL=y |
1101 | -# CONFIG_BT_HCIUART_3WIRE is not set | |
1107 | +CONFIG_BT_HCIUART_3WIRE=y | |
1102 | 1108 | CONFIG_BT_HCIBCM203X=m |
1103 | 1109 | CONFIG_BT_HCIBPA10X=m |
1104 | 1110 | CONFIG_BT_HCIBFUSB=m |
@@ -2790,7 +2796,7 @@ CONFIG_PINMUX=y | ||
2790 | 2796 | CONFIG_PINCONF=y |
2791 | 2797 | CONFIG_GENERIC_PINCONF=y |
2792 | 2798 | # CONFIG_DEBUG_PINCTRL is not set |
2793 | -# CONFIG_PINCTRL_BAYTRAIL is not set | |
2799 | +CONFIG_PINCTRL_BAYTRAIL=y | |
2794 | 2800 | CONFIG_PINCTRL_CHERRYVIEW=m |
2795 | 2801 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
2796 | 2802 | CONFIG_GPIOLIB=y |
@@ -5243,6 +5249,7 @@ CONFIG_APPLE_GMUX=m | ||
5243 | 5249 | CONFIG_INTEL_RST=m |
5244 | 5250 | CONFIG_INTEL_SMARTCONNECT=m |
5245 | 5251 | # CONFIG_PVPANIC is not set |
5252 | +CONFIG_SURFACE_BUTTON=m | |
5246 | 5253 | # CONFIG_CHROME_PLATFORMS is not set |
5247 | 5254 | CONFIG_CLKDEV_LOOKUP=y |
5248 | 5255 | CONFIG_HAVE_CLK_PREPARE=y |
@@ -5446,7 +5453,7 @@ CONFIG_SI7020=m | ||
5446 | 5453 | # |
5447 | 5454 | CONFIG_ADIS16400=m |
5448 | 5455 | CONFIG_ADIS16480=m |
5449 | -# CONFIG_KMX61 is not set | |
5456 | +CONFIG_KMX61=m | |
5450 | 5457 | CONFIG_INV_MPU6050_IIO=m |
5451 | 5458 | CONFIG_IIO_ADIS_LIB=m |
5452 | 5459 | CONFIG_IIO_ADIS_LIB_BUFFER=y |
@@ -6075,7 +6082,7 @@ CONFIG_CRYPTO_XTS=y | ||
6075 | 6082 | # |
6076 | 6083 | # Hash modes |
6077 | 6084 | # |
6078 | -CONFIG_CRYPTO_CMAC=m | |
6085 | +CONFIG_CRYPTO_CMAC=y | |
6079 | 6086 | CONFIG_CRYPTO_HMAC=y |
6080 | 6087 | CONFIG_CRYPTO_XCBC=m |
6081 | 6088 | # CONFIG_CRYPTO_VMAC is not set |
@@ -6159,8 +6166,9 @@ CONFIG_CRYPTO_DEFLATE=y | ||
6159 | 6166 | # |
6160 | 6167 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
6161 | 6168 | # CONFIG_CRYPTO_DRBG_MENU is not set |
6162 | -# CONFIG_CRYPTO_USER_API_HASH is not set | |
6163 | -# CONFIG_CRYPTO_USER_API_SKCIPHER is not set | |
6169 | +CONFIG_CRYPTO_USER_API=m | |
6170 | +CONFIG_CRYPTO_USER_API_HASH=m | |
6171 | +CONFIG_CRYPTO_USER_API_SKCIPHER=m | |
6164 | 6172 | # CONFIG_CRYPTO_USER_API_RNG is not set |
6165 | 6173 | # CONFIG_CRYPTO_HW is not set |
6166 | 6174 | CONFIG_HAVE_KVM=y |
@@ -812,6 +812,7 @@ CONFIG_NET_PTP_CLASSIFY=y | ||
812 | 812 | CONFIG_NETFILTER=y |
813 | 813 | # CONFIG_NETFILTER_DEBUG is not set |
814 | 814 | CONFIG_NETFILTER_ADVANCED=y |
815 | +CONFIG_BRIDGE_NETFILTER=m | |
815 | 816 | |
816 | 817 | # |
817 | 818 | # Core Netfilter Configuration |
@@ -925,6 +926,7 @@ CONFIG_NETFILTER_XT_MATCH_MARK=y | ||
925 | 926 | # CONFIG_NETFILTER_XT_MATCH_OSF is not set |
926 | 927 | # CONFIG_NETFILTER_XT_MATCH_OWNER is not set |
927 | 928 | CONFIG_NETFILTER_XT_MATCH_POLICY=y |
929 | +# CONFIG_NETFILTER_XT_MATCH_PHYSDEV is not set | |
928 | 930 | CONFIG_NETFILTER_XT_MATCH_PKTTYPE=y |
929 | 931 | CONFIG_NETFILTER_XT_MATCH_QUOTA=y |
930 | 932 | # CONFIG_NETFILTER_XT_MATCH_RATEEST is not set |
@@ -1006,16 +1008,20 @@ CONFIG_IP6_NF_RAW=y | ||
1006 | 1008 | CONFIG_IP6_NF_NAT=y |
1007 | 1009 | CONFIG_IP6_NF_TARGET_MASQUERADE=y |
1008 | 1010 | CONFIG_IP6_NF_TARGET_NPT=y |
1011 | +# CONFIG_BRIDGE_NF_EBTABLES is not set | |
1009 | 1012 | # CONFIG_IP_DCCP is not set |
1010 | 1013 | # CONFIG_IP_SCTP is not set |
1011 | 1014 | # CONFIG_RDS is not set |
1012 | 1015 | # CONFIG_TIPC is not set |
1013 | 1016 | # CONFIG_ATM is not set |
1014 | 1017 | # CONFIG_L2TP is not set |
1015 | -# CONFIG_BRIDGE is not set | |
1018 | +CONFIG_STP=m | |
1019 | +CONFIG_BRIDGE=m | |
1020 | +CONFIG_BRIDGE_IGMP_SNOOPING=y | |
1016 | 1021 | CONFIG_HAVE_NET_DSA=y |
1017 | 1022 | # CONFIG_VLAN_8021Q is not set |
1018 | 1023 | # CONFIG_DECNET is not set |
1024 | +CONFIG_LLC=m | |
1019 | 1025 | # CONFIG_LLC2 is not set |
1020 | 1026 | # CONFIG_IPX is not set |
1021 | 1027 | # CONFIG_ATALK is not set |
@@ -1119,7 +1125,7 @@ CONFIG_NET_FLOW_LIMIT=y | ||
1119 | 1125 | # CONFIG_HAMRADIO is not set |
1120 | 1126 | # CONFIG_CAN is not set |
1121 | 1127 | # CONFIG_IRDA is not set |
1122 | -CONFIG_BT=m | |
1128 | +CONFIG_BT=y | |
1123 | 1129 | CONFIG_BT_BREDR=y |
1124 | 1130 | CONFIG_BT_RFCOMM=m |
1125 | 1131 | CONFIG_BT_RFCOMM_TTY=y |
@@ -1140,7 +1146,7 @@ CONFIG_BT_HCIUART_H4=y | ||
1140 | 1146 | CONFIG_BT_HCIUART_BCSP=y |
1141 | 1147 | CONFIG_BT_HCIUART_ATH3K=y |
1142 | 1148 | CONFIG_BT_HCIUART_LL=y |
1143 | -# CONFIG_BT_HCIUART_3WIRE is not set | |
1149 | +CONFIG_BT_HCIUART_3WIRE=y | |
1144 | 1150 | CONFIG_BT_HCIBCM203X=m |
1145 | 1151 | CONFIG_BT_HCIBPA10X=m |
1146 | 1152 | CONFIG_BT_HCIBFUSB=m |
@@ -2956,7 +2962,7 @@ CONFIG_PINCONF=y | ||
2956 | 2962 | CONFIG_GENERIC_PINCONF=y |
2957 | 2963 | # CONFIG_DEBUG_PINCTRL is not set |
2958 | 2964 | CONFIG_PINCTRL_SINGLE=m |
2959 | -# CONFIG_PINCTRL_BAYTRAIL is not set | |
2965 | +CONFIG_PINCTRL_BAYTRAIL=y | |
2960 | 2966 | CONFIG_PINCTRL_CHERRYVIEW=m |
2961 | 2967 | CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y |
2962 | 2968 | CONFIG_GPIOLIB=y |
@@ -5529,6 +5535,7 @@ CONFIG_APPLE_GMUX=m | ||
5529 | 5535 | CONFIG_INTEL_RST=m |
5530 | 5536 | CONFIG_INTEL_SMARTCONNECT=m |
5531 | 5537 | # CONFIG_PVPANIC is not set |
5538 | +CONFIG_SURFACE_BUTTON=m | |
5532 | 5539 | # CONFIG_CHROME_PLATFORMS is not set |
5533 | 5540 | CONFIG_CLKDEV_LOOKUP=y |
5534 | 5541 | CONFIG_HAVE_CLK_PREPARE=y |
@@ -5737,7 +5744,7 @@ CONFIG_SI7020=m | ||
5737 | 5744 | # |
5738 | 5745 | CONFIG_ADIS16400=m |
5739 | 5746 | CONFIG_ADIS16480=m |
5740 | -# CONFIG_KMX61 is not set | |
5747 | +CONFIG_KMX61=m | |
5741 | 5748 | CONFIG_INV_MPU6050_IIO=m |
5742 | 5749 | CONFIG_IIO_ADIS_LIB=m |
5743 | 5750 | CONFIG_IIO_ADIS_LIB_BUFFER=y |
@@ -6367,7 +6374,7 @@ CONFIG_CRYPTO_XTS=m | ||
6367 | 6374 | # |
6368 | 6375 | # Hash modes |
6369 | 6376 | # |
6370 | -CONFIG_CRYPTO_CMAC=m | |
6377 | +CONFIG_CRYPTO_CMAC=y | |
6371 | 6378 | CONFIG_CRYPTO_HMAC=y |
6372 | 6379 | CONFIG_CRYPTO_XCBC=m |
6373 | 6380 | # CONFIG_CRYPTO_VMAC is not set |
@@ -6435,8 +6442,9 @@ CONFIG_CRYPTO_DEFLATE=y | ||
6435 | 6442 | # |
6436 | 6443 | # CONFIG_CRYPTO_ANSI_CPRNG is not set |
6437 | 6444 | # CONFIG_CRYPTO_DRBG_MENU is not set |
6438 | -# CONFIG_CRYPTO_USER_API_HASH is not set | |
6439 | -# CONFIG_CRYPTO_USER_API_SKCIPHER is not set | |
6445 | +CONFIG_CRYPTO_USER_API=m | |
6446 | +CONFIG_CRYPTO_USER_API_HASH=m | |
6447 | +CONFIG_CRYPTO_USER_API_SKCIPHER=m | |
6440 | 6448 | # CONFIG_CRYPTO_USER_API_RNG is not set |
6441 | 6449 | # CONFIG_CRYPTO_HW is not set |
6442 | 6450 | CONFIG_HAVE_KVM=y |