summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2019-04-21 19:00:04 -0400
committerTom Rini <trini@konsulko.com>2019-04-21 19:00:04 -0400
commit6c5f8dd540d7a8eff244d4c27a09451ca12c8d20 (patch)
tree9eaba554d99f15aa5dfc302c338f59895f9b43e4 /scripts
parentb4fde1633e67bb618fd33aad6e6322b7cecf1154 (diff)
parent7fd9f31c6bd13609da61b985cf8f5f65ebebd913 (diff)
downloadu-boot-6c5f8dd540d7a8eff244d4c27a09451ca12c8d20.tar.gz
Merge branch 'master' of git://git.denx.de/u-boot-usb
- Various fastboot, dwc2/stm32 updates
Diffstat (limited to 'scripts')
-rw-r--r--scripts/config_whitelist.txt1
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 5092c3fb4c..421362d953 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -4537,7 +4537,6 @@ CONFIG_USB_GADGET_SUPERH
CONFIG_USB_INVENTRA_DMA
CONFIG_USB_ISP1301_I2C_ADDR
CONFIG_USB_MAX_CONTROLLER_COUNT
-CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT
CONFIG_USB_MUSB_TIMEOUT
CONFIG_USB_MUSB_TUSB6010
CONFIG_USB_OHCI_EP93XX