FreeCalypso > hg > freecalypso-sw
diff gsm-fw/finlink/Makefile @ 489:2a26785fb5a2
gsm-fw: GPF included in the build with feature gpf, link successful
| author | Michael Spacefalcon <msokolov@ivan.Harhan.ORG> |
|---|---|
| date | Sun, 29 Jun 2014 22:37:29 +0000 |
| parents | 083f262b7bbe |
| children | 06ab60fec942 |
line wrap: on
line diff
--- a/gsm-fw/finlink/Makefile Sun Jun 29 21:59:14 2014 +0000 +++ b/gsm-fw/finlink/Makefile Sun Jun 29 22:37:29 2014 +0000 @@ -13,10 +13,19 @@ LOCAL_LIBS= ../riviera/librv.a ../nucleus/libplus.xip.a \ ../nucleus/libplus.iram.a ../sprintf/libsprintf.a +COND_LOCAL_LIBS= + +ifeq (${CONFIG_GPF},1) +COND_LOCAL_LIBS+= --start-group ../gpf/libs/libgpf.xip.a \ + ../gpf/libs/libgpf.iram.a --end-group +endif INT_PIECES= ../bsp/niq32.o EXT_PIECES= ../bsp/xipcode.o ../serial/xipcode.o ../sysglue/xipcode.o \ ../services/ffs/xipcode.o ../services/dar/xipcode.o +ifeq (${CONFIG_GPF},1) +EXT_PIECES+= ../gpf/conf/xipcode.o +endif ifeq (${RVM_ETM_SWE},1) EXT_PIECES+= ../services/etm/xipcode.o endif @@ -38,7 +47,7 @@ ramImage.elf: iramcode.o xipcode.o ${LOCAL_LIBS} ramImage.ld ${LD} -N -T ramImage.ld -o $@ -Map ramImage.map iramcode.o xipcode.o \ - ${LOCAL_LIBS} \ + ${COND_LOCAL_LIBS} ${LOCAL_LIBS} \ --start-group ${LIBC_A} ${LIBGCC_A} --end-group ramImage.srec: ramImage.elf