summaryrefslogtreecommitdiffstats
path: root/firmware/usb.c
diff options
context:
space:
mode:
authorAmaury Pouly <amaury.pouly@gmail.com>2015-01-08 22:30:22 +0100
committerAmaury Pouly <amaury.pouly@gmail.com>2015-01-08 22:30:22 +0100
commit761e7987c8dec314800eb6a099aad139a12a12a9 (patch)
tree1363a95bc8ef2e972c2fd60becfc9d7a795f37f6 /firmware/usb.c
parent246026cfcc1485a29c173fc1b6ed7336f4c00f83 (diff)
downloadrockbox-761e7987c8dec314800eb6a099aad139a12a12a9.tar.gz
rockbox-761e7987c8dec314800eb6a099aad139a12a12a9.tar.bz2
rockbox-761e7987c8dec314800eb6a099aad139a12a12a9.zip
usb: finally get rid of USE_ROCKBOX_USB in Sansa bootloader, use bootloader usb
For some reason, the bootloader and config files didn't define HAVE_BOOTLOADER_USB_MODE, also remove the special cases in usb.c which they implied. Change-Id: I68c29be7d03627e64cac4ff7678e0c211e087a8c
Diffstat (limited to 'firmware/usb.c')
-rw-r--r--firmware/usb.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/firmware/usb.c b/firmware/usb.c
index e5210efc11..ee6ed2c12c 100644
--- a/firmware/usb.c
+++ b/firmware/usb.c
@@ -48,10 +48,8 @@
(defined(HAVE_USBSTACK) && defined(HAVE_BOOTLOADER_USB_MODE)) || \
(defined(HAVE_USBSTACK) && (defined(CREATIVE_ZVx))) || \
(defined(HAVE_USBSTACK) && (defined(OLYMPUS_MROBE_500))) || \
- (defined(HAVE_USBSTACK) && CONFIG_USBOTG == USBOTG_S3C6400X) || \
defined(CPU_TCC77X) || defined(CPU_TCC780X) || \
- (CONFIG_USBOTG == USBOTG_JZ4740) || \
- (defined(HAVE_USBSTACK) && CONFIG_USBOTG == USBOTG_AS3525)
+ (CONFIG_USBOTG == USBOTG_JZ4740)
#define USB_FULL_INIT
#endif