FreeCalypso > hg > freecalypso-sw

changeset 822:2d3f29ef866d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gsm-fw: first attempt to link with g23m-aci and g23m-gsm included
author Space Falcon <falcon@ivan.Harhan.ORG>
date Sun, 05 Apr 2015 18:18:00 +0000
parents 5c4381b80bd2
children d93ecff8544b
files gsm-fw/cfgmagic/processconf.sh gsm-fw/finlink/Makefile gsm-fw/finlink/ld-script.src
diffstat 3 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/gsm-fw/cfgmagic/processconf.sh	Sun Apr 05 18:00:32 2015 +0000
+++ b/gsm-fw/cfgmagic/processconf.sh	Sun Apr 05 18:18:00 2015 +0000
@@ -116,7 +116,7 @@
 if [ "$CONFIG_INCLUDE_PS" = 1 ]
 then
 	BUILD_COMPONENTS="$BUILD_COMPONENTS ccd comlib"
-	BUILD_COMPONENTS="$BUILD_COMPONENTS g23m-gsm"
+	BUILD_COMPONENTS="$BUILD_COMPONENTS g23m-aci g23m-gsm"
 fi
 
 export_to_mk BUILD_COMPONENTS
--- a/gsm-fw/finlink/Makefile	Sun Apr 05 18:00:32 2015 +0000
+++ b/gsm-fw/finlink/Makefile	Sun Apr 05 18:18:00 2015 +0000
@@ -17,7 +17,7 @@
 LIB_DEPEND=	${BASE_LIBS}
 
 ifeq (${CONFIG_INCLUDE_PS},1)
-PS_LIBS=	../comlib/comlib.a ../ccd/libccd.a
+PS_LIBS=	../g23m-aci/dti/libdti.a ../comlib/comlib.a ../ccd/libccd.a
 LIB_LINK_ORDER+=${PS_LIBS}
 LIB_DEPEND+=	${PS_LIBS}
 endif
@@ -41,6 +41,9 @@
 INT_PIECES+=	../L1/iramcode.o
 EXT_PIECES+=	../L1/xipcode.o
 endif
+ifeq (${CONFIG_INCLUDE_PS},1)
+EXT_PIECES+=	../g23m-aci/xipcode.o ../g23m-gsm/xipcode.o
+endif
 ifeq (${CONFIG_INCLUDE_PCM},1)
 EXT_PIECES+=	../services/pcm/xipcode.o
 endif
--- a/gsm-fw/finlink/ld-script.src	Sun Apr 05 18:00:32 2015 +0000
+++ b/gsm-fw/finlink/ld-script.src	Sun Apr 05 18:18:00 2015 +0000
@@ -59,6 +59,7 @@
 		*(xip.text*)
 		xipcode.o(.text*)
 		*comlib.a:(.text*)
+		*libdti.a:(.text*)
 		*libplus.xip.a:(.text*)
 		*libgpf.xip.a:(.text*)
 		*libccd.a:(.text*)