FreeCalypso > hg > freecalypso-sw
changeset 658:46e5c90fd0b8
gsm-fw: ccd hooked into the build
| author | Michael Spacefalcon <msokolov@ivan.Harhan.ORG> |
|---|---|
| date | Thu, 25 Sep 2014 10:19:47 +0000 |
| parents | e40935b81113 |
| children | c2c4c6b5a5c5 |
| files | gsm-fw/cfgmagic/processconf.sh gsm-fw/finlink/Makefile gsm-fw/finlink/ld-script.src |
| diffstat | 3 files changed, 11 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/gsm-fw/cfgmagic/processconf.sh Thu Sep 25 10:12:21 2014 +0000 +++ b/gsm-fw/cfgmagic/processconf.sh Thu Sep 25 10:19:47 2014 +0000 @@ -105,6 +105,10 @@ 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"
--- a/gsm-fw/finlink/Makefile Thu Sep 25 10:12:21 2014 +0000 +++ b/gsm-fw/finlink/Makefile Thu Sep 25 10:19:47 2014 +0000 @@ -16,6 +16,11 @@ ../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 +endif + ifeq (${CONFIG_INCLUDE_GPF},1) GPF_LIBS= ../gpf/libs/libgpf.xip.a ../gpf/libs/libgpf.iram.a LIB_LINK_ORDER+= --start-group ${GPF_LIBS} --end-group
--- a/gsm-fw/finlink/ld-script.src Thu Sep 25 10:12:21 2014 +0000 +++ b/gsm-fw/finlink/ld-script.src Thu Sep 25 10:19:47 2014 +0000 @@ -60,6 +60,7 @@ xipcode.o(.text*) *libplus.xip.a:(.text*) *libgpf.xip.a:(.text*) + *libccd.a:(.text*) *librv.a:(.text*) *libsprintf.a:(.text*) /* let's put the ARM->Thumb veneers in the XIP section */ @@ -122,6 +123,7 @@ xipcode.o(.bss* COMMON) *libplus.xip.a:(.bss* COMMON) *libgpf.xip.a:(.bss* COMMON) + *libccd.a:(.bss* COMMON) *librv.a:(.bss* COMMON) *libsprintf.a:(.bss* COMMON) . = ALIGN(4);