FreeCalypso > hg > freecalypso-sw
changeset 899:ab20a5e9dbf3
gsm-fw/L1/dsp code made into a library in preparation for adding patch codes
| author | Space Falcon <falcon@ivan.Harhan.ORG> |
|---|---|
| date | Sun, 05 Jul 2015 02:50:49 +0000 |
| parents | cc9d97d0e911 |
| children | 2caa749fae34 |
| files | gsm-fw/L1/Makefile gsm-fw/L1/dsp/Makefile gsm-fw/finlink/Makefile gsm-fw/finlink/ld-script.src |
| diffstat | 4 files changed, 16 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/gsm-fw/L1/Makefile Sun Jul 05 02:41:39 2015 +0000 +++ b/gsm-fw/L1/Makefile Sun Jul 05 02:50:49 2015 +0000 @@ -5,14 +5,13 @@ sinclude ../include/config.mk INT_PIECES= cfile/iramcode.o cust0/iramcode.o tpudrv/iramcode.o -EXT_PIECES= audio_cfile/xipcode.o cfile/xipcode.o cust0/xipcode.o \ - dsp/xipcode.o +EXT_PIECES= audio_cfile/xipcode.o cfile/xipcode.o cust0/xipcode.o ifeq (${CONFIG_L1_STANDALONE},1) EXT_PIECES+= stand/xipcode.o endif -all: iramcode.o xipcode.o +all: iramcode.o xipcode.o dsp ${SUBDIR}: FRC cd $@; ${MAKE} ${MFLAGS} @@ -26,9 +25,6 @@ cust0/iramcode.o cust0/xipcode.o: cust0 @true -dsp/xipcode.o: dsp - @true - stand/xipcode.o: stand @true
--- a/gsm-fw/L1/dsp/Makefile Sun Jul 05 02:41:39 2015 +0000 +++ b/gsm-fw/L1/dsp/Makefile Sun Jul 05 02:50:49 2015 +0000 @@ -1,13 +1,16 @@ CC= arm-elf-gcc +AR= arm-elf-ar +RANLIB= arm-elf-ranlib + CFLAGS= -O2 -fno-builtin -mthumb-interwork -mthumb -LD= arm-elf-ld OBJS= leadapi.o leadboot.o -all: xipcode.o +all: libdsp.a -xipcode.o: ${OBJS} - ${LD} -r -o $@ ${OBJS} +libdsp.a: ${OBJS} + ${AR} cru $@ ${OBJS} + ${RANLIB} $@ clean: rm -f *.[oa] *.out *errs
--- a/gsm-fw/finlink/Makefile Sun Jul 05 02:41:39 2015 +0000 +++ b/gsm-fw/finlink/Makefile Sun Jul 05 02:50:49 2015 +0000 @@ -30,6 +30,11 @@ LIB_DEPEND+= ${GPF_LIBS} endif +ifeq (${CONFIG_INCLUDE_L1},1) +LIB_LINK_ORDER+=../L1/dsp/libdsp.a +LIB_DEPEND+= ../L1/dsp/libdsp.a +endif + LIB_LINK_ORDER+= ${BASE_LIBS} LIB_LINK_ORDER+= --start-group ${LIBC_A} ${LIBGCC_A} --end-group
--- a/gsm-fw/finlink/ld-script.src Sun Jul 05 02:41:39 2015 +0000 +++ b/gsm-fw/finlink/ld-script.src Sun Jul 05 02:50:49 2015 +0000 @@ -59,6 +59,7 @@ *(xip.text*) xipcode.o(.text*) *comlib.a:(.text*) + *libdsp.a:(.text*) *libdti.a:(.text*) *libgdi.a:(.text*) *libplus.xip.a:(.text*) @@ -127,6 +128,7 @@ *(ext.bss*) xipcode.o(.bss* COMMON) *comlib.a:(.bss* COMMON) + *libdsp.a:(.bss* COMMON) *libdti.a:(.bss* COMMON) *libgdi.a:(.bss* COMMON) *libplus.xip.a:(.bss* COMMON)