aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2020-10-20 14:02:01 +0200
committerDmitry Vyukov <dvyukov@google.com>2020-10-21 10:22:10 +0200
commitd7941fd3d9bb5a2f3b5fdbed144cc13cdaf7f5b8 (patch)
treeef797dc898e2b88ac341d77737600c4daf131c1f
parentcc97498cfe89a38b9837444d5b00b73b67ebdaa6 (diff)
dashboard/config/linux: enable some new configs
Selectively enable new configs that we can reach. Update #2171
-rw-r--r--dashboard/config/linux/bits/subsystems.yml5
-rw-r--r--dashboard/config/linux/stable-5.4-kasan.config2
-rw-r--r--dashboard/config/linux/upstream-kasan.config11
-rw-r--r--dashboard/config/linux/upstream-kcsan.config2
-rw-r--r--dashboard/config/linux/upstream-kmsan.config2
-rw-r--r--dashboard/config/linux/upstream-leak.config2
6 files changed, 15 insertions, 9 deletions
diff --git a/dashboard/config/linux/bits/subsystems.yml b/dashboard/config/linux/bits/subsystems.yml
index 7fde71230..9c3f76201 100644
--- a/dashboard/config/linux/bits/subsystems.yml
+++ b/dashboard/config/linux/bits/subsystems.yml
@@ -134,6 +134,7 @@ config:
- XFRM_INTERFACE
- XFRM_SUB_POLICY
- XFRM_STATISTICS
+ - XFRM_USER_COMPAT: [linux-next]
- NET_KEY
- NET_KEY_MIGRATE
- SMC
@@ -632,6 +633,7 @@ config:
- CAN_RAW
- CAN_BCM
- CAN_GW
+ - CAN_ISOTP: [linux-next]
- CAN_CALC_BITTIMING
- BT
- BT_BREDR
@@ -643,6 +645,7 @@ config:
- BT_CMTP
- BT_HIDP
- BT_LE
+ - BT_HS
- BT_6LOWPAN
- BT_LEDS
- BT_MSFTEXT: [v5.5]
@@ -1244,6 +1247,7 @@ config:
# It's introduced in v5.5 or so, but we want it in android-5.4, but it's not present in stable-5.4.
# A better way to express this would to add "or" operator (v5.5||android-5.4), but for now we have this.
- USB_RAW_GADGET: [v5.4, -stable-5.4]
+ - USB_FEW_INIT_RETRIES: [linux-next]
- TYPEC
- TYPEC_TCPM
- TYPEC_UCSI
@@ -1637,6 +1641,7 @@ config:
- CRYPTO_DEV_QAT_C3XXXVF: [x86_64]
- CRYPTO_DEV_QAT_C62XVF: [x86_64]
- CRYPTO_DEV_VIRTIO
+ - CRYPTO_SM2: [linux-next]
- ASYMMETRIC_TPM_KEY_SUBTYPE
- PKCS8_PRIVATE_KEY_PARSER
- TPM_KEY_PARSER
diff --git a/dashboard/config/linux/stable-5.4-kasan.config b/dashboard/config/linux/stable-5.4-kasan.config
index 35a66b81b..ca38118a8 100644
--- a/dashboard/config/linux/stable-5.4-kasan.config
+++ b/dashboard/config/linux/stable-5.4-kasan.config
@@ -1774,7 +1774,7 @@ CONFIG_BT_BNEP_MC_FILTER=y
CONFIG_BT_BNEP_PROTO_FILTER=y
CONFIG_BT_CMTP=y
CONFIG_BT_HIDP=y
-# CONFIG_BT_HS is not set
+CONFIG_BT_HS=y
CONFIG_BT_LE=y
CONFIG_BT_6LOWPAN=y
CONFIG_BT_LEDS=y
diff --git a/dashboard/config/linux/upstream-kasan.config b/dashboard/config/linux/upstream-kasan.config
index 8a0c4a0c6..d33d15827 100644
--- a/dashboard/config/linux/upstream-kasan.config
+++ b/dashboard/config/linux/upstream-kasan.config
@@ -996,6 +996,7 @@ CONFIG_MAPPING_DIRTY_HELPERS=y
# end of Memory Management options
CONFIG_NET=y
+CONFIG_WANT_COMPAT_NETLINK_MESSAGES=y
CONFIG_COMPAT_NETLINK_MESSAGES=y
CONFIG_NET_INGRESS=y
CONFIG_NET_EGRESS=y
@@ -1017,7 +1018,7 @@ CONFIG_XFRM=y
CONFIG_XFRM_OFFLOAD=y
CONFIG_XFRM_ALGO=y
CONFIG_XFRM_USER=y
-# CONFIG_XFRM_USER_COMPAT is not set
+CONFIG_XFRM_USER_COMPAT=y
CONFIG_XFRM_INTERFACE=y
CONFIG_XFRM_SUB_POLICY=y
CONFIG_XFRM_MIGRATE=y
@@ -1774,7 +1775,7 @@ CONFIG_CAN_RAW=y
CONFIG_CAN_BCM=y
CONFIG_CAN_GW=y
CONFIG_CAN_J1939=y
-# CONFIG_CAN_ISOTP is not set
+CONFIG_CAN_ISOTP=y
#
# CAN Device Drivers
@@ -1828,7 +1829,7 @@ CONFIG_BT_BNEP_MC_FILTER=y
CONFIG_BT_BNEP_PROTO_FILTER=y
CONFIG_BT_CMTP=y
CONFIG_BT_HIDP=y
-# CONFIG_BT_HS is not set
+CONFIG_BT_HS=y
CONFIG_BT_LE=y
CONFIG_BT_6LOWPAN=y
CONFIG_BT_LEDS=y
@@ -5695,7 +5696,7 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
# Miscellaneous USB options
#
CONFIG_USB_DEFAULT_PERSIST=y
-# CONFIG_USB_FEW_INIT_RETRIES is not set
+CONFIG_USB_FEW_INIT_RETRIES=y
CONFIG_USB_DYNAMIC_MINORS=y
CONFIG_USB_OTG=y
# CONFIG_USB_OTG_PRODUCTLIST is not set
@@ -7936,7 +7937,7 @@ CONFIG_CRYPTO_DH=y
CONFIG_CRYPTO_ECC=y
CONFIG_CRYPTO_ECDH=y
CONFIG_CRYPTO_ECRDSA=y
-# CONFIG_CRYPTO_SM2 is not set
+CONFIG_CRYPTO_SM2=y
CONFIG_CRYPTO_CURVE25519=y
CONFIG_CRYPTO_CURVE25519_X86=y
diff --git a/dashboard/config/linux/upstream-kcsan.config b/dashboard/config/linux/upstream-kcsan.config
index 161f93950..f0f4482cc 100644
--- a/dashboard/config/linux/upstream-kcsan.config
+++ b/dashboard/config/linux/upstream-kcsan.config
@@ -1816,7 +1816,7 @@ CONFIG_BT_BNEP_MC_FILTER=y
CONFIG_BT_BNEP_PROTO_FILTER=y
CONFIG_BT_CMTP=y
CONFIG_BT_HIDP=y
-# CONFIG_BT_HS is not set
+CONFIG_BT_HS=y
CONFIG_BT_LE=y
CONFIG_BT_6LOWPAN=y
CONFIG_BT_LEDS=y
diff --git a/dashboard/config/linux/upstream-kmsan.config b/dashboard/config/linux/upstream-kmsan.config
index 868ac9566..93fc14159 100644
--- a/dashboard/config/linux/upstream-kmsan.config
+++ b/dashboard/config/linux/upstream-kmsan.config
@@ -1799,7 +1799,7 @@ CONFIG_BT_BNEP_MC_FILTER=y
CONFIG_BT_BNEP_PROTO_FILTER=y
CONFIG_BT_CMTP=y
CONFIG_BT_HIDP=y
-# CONFIG_BT_HS is not set
+CONFIG_BT_HS=y
CONFIG_BT_LE=y
CONFIG_BT_6LOWPAN=y
CONFIG_BT_LEDS=y
diff --git a/dashboard/config/linux/upstream-leak.config b/dashboard/config/linux/upstream-leak.config
index f6421775d..8abd5f0f0 100644
--- a/dashboard/config/linux/upstream-leak.config
+++ b/dashboard/config/linux/upstream-leak.config
@@ -1815,7 +1815,7 @@ CONFIG_BT_BNEP_MC_FILTER=y
CONFIG_BT_BNEP_PROTO_FILTER=y
CONFIG_BT_CMTP=y
CONFIG_BT_HIDP=y
-# CONFIG_BT_HS is not set
+CONFIG_BT_HS=y
CONFIG_BT_LE=y
CONFIG_BT_6LOWPAN=y
CONFIG_BT_LEDS=y