aboutsummaryrefslogtreecommitdiffstats
path: root/dashboard/config/linux/bits
diff options
context:
space:
mode:
authorDmitry Vyukov <dvyukov@google.com>2020-12-13 14:22:55 +0100
committerDmitry Vyukov <dvyukov@google.com>2020-12-13 18:56:54 +0100
commit8f160dd5d603e9cd86705baad260794afa3e5cb3 (patch)
tree443e6bce053dd4a4a85448d79769b982756bf9de /dashboard/config/linux/bits
parentbef888ec76fd133b9689255c652aacd1e306d56e (diff)
dashboard/config/linux: enable USB_RAW_GADGET in android
Fixes #2339
Diffstat (limited to 'dashboard/config/linux/bits')
-rw-r--r--dashboard/config/linux/bits/subsystems.yml4
-rw-r--r--dashboard/config/linux/bits/usb.yml3
2 files changed, 3 insertions, 4 deletions
diff --git a/dashboard/config/linux/bits/subsystems.yml b/dashboard/config/linux/bits/subsystems.yml
index 0f243b8be..ca7a2e97e 100644
--- a/dashboard/config/linux/bits/subsystems.yml
+++ b/dashboard/config/linux/bits/subsystems.yml
@@ -1264,9 +1264,7 @@ config:
- USB_CONFIGFS_F_FS
- USB_CONFIGFS_F_MIDI
- USB_CONFIGFS_SERIAL
- # 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_RAW_GADGET: [v5.5]
- USB_FEW_INIT_RETRIES: [v5.10]
- TYPEC
- TYPEC_TCPM
diff --git a/dashboard/config/linux/bits/usb.yml b/dashboard/config/linux/bits/usb.yml
index a6a6bea6e..4b956fa1f 100644
--- a/dashboard/config/linux/bits/usb.yml
+++ b/dashboard/config/linux/bits/usb.yml
@@ -6,7 +6,8 @@
config:
- USB_SUPPORT
- USB_GADGET
- - USB_RAW_GADGET: [v5.5]
+ # It's introduced in v5.5 or so, but we want it in android-5.4, but it's not present in stable/chromeos-5.4.
+ - USB_RAW_GADGET: [v5.4, -chromeos-5.4]
- USB_DUMMY_HCD
# We don't need/test these on the USB instance.
- USB_GADGETFS: n