FreeCalypso > hg > freecalypso-sw
changeset 671:210268d8e553
gsm-fw: comlib included in the build along with ccd
CONFIG_INCLUDE_CCD eliminated and absorbed into CONFIG_INCLUDE_PS
| author | Michael Spacefalcon <msokolov@ivan.Harhan.ORG> |
|---|---|
| date | Sun, 28 Sep 2014 18:23:19 +0000 |
| parents | f8175b92d0f7 |
| children | 0dc6f9e8e980 |
| files | gsm-fw/cfgmagic/feature.gsm gsm-fw/cfgmagic/processconf.sh gsm-fw/finlink/Makefile gsm-fw/finlink/ld-script.src |
| diffstat | 4 files changed, 15 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/gsm-fw/cfgmagic/feature.gsm Sun Sep 28 17:00:14 2014 +0000 +++ b/gsm-fw/cfgmagic/feature.gsm Sun Sep 28 18:23:19 2014 +0000 @@ -8,8 +8,8 @@ export_to_mk CONFIG_GSM # enable all necessary components -CONFIG_INCLUDE_CCD=1 CONFIG_INCLUDE_GPF=1 CONFIG_INCLUDE_L1=1 CONFIG_INCLUDE_PCM=1 +CONFIG_INCLUDE_PS=1 CONFIG_INCLUDE_SIM=1
--- a/gsm-fw/cfgmagic/processconf.sh Sun Sep 28 17:00:14 2014 +0000 +++ b/gsm-fw/cfgmagic/processconf.sh Sun Sep 28 18:23:19 2014 +0000 @@ -26,9 +26,6 @@ # enabled or disabled. This way enabling any of these components is # as simple as CONFIG_INCLUDE_xxx=1, without having to remember the # export_to_{c,mk} magic. -CONFIG_INCLUDE_CCD=0 -export_to_c CONFIG_INCLUDE_CCD -export_to_mk CONFIG_INCLUDE_CCD CONFIG_INCLUDE_GPF=0 export_to_c CONFIG_INCLUDE_GPF export_to_mk CONFIG_INCLUDE_GPF @@ -38,6 +35,9 @@ CONFIG_INCLUDE_PCM=0 export_to_c CONFIG_INCLUDE_PCM export_to_mk CONFIG_INCLUDE_PCM +CONFIG_INCLUDE_PS=0 +export_to_c CONFIG_INCLUDE_PS +export_to_mk CONFIG_INCLUDE_PS CONFIG_INCLUDE_SIM=0 export_to_c CONFIG_INCLUDE_SIM export_to_mk CONFIG_INCLUDE_SIM @@ -105,10 +105,6 @@ BUILD_COMPONENTS="bsp nucleus riviera serial services sprintf sysglue" -if [ "$CONFIG_INCLUDE_CCD" = 1 ] -then - BUILD_COMPONENTS="$BUILD_COMPONENTS ccd" -fi if [ "$CONFIG_INCLUDE_GPF" = 1 ] then BUILD_COMPONENTS="$BUILD_COMPONENTS gpf" @@ -117,12 +113,14 @@ then BUILD_COMPONENTS="$BUILD_COMPONENTS L1" fi +if [ "$CONFIG_INCLUDE_PS" = 1 ] +then + BUILD_COMPONENTS="$BUILD_COMPONENTS ccd comlib" +fi export_to_mk BUILD_COMPONENTS -# The support for building flashable images is not here yet, -# so ramImage is all we can build for now. - +# We can build flashable images now, but now for we always default to ramImage. BUILD_DEFAULT_IMAGE=ramImage export_to_mk BUILD_DEFAULT_IMAGE
--- a/gsm-fw/finlink/Makefile Sun Sep 28 17:00:14 2014 +0000 +++ b/gsm-fw/finlink/Makefile Sun Sep 28 18:23:19 2014 +0000 @@ -16,9 +16,10 @@ ../nucleus/libplus.iram.a ../sprintf/libsprintf.a LIB_DEPEND= ${BASE_LIBS} -ifeq (${CONFIG_INCLUDE_CCD},1) -LIB_LINK_ORDER+=../ccd/libccd.a -LIB_DEPEND+= ../ccd/libccd.a +ifeq (${CONFIG_INCLUDE_PS},1) +PS_LIBS= ../comlib/comlib.a ../ccd/libccd.a +LIB_LINK_ORDER+=${PS_LIBS} +LIB_DEPEND+= ${PS_LIBS} endif ifeq (${CONFIG_INCLUDE_GPF},1)
--- a/gsm-fw/finlink/ld-script.src Sun Sep 28 17:00:14 2014 +0000 +++ b/gsm-fw/finlink/ld-script.src Sun Sep 28 18:23:19 2014 +0000 @@ -58,6 +58,7 @@ xip.text : { *(xip.text*) xipcode.o(.text*) + *comlib.a:(.text*) *libplus.xip.a:(.text*) *libgpf.xip.a:(.text*) *libccd.a:(.text*) @@ -121,6 +122,7 @@ ext.bss (NOLOAD) : { *(ext.bss*) xipcode.o(.bss* COMMON) + *comlib.a:(.bss* COMMON) *libplus.xip.a:(.bss* COMMON) *libgpf.xip.a:(.bss* COMMON) *libccd.a:(.bss* COMMON)