configure: Add prompt for USB Serial into the advanced mode

And explicitly disable USB_ENABLE_SERIAL when HAVE_USBSTACK is not define

Change-Id: Ieb4176b02a60eb1b9db81f0b8c69403898a76ca1

2 files changed, 10 insertions, 6 deletions

diff --git a/firmware/logf.c b/firmware/logf.c
index 3f9bd36112..11ffa4e15c 100644
--- a/firmware/logf.c
+++ b/firmware/logf.c
@@ -43,6 +43,8 @@
 #ifdef HAVE_USBSTACK
 #include "usb_core.h"
 #include "usbstack/usb_serial.h"
+#else
+#undef USB_ENABLE_SERIAL
 #endif
 
 #ifdef ROCKBOX_HAS_LOGDISKF
diff --git a/tools/configure b/tools/configure
index b8e495a908..36e951e4d2 100755
--- a/tools/configure
+++ b/tools/configure
@@ -919,7 +919,7 @@ whichadvanced () {
     interact=1
     echo ""
     printf "Enter your developer options (press only enter when done)\n\
-(D)EBUG, (L)ogf, Boot(c)hart, (S)imulator, (P)rofiling, (V)oice, (W)in32 crosscompile,\n\
+(D)EBUG, (L)ogf, Boot(c)hart, (S)imulator, (P)rofiling, (V)oice, (U)SB Serial, (W)in32 crosscompile,\n\
 Win(6)4 crosscompile, (T)est plugins, S(m)all C lib, Logf to Ser(i)al port:"
     if [ "$modelname" = "iaudiom5" ]; then
       printf ", (F)M radio MOD"
@@ -999,6 +999,11 @@ Win(6)4 crosscompile, (T)est plugins, S(m)all C lib, Logf to Ser(i)al port:"
           echo "RTC functions enabled (DS1339/DS3231)"
         fi
         ;;
+      [Uu])
+        echo "USB Serial support enabled"
+        use_usb_serial="#define USB_ENABLE_SERIAL"
+        logf="yes"
+        ;;
       [Ww])
         echo "Enabling Windows cross-compiling (32-bit)"
         win32crosscompile="yes"
@@ -4660,14 +4665,11 @@ ${use_logf_serial}
 /* Define this to record a chart with timings for the stages of boot */
 ${use_bootchart}
 
-/* optional define for a backlight modded Ondio */
-${have_backlight}
-
 /* optional define for FM radio mod for iAudio M5 */
 ${have_fmradio_in}
 
-/* optional define for ATA poweroff on Player */
-${have_ata_poweroff}
+/* optional define for USB Serial */
+${use_usb_serial}
 
 /* optional defines for RTC mod for h1x0 */
 ${config_rtc}