# HG changeset patch
# User Mychaela Falconia <falcon@freecalypso.org>
# Date 1541572264 0
# Node ID 7f0681afe43090451c28ad1308f5b2fcb4fdf4ec
# Parent  225e396523872604660e08daadf2eccf4512dd55
RVTMUX_ON_MODEM config var brought over from Magnetite

diff -r 225e39652387 -r 7f0681afe430 components/main
--- a/components/main	Wed Nov 07 06:18:05 2018 +0000
+++ b/components/main	Wed Nov 07 06:31:04 2018 +0000
@@ -6,7 +6,7 @@
 CFLAGS_gcc="-g -O2 -fno-builtin -mthumb-interwork -mthumb"
 CPPFLAGS="-DTOOL_CHOICE=0 -D_TMS470"
 
-if [ "$TARGET" = c139 -o "$TARGET" = c11x ]
+if [ "$RVTMUX_ON_MODEM" = 1 ]
 then
 	CPPFLAGS="$CPPFLAGS -DCONFIG_RVTMUX_ON_MODEM"
 fi
diff -r 225e39652387 -r 7f0681afe430 configure-gcc.sh
--- a/configure-gcc.sh	Wed Nov 07 06:18:05 2018 +0000
+++ b/configure-gcc.sh	Wed Nov 07 06:31:04 2018 +0000
@@ -81,6 +81,15 @@
 		exit 1
 esac
 
+# RVTMUX config default based on target
+
+if [ "$TARGET" = c11x -o "$TARGET" = c139 -o "$TARGET" = c155 ]
+then
+	RVTMUX_ON_MODEM=1
+else
+	RVTMUX_ON_MODEM=0
+fi
+
 # miscellaneous configurable feature settings
 
 ALLOW_CSIM_GSM=1
@@ -168,7 +177,8 @@
 export CHIPSET DSP RF
 export AMR L1_DYN_DSP_DWNLD L1_VOICE_MEMO_AMR MELODY_E2 SPEECH_RECO
 export DISABLE_SLEEP
-export ALLOW_CSIM_GSM MEMSUPER SERIAL_DYNAMIC_SWITCH TR_BAUD_CONFIG
+export ALLOW_CSIM_GSM MEMSUPER
+export RVTMUX_ON_MODEM SERIAL_DYNAMIC_SWITCH TR_BAUD_CONFIG
 export GPRS SRVC FCHG_STATE
 
 scripts/config-headers.sh
diff -r 225e39652387 -r 7f0681afe430 configure-tms470.sh
--- a/configure-tms470.sh	Wed Nov 07 06:18:05 2018 +0000
+++ b/configure-tms470.sh	Wed Nov 07 06:31:04 2018 +0000
@@ -76,6 +76,15 @@
 		exit 1
 esac
 
+# RVTMUX config default based on target
+
+if [ "$TARGET" = c11x -o "$TARGET" = c139 -o "$TARGET" = c155 ]
+then
+	RVTMUX_ON_MODEM=1
+else
+	RVTMUX_ON_MODEM=0
+fi
+
 # miscellaneous configurable feature settings
 
 ALLOW_CSIM_GSM=1
@@ -191,7 +200,8 @@
 export CHIPSET DSP RF
 export AMR L1_DYN_DSP_DWNLD L1_VOICE_MEMO_AMR MELODY_E2 SPEECH_RECO
 export DISABLE_SLEEP
-export ALLOW_CSIM_GSM MEMSUPER SERIAL_DYNAMIC_SWITCH TR_BAUD_CONFIG
+export ALLOW_CSIM_GSM MEMSUPER
+export RVTMUX_ON_MODEM SERIAL_DYNAMIC_SWITCH TR_BAUD_CONFIG
 export GPRS SRVC FCHG_STATE
 
 scripts/config-headers.sh