From 761e7987c8dec314800eb6a099aad139a12a12a9 Mon Sep 17 00:00:00 2001 From: Amaury Pouly Date: Thu, 8 Jan 2015 22:30:22 +0100 Subject: 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 --- firmware/usb.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'firmware/usb.c') 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 -- cgit v1.2.3