From 8f160dd5d603e9cd86705baad260794afa3e5cb3 Mon Sep 17 00:00:00 2001 From: Dmitry Vyukov Date: Sun, 13 Dec 2020 14:22:55 +0100 Subject: dashboard/config/linux: enable USB_RAW_GADGET in android Fixes #2339 --- dashboard/config/linux/bits/subsystems.yml | 4 +--- dashboard/config/linux/bits/usb.yml | 3 ++- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'dashboard/config/linux/bits') 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 -- cgit mrf-deployment