# HG changeset patch # User Mychaela Falconia # Date 1529390358 0 # Node ID 24078551b6200cad5d50cb09f0cf99000db6843a # Parent 41f2cc21bca958521d543abd955c0867f9c059b7 build system: set ALLOW_CSIM_GSM=1 by default for hybrid configs diff -r 41f2cc21bca9 -r 24078551b620 components/aci-tcs3 --- a/components/aci-tcs3 Tue Jun 19 06:27:16 2018 +0000 +++ b/components/aci-tcs3 Tue Jun 19 06:39:18 2018 +0000 @@ -79,6 +79,11 @@ CPPFLAGS="$CPPFLAGS -DTI_PS_FF_AT_P_CMD_STDR" CPPFLAGS="$CPPFLAGS -DTI_PS_FF_CONC_SMS" +if [ "$ALLOW_CSIM_GSM" = 1 ] +then + CPPFLAGS="$CPPFLAGS -DALLOW_CSIM_GSM" +fi + # Includes CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/inc" diff -r 41f2cc21bca9 -r 24078551b620 components/sim_b_lib --- a/components/sim_b_lib Tue Jun 19 06:27:16 2018 +0000 +++ b/components/sim_b_lib Tue Jun 19 06:39:18 2018 +0000 @@ -59,6 +59,11 @@ CPPFLAGS="$CPPFLAGS -DDTI2" CPPFLAGS="$CPPFLAGS -DUART" +if [ "$ALLOW_CSIM_GSM" = 1 ] +then + CPPFLAGS="$CPPFLAGS -DALLOW_CSIM_GSM" +fi + # Includes SRCDIR=$SRC/g23m-gsm/sim diff -r 41f2cc21bca9 -r 24078551b620 configure.sh --- a/configure.sh Tue Jun 19 06:27:16 2018 +0000 +++ b/configure.sh Tue Jun 19 06:39:18 2018 +0000 @@ -101,6 +101,7 @@ # miscellaneous configurable feature settings +ALLOW_CSIM_GSM=1 SERIAL_DYNAMIC_SWITCH=0 TR_BAUD_CONFIG=TR_BAUD_115200 @@ -207,7 +208,7 @@ export DISABLE_SLEEP export INIT_blob export DSAMPLE_FULL_COLOR UI_CONFIG -export SERIAL_DYNAMIC_SWITCH TR_BAUD_CONFIG +export ALLOW_CSIM_GSM SERIAL_DYNAMIC_SWITCH TR_BAUD_CONFIG SUBDIR= LIBS=