comparison gsm-fw/finlink/Makefile @ 490:06ab60fec942

gsm-fw/gpf/tst_pei/tst_pei.c: use FFS_O_RDONLY when reading tracemask file gsm-fw/finlink/Makefile: proper dependency logic for GPF libraries
author Michael Spacefalcon <msokolov@ivan.Harhan.ORG>
date Mon, 30 Jun 2014 05:04:35 +0000
parents 2a26785fb5a2
children 3b4dce7dac06
comparison
equal deleted inserted replaced
489:2a26785fb5a2 490:06ab60fec942
9 LIBGCC_A= `${CC} -print-file-name=libgcc.a -mthumb-interwork` 9 LIBGCC_A= `${CC} -print-file-name=libgcc.a -mthumb-interwork`
10 LIBGCC_T= `${CC} -print-file-name=libgcc.a -mthumb-interwork -mthumb` 10 LIBGCC_T= `${CC} -print-file-name=libgcc.a -mthumb-interwork -mthumb`
11 11
12 sinclude ../include/config.mk 12 sinclude ../include/config.mk
13 13
14 LOCAL_LIBS= ../riviera/librv.a ../nucleus/libplus.xip.a \ 14 BASE_LIBS= ../riviera/librv.a ../nucleus/libplus.xip.a \
15 ../nucleus/libplus.iram.a ../sprintf/libsprintf.a 15 ../nucleus/libplus.iram.a ../sprintf/libsprintf.a
16 COND_LOCAL_LIBS= 16 LIB_DEPEND= ${BASE_LIBS}
17 17
18 ifeq (${CONFIG_GPF},1) 18 ifeq (${CONFIG_GPF},1)
19 COND_LOCAL_LIBS+= --start-group ../gpf/libs/libgpf.xip.a \ 19 GPF_LIBS= ../gpf/libs/libgpf.xip.a ../gpf/libs/libgpf.iram.a
20 ../gpf/libs/libgpf.iram.a --end-group 20 LIB_LINK_ORDER+= --start-group ${GPF_LIBS} --end-group
21 LIB_DEPEND+= ${GPF_LIBS}
21 endif 22 endif
23
24 LIB_LINK_ORDER+= ${BASE_LIBS}
25 LIB_LINK_ORDER+= --start-group ${LIBC_A} ${LIBGCC_A} --end-group
22 26
23 INT_PIECES= ../bsp/niq32.o 27 INT_PIECES= ../bsp/niq32.o
24 EXT_PIECES= ../bsp/xipcode.o ../serial/xipcode.o ../sysglue/xipcode.o \ 28 EXT_PIECES= ../bsp/xipcode.o ../serial/xipcode.o ../sysglue/xipcode.o \
25 ../services/ffs/xipcode.o ../services/dar/xipcode.o 29 ../services/ffs/xipcode.o ../services/dar/xipcode.o
26 ifeq (${CONFIG_GPF},1) 30 ifeq (${CONFIG_GPF},1)
43 m4 flash.m4 ld-script.src > $@ 47 m4 flash.m4 ld-script.src > $@
44 48
45 ramImage.ld: ld-script.src xram.m4 ../include/config.m4 49 ramImage.ld: ld-script.src xram.m4 ../include/config.m4
46 m4 xram.m4 ld-script.src > $@ 50 m4 xram.m4 ld-script.src > $@
47 51
48 ramImage.elf: iramcode.o xipcode.o ${LOCAL_LIBS} ramImage.ld 52 ramImage.elf: iramcode.o xipcode.o ${LIB_DEPEND} ramImage.ld
49 ${LD} -N -T ramImage.ld -o $@ -Map ramImage.map iramcode.o xipcode.o \ 53 ${LD} -N -T ramImage.ld -o $@ -Map ramImage.map iramcode.o xipcode.o \
50 ${COND_LOCAL_LIBS} ${LOCAL_LIBS} \ 54 ${LIB_LINK_ORDER}
51 --start-group ${LIBC_A} ${LIBGCC_A} --end-group
52 55
53 ramImage.srec: ramImage.elf 56 ramImage.srec: ramImage.elf
54 ${OBJCOPY} -O srec --srec-forceS3 --srec-len=30 $< $@ 57 ${OBJCOPY} -O srec --srec-forceS3 --srec-len=30 $< $@
55 58
56 clean: 59 clean: