len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-14 02:27:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

configure: Add prompt for USB Serial into the advanced mode

Browse source 
And explicitly disable USB_ENABLE_SERIAL when HAVE_USBSTACK is not define

Change-Id: Ieb4176b02a60eb1b9db81f0b8c69403898a76ca1
This commit is contained in:
Solomon Peachy 2020-11-18 08:30:01 -05:00
parent 20774d88b5
commit 7c87467ba4
2 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
firmware/logf.c
View file

@ -43,6 +43,8 @@
#ifdef HAVE_USBSTACK #ifdef HAVE_USBSTACK
#include "usb_core.h" #include "usb_core.h"
#include "usbstack/usb_serial.h" #include "usbstack/usb_serial.h"
#else
#undef USB_ENABLE_SERIAL
#endif #endif
#ifdef ROCKBOX_HAS_LOGDISKF #ifdef ROCKBOX_HAS_LOGDISKF

14
tools/configure vendored
View file

@ -919,7 +919,7 @@ whichadvanced () {
interact=1 interact=1
echo "" echo ""
printf "Enter your developer options (press only enter when done)\n\ 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:" Win(6)4 crosscompile, (T)est plugins, S(m)all C lib, Logf to Ser(i)al port:"
if [ "$modelname" = "iaudiom5" ]; then if [ "$modelname" = "iaudiom5" ]; then
printf ", (F)M radio MOD" 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)" echo "RTC functions enabled (DS1339/DS3231)"
fi fi
;; ;;
[Uu])
echo "USB Serial support enabled"
use_usb_serial="#define USB_ENABLE_SERIAL"
logf="yes"
;;
[Ww]) [Ww])
echo "Enabling Windows cross-compiling (32-bit)" echo "Enabling Windows cross-compiling (32-bit)"
win32crosscompile="yes" win32crosscompile="yes"
@ -4660,14 +4665,11 @@ ${use_logf_serial}
/* Define this to record a chart with timings for the stages of boot */ /* Define this to record a chart with timings for the stages of boot */
${use_bootchart} ${use_bootchart}
/* optional define for a backlight modded Ondio */
${have_backlight}
/* optional define for FM radio mod for iAudio M5 */ /* optional define for FM radio mod for iAudio M5 */
${have_fmradio_in} ${have_fmradio_in}
/* optional define for ATA poweroff on Player */ /* optional define for USB Serial */
${have_ata_poweroff} ${use_usb_serial}
/* optional defines for RTC mod for h1x0 */ /* optional defines for RTC mod for h1x0 */
${config_rtc} ${config_rtc}