--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/configs/hybrid-aci2	Fri Oct 14 19:53:30 2016 +0000
@@ -0,0 +1,137 @@
+# This config is a FAILED experiment to see if the TCS211 version of ACI
+# could be compiled with condat3 headers.
+
+scripts/config-headers.sh gprs 2091-pruned
+
+CONDAT=condat3
+GPF=gpf3
+CDGINC=cdg3/cdginc-conservative
+CDGPRIM=cdg3/sap-inline
+ACI=g23m-aci
+export CONDAT GPF CDGINC CDGPRIM ACI
+
+GPRS=1
+MMI=0
+SRVC=1
+export GPRS MMI SRVC
+
+build_lib ccddata
+
+# ACI libs
+build_lib aci classic
+build_lib aciext classic
+build_lib aci_dti_mng classic
+build_lib atiext classic
+build_lib comlib hybrid
+build_lib config_gprs_fl hybrid
+build_lib config_gprs_ir hybrid
+lib_link_magic '(BSS_LIBS (.bss) CONST_LIBS (.text, .const))'
+
+# G23M protocol stack libs
+build_lib alr sotovik
+build_lib cc
+build_lib cci
+build_lib cci_ir
+lib_link_magic '(BSS_LIBS (.bss) CONST_LIBS (.text, .const))'
+build_lib cl
+build_lib dl
+build_lib dti
+build_lib fad
+build_lib gmm
+build_lib grlc
+build_lib grlc_ir
+lib_link_magic '(BSS_LIBS (.bss) CONST_LIBS (.text, .const))'
+build_lib grr
+build_lib l1_pei
+build_lib l2r
+build_lib llc
+build_lib mm
+build_lib ra
+build_lib rlp
+build_lib rr
+build_lib sim_b_lib
+build_lib sm
+build_lib sms
+build_lib sndcp
+build_lib ss
+build_lib t30
+build_lib uart_b_lib
+build_lib ppp
+build_lib ppp_ir
+lib_link_magic '(BSS_LIBS (.bss) CONST_LIBS (.text, .const))'
+build_lib upm
+
+# Condat drivers
+build_lib gdi
+
+# GPF
+build_lib    ccd_na7_db
+blob_lib_gpf frame_na7_db_fl
+blob_lib_custom blobs/patches/frame_na7_db_ir-systrace.lib frame_na7_db_ir
+lib_link_magic '(BSS_LIBS (.bss) CONST_LIBS (.text, .const))'
+blob_lib_gpf misc_na7_db_fl
+blob_lib_gpf misc_na7_db_ir
+lib_link_magic '(BSS_LIBS (.bss) CONST_LIBS (.text, .const))'
+blob_lib_gpf osx_na7_db
+lib_link_magic '(BSS_LIBS (.bss) CONST_LIBS (.text, .const))'
+blob_lib_gpf tif_na7_db_fl
+blob_lib_gpf tif_na7_db_ir
+lib_link_magic '(BSS_LIBS (.bss) CONST_LIBS (.text, .const))'
+
+# core drivers
+build_lib drivers_flash
+
+# Layer 1
+build_lib tpudrv
+lib_link_magic '(BSS_LIBS (.bss) CONST_LIBS (.text, .const))'
+build_lib l1_ext
+lib_link_magic '(BSS_LIBS (.l1s_global))'
+build_lib l1_int
+lib_link_magic '(BSS_LIBS (.bss) CONST_LIBS (.text, .const))'
+blob_lib_std l1_custom_ext
+blob_lib_std l1_custom_int
+lib_link_magic '(BSS_LIBS (.bss) CONST_LIBS (.text, .const))'
+
+build_lib riviera_core_flash
+build_lib riviera_cust_flash
+
+# services
+#build_lib atp
+build_lib audio
+build_lib audio_bgd
+build_lib cst
+build_lib dar
+build_lib dar_gbl_var
+lib_link_magic '(BSS_DAR_LIB (.bss))'
+build_lib etm
+build_lib lls
+#build_lib mks
+
+# app drivers
+build_lib abb
+build_lib buzzer
+build_lib ffs
+build_lib ffs_drv
+build_lib ffs_pcm
+build_lib kpd
+#build_lib lcc
+build_lib power
+build_lib rtc_drv
+build_lib sim_drv
+build_lib spi_drv
+build_lib uart_drv
+
+# system glue
+build_lib main
+build_lib bootloader
+lib_link_magic '(CONST_BOOT_LIB (.const, .text, .text:v$3) BSS_BOOT_LIB (.bss))'
+
+# Nucleus and TI's compiler stuff
+blob_lib_os nucleus_flash_nodbg
+blob_lib_os nucleus_int_ram_nodbg
+lib_link_magic '(BSS_LIBS (.bss) CONST_LIBS (.text, .const))'
+blob_lib_os rts16le_flash
+blob_lib_os rts16le_int_ram
+lib_link_magic '(BSS_LIBS (.bss))'
+
+str2ind_blobs_used=0

--- a/configs/voice-subst	Fri Oct 14 18:43:33 2016 +0000
+++ b/configs/voice-subst	Fri Oct 14 19:53:30 2016 +0000
@@ -1,5 +1,5 @@
-# This config is an attempt to recompile the voice-only subset of G23M libs
-# with TCS211 Condat headers and preserve the TCS211 environment otherwise.
+# This config is a FAILED experiment to see if the G23M libs for the
+# voice-only subset could be compiled with condat2 headers.
 
 scripts/config-headers.sh gprs 2091-pruned