From b3c6320899d6b27899ab3c67c745e8d3b29af3a2 Mon Sep 17 00:00:00 2001 From: root Date: Tue, 19 Feb 2019 13:46:18 +0000 Subject: working ethernet --- app/Makefile | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) (limited to 'app/Makefile') diff --git a/app/Makefile b/app/Makefile index e5d6731..dd4b6e7 100644 --- a/app/Makefile +++ b/app/Makefile @@ -25,8 +25,11 @@ PROG=msf V=1 default: ${PROG}.elf -CSRCS=led.c ticker.c ring.c usart.c stdio.c lwip_glue.c steth.c msf.c abs.c pll.c main.c time_fn.c ntp.c dcf77.c util.c stats.c -HSRCS=project.h ring.h pins.h +CSRCS=led.c ticker.c ring.c usart.c stdio.c lwip_glue.c steth.c msf.c abs.c pll.c main.c time_fn.c ntp.c dcf77.c util.c stats.c gps.c hexdump.c bits.c debug_eth.c +HSRCS=project.h ring.h pins.h gps.h ubx.h + + + LWIP=lwip/lwip-1.4.1 LWIP_PATH=.. @@ -55,12 +58,12 @@ BINARY = ${PROG} MYOBJS = ${CSRCS:%.c=%.o} LWIP_OBJS = ${LWIP_CSRCS:%.c=%.o} -objs:${OBJS} +objs:${OBJS} ${MYOBJS}: project.h prototypes.h ${LWIP_OBJS}: lwip/lwipopts.h -OBJS=${MYOBJS} ${LWIP_OBJS} +OBJS=${MYOBJS} ${LWIP_OBJS} almanac.o include ../Makefile.include @@ -78,19 +81,29 @@ program: ${PROG}.hex ds: $(Q)$(OOCD) -f ../oocd/interface/$(OOCD_INTERFACE).cfg \ - -f ../oocd/board/$(OOCD_BOARD).cfg + -f ../oocd/board/$(OOCD_BOARD).cfg debug: ${PROG}.elf ${PREFIX}-gdb -x gdb.script ${PROG}.elf # openocd -protos: ${CSRCS} +protos: ${CSRCS} echo -n > prototypes.h ${CPROTO} -E "${CPP} $(CPPFLAGS)" -e -v ${CSRCS} > prototypes.h.tmp mv -f prototypes.h.tmp prototypes.h -EXTRA_CLEAN=${OBJS} ${LWIP_OBJS:%.o=%.d} +almanac.c:almanac.alp + echo const > $@ + xxd -i $< >> $@ + +almanac.alp: almanac + +almanac: + wget -O almanac.alp http://alp.u-blox.com/current_7d.alp + + +EXTRA_CLEAN=${OBJS} ${LWIP_OBJS:%.o=%.d} almanac.c tidy: astyle -A3 -s2 --attach-extern-c -L -c -w -Y -m0 -f -p -H -U -k3 -xj -xd ${CSRCS} ${HSRCS} -- cgit v1.2.3