ctdo
/
crashtest-r0ket
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'd60565e021588a909b9836678d8e54c4a0609b4b'

This commit is contained in:
Stefan `Sec` Zehl 2012-02-03 11:50:22 +01:00
parent 5a880d840a d60565e021
commit 2b39b138ac
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
firmware/.gitignore vendored
View File

@ -1,5 +1,6 @@
*.bin *.bin
*.elf *.elf
*.map
lpc1xxx/memory.ld lpc1xxx/memory.ld
applications/wrapper.c applications/wrapper.c
lcd/allfonts.h lcd/allfonts.h

4
firmware/Makefile
View File

@ -74,7 +74,7 @@ l0dables: table.c
@cd l0dable && $(MAKE) @cd l0dable && $(MAKE)
clean: clean:
rm -f $(OBJS) $(LD_TEMP) $(OUTFILE).elf $(OUTFILE).bin $(OUTFILE).hex table.c table.h rm -f $(OBJS) $(LD_TEMP) $(OUTFILE).elf $(OUTFILE).bin $(OUTFILE).hex $(OUTFILE).map table.c table.h
for dir in $(SUBDIRS); do \ for dir in $(SUBDIRS); do \
$(MAKE) $(CONFIG_MAKE_PRINTDIRECTORY) -C $$dir clean; \ $(MAKE) $(CONFIG_MAKE_PRINTDIRECTORY) -C $$dir clean; \
done done
@ -111,7 +111,7 @@ $(LD_TEMP):
-@echo "INCLUDE $(LD_SCRIPT)" >> $(LD_TEMP) -@echo "INCLUDE $(LD_SCRIPT)" >> $(LD_TEMP)
$(OUTFILE).elf: $(OBJS) $(SYS_OBJS) $(SUBDIRS) $(LPCFIX) $(LD_TEMP) $(OUTFILE).elf: $(OBJS) $(SYS_OBJS) $(SUBDIRS) $(LPCFIX) $(LD_TEMP)
$(LD) $(LDFLAGS) -T $(LD_TEMP) -o $(OUTFILE).elf $(OBJS) $(LDLIBS) $(LD) $(LDFLAGS) -Map=$(OUTFILE).map -T $(LD_TEMP) -o $(OUTFILE).elf $(OBJS) $(LDLIBS)
-@echo "" -@echo ""
$(SIZE) $(OUTFILE).elf $(SIZE) $(OUTFILE).elf
-@echo "" -@echo ""