# HG changeset patch
# User Mychaela Falconia <falcon@freecalypso.org>
# Date 1516503235 0
# Node ID 59143cd42ec7dd0ded893a4d5f6021a99958365e
# Parent  f9e7fac0b437bc2f9b63dbc497c97225636a5da0
failed attempt to build TCS211 UI atop of the hybrid config

diff -r f9e7fac0b437 -r 59143cd42ec7 components/bmi
--- a/components/bmi	Sat Jan 20 20:03:48 2018 +0000
+++ b/components/bmi	Sun Jan 21 02:53:55 2018 +0000
@@ -79,8 +79,8 @@
 CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
 CPPFLAGS="$CPPFLAGS -I$SRC/aci2/bmi"
 CPPFLAGS="$CPPFLAGS -I$SRC/aci2/mfw"
-CPPFLAGS="$CPPFLAGS -I$SRC/aci2/aci"
-CPPFLAGS="$CPPFLAGS -I$SRC/aci2/ksd"
+CPPFLAGS="$CPPFLAGS -I$SRC/$ACI/aci"
+CPPFLAGS="$CPPFLAGS -I$SRC/$ACI/ksd"
 CPPFLAGS="$CPPFLAGS -I$SRC/aci2/atb"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
diff -r f9e7fac0b437 -r 59143cd42ec7 components/icn
--- a/components/icn	Sat Jan 20 20:03:48 2018 +0000
+++ b/components/icn	Sun Jan 21 02:53:55 2018 +0000
@@ -75,8 +75,8 @@
 CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
 CPPFLAGS="$CPPFLAGS -I$SRC/aci2/bmi"
 CPPFLAGS="$CPPFLAGS -I$SRC/aci2/mfw"
-CPPFLAGS="$CPPFLAGS -I$SRC/aci2/aci"
-CPPFLAGS="$CPPFLAGS -I$SRC/aci2/ksd"
+CPPFLAGS="$CPPFLAGS -I$SRC/$ACI/aci"
+CPPFLAGS="$CPPFLAGS -I$SRC/$ACI/ksd"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
diff -r f9e7fac0b437 -r 59143cd42ec7 components/mfw
--- a/components/mfw	Sat Jan 20 20:03:48 2018 +0000
+++ b/components/mfw	Sun Jan 21 02:53:55 2018 +0000
@@ -77,12 +77,12 @@
 CPPFLAGS="$CPPFLAGS -I$SRC/$GPF/inc"
 CPPFLAGS="$CPPFLAGS -I$SRC/$CONDAT/com/include"
 CPPFLAGS="$CPPFLAGS -I../../$CDGINC"
-CPPFLAGS="$CPPFLAGS -I$SRC/aci2/aci"
-CPPFLAGS="$CPPFLAGS -I$SRC/aci2/ksd"
+CPPFLAGS="$CPPFLAGS -I$SRC/$ACI/aci"
+CPPFLAGS="$CPPFLAGS -I$SRC/$ACI/ksd"
 CPPFLAGS="$CPPFLAGS -I$SRC/aci2/atb"
 CPPFLAGS="$CPPFLAGS -I$SRC/aci2/mfw"
-CPPFLAGS="$CPPFLAGS -I$SRC/aci2/aci_ext"
-CPPFLAGS="$CPPFLAGS -I$SRC/aci2/aci_dti_mng"
+CPPFLAGS="$CPPFLAGS -I$SRC/$ACI/aci_ext"
+CPPFLAGS="$CPPFLAGS -I$SRC/$ACI/aci_dti_mng"
 CPPFLAGS="$CPPFLAGS -I.."
 CPPFLAGS="$CPPFLAGS -I../config"
 CPPFLAGS="$CPPFLAGS -I$SRC/cs/riviera"
diff -r f9e7fac0b437 -r 59143cd42ec7 configs/hybrid-ui
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/configs/hybrid-ui	Sun Jan 21 02:53:55 2018 +0000
@@ -0,0 +1,156 @@
+# This configuration is an attempt to build the UI layers from TCS211
+# atop of the hybrid version of the G23M PS and the new version of ACI.
+# At the present moment it is a FAILED attempt - the UI layers from TCS211
+# do not pass compilation in this environment.
+
+GPRS=1
+MMI=2
+SRVC=1
+export GPRS MMI SRVC
+
+ATP_STATE=0
+FCHG_STATE=1
+LCC_STATE=0
+MKS_STATE=0
+PWR_STATE=0
+R2D_STATE=1
+export ATP_STATE FCHG_STATE LCC_STATE MKS_STATE PWR_STATE R2D_STATE
+
+scripts/config-headers-new.sh
+
+CONDAT=condat3
+GPF=gpf3
+CDGINC=cdg-hybrid/cdginc
+CDGPRIM=cdg-hybrid/sap-inline
+ACI=g23m-aci
+export CONDAT GPF CDGINC CDGPRIM ACI
+
+build_lib ccddata
+
+# ACI libs
+build_lib aci tcs3
+build_lib aciext tcs3
+build_lib aci_dti_mng tcs3
+build_lib atiext tcs3
+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))'
+
+# UI layers
+build_lib bmi
+build_lib icn
+build_lib mfw
+
+# 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))'
+build_lib l1_custom_ext
+build_lib 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 fchg
+build_lib ffs
+build_lib ffs_drv
+build_lib ffs_pcm
+build_lib kpd
+build_lib power
+build_lib r2d_drv_custom_flash
+build_lib r2d_drv_flash
+build_lib r2d_drv_int_ram
+lib_link_magic '(CONST_LIBS (.text, .r2dlcd))'
+build_lib rtc_drv
+build_lib sim_drv
+build_lib spi_drv
+build_lib uart_drv
+
+# system glue
+build_lib main init
+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