# HG changeset patch # User Mychaela Falconia # Date 1542586567 0 # Node ID 6690ae4535940a1855e11f410008d88c05cac2bc # Parent 28ed4002131a23d9f4f19fcedeac9ac573a183ff configs: hybrid-gpf renamed to hybrid-osl diff -r 28ed4002131a -r 6690ae453594 configs/hybrid-gpf --- a/configs/hybrid-gpf Mon Nov 19 00:12:20 2018 +0000 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,147 +0,0 @@ -# This configuration is derived from the basic hybrid config. In common -# with regular hybrid, this config is for a GSM+CSD+GPRS modem controlled -# via AT commands (no UI), but it differs from the regular hybrid config -# in that the GPF libraries are rebuilt from source. - -GPRS=1 -MMI=0 -SRVC=1 -export GPRS MMI SRVC - -ATP_STATE=0 -FCHG_STATE=0 -LCC_STATE=0 -MKS_STATE=0 -PWR_STATE=0 -R2D_STATE=0 -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))' - -# 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 -build_lib frame_na7_db_fl full -build_lib frame_na7_db_ir full -lib_link_magic '(BSS_LIBS (.bss) CONST_LIBS (.text, .const))' -build_lib misc_na7_db_fl -build_lib misc_na7_db_ir -lib_link_magic '(BSS_LIBS (.bss) CONST_LIBS (.text, .const))' -build_lib osx_na7_db -lib_link_magic '(BSS_LIBS (.bss) CONST_LIBS (.text, .const))' -build_lib tif_na7_db_fl -build_lib 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 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 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 diff -r 28ed4002131a -r 6690ae453594 configs/hybrid-osl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/configs/hybrid-osl Mon Nov 19 00:16:07 2018 +0000 @@ -0,0 +1,147 @@ +# This configuration is derived from the basic hybrid config. In common +# with regular hybrid, this config is for a GSM+CSD+GPRS modem controlled +# via AT commands (no UI), but it differs from the regular hybrid config +# in that all parts of GPF are rebuilt from source, including OSL and OSX. + +GPRS=1 +MMI=0 +SRVC=1 +export GPRS MMI SRVC + +ATP_STATE=0 +FCHG_STATE=0 +LCC_STATE=0 +MKS_STATE=0 +PWR_STATE=0 +R2D_STATE=0 +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))' + +# 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 +build_lib frame_na7_db_fl full +build_lib frame_na7_db_ir full +lib_link_magic '(BSS_LIBS (.bss) CONST_LIBS (.text, .const))' +build_lib misc_na7_db_fl +build_lib misc_na7_db_ir +lib_link_magic '(BSS_LIBS (.bss) CONST_LIBS (.text, .const))' +build_lib osx_na7_db +lib_link_magic '(BSS_LIBS (.bss) CONST_LIBS (.text, .const))' +build_lib tif_na7_db_fl +build_lib 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 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 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