From 5629836c37242ad8b01b0aac80d91a308bf8a327 Mon Sep 17 00:00:00 2001 From: bernd Date: Wed, 20 Jul 2011 07:57:06 +0200 Subject: [PATCH] Use patching include bridge for simulat0r/firmware Makefile --- simulat0r/firmware/Makefile | 110 +----------------------------------- 1 file changed, 3 insertions(+), 107 deletions(-) diff --git a/simulat0r/firmware/Makefile b/simulat0r/firmware/Makefile index dd71a3a..3c50af5 100644 --- a/simulat0r/firmware/Makefile +++ b/simulat0r/firmware/Makefile @@ -1,108 +1,4 @@ -VPATH = -OBJS = main.o - -########################################################################## -# Project-specific files -########################################################################## - -VPATH += -OBJS += -OBJS += basic/basic.o basic/reinvoke_isp.o basic/delayms.o basic/voltage.o -OBJS += basic/keyin.o basic/uuid.o -LIBS += core/libcore.a lcd/liblcd.a applications/libapp.a filesystem/libfat.a usb/libusb.a - -########################################################################## -# GNU GCC compiler flags -########################################################################## -ROOT_PATH = . -INCLUDE_PATHS = -I$(ROOT_PATH) -I$(ROOT_PATH)/core - -include $(ROOT_PATH)/Makefile.inc - -LDFLAGS+= -Wl,--gc-sections -VPATH += lpc1xxx -OBJS += $(TARGET)_handlers.o LPC1xxx_startup.o - -########################################################################## -# Startup files -########################################################################## -LDLIBS = -lm -LDLIBS += -Lapplications -lapp -LDLIBS += -Lfunk -lfunk -LDLIBS += -Lusbcdc -lusbcdc -LDLIBS += -Lfilesystem -lfat -LDLIBS += -Lbasic -lbasic -LDLIBS += -Llcd -llcd -LDLIBS += -Lcore -lcore -LDLIBS += -Lusb -lusb - - -LD_PATH = lpc1xxx -LD_SCRIPT = $(LD_PATH)/linkscript.ld -LD_TEMP = $(LD_PATH)/memory.ld - -### User targets: - -all: $(OUTFILE).bin - -protect: $(OUTFILE).bin - $(LPCFIX) -p 2 $(OUTFILE).bin - -loadables: $(OUTFILE).bin - @cd loadable && $(MAKE) - -clean: - rm -f $(OBJS) $(LD_TEMP) $(OUTFILE).elf $(OUTFILE).bin $(OUTFILE).hex - @cd core && $(MAKE) clean -# @cd ../tools/bootloader && $(MAKE) clean - @cd lcd && $(MAKE) clean - @cd applications && $(MAKE) clean - @cd filesystem && $(MAKE) clean - @cd usb && $(MAKE) clean - @cd loadable && $(MAKE) clean - -### Internal targets - -%.o : %.c - $(CC) $(CFLAGS) -o $@ $< - -core/libcore.a: core/projectconfig.h - cd core && $(MAKE) ROOT_PATH=../$(ROOT_PATH) - -lcd/liblcd.a lcd/render.o lcd/display.o: - cd lcd && $(MAKE) ROOT_PATH=../$(ROOT_PATH) - -applications/libapp.a: - cd applications && $(MAKE) ROOT_PATH=../$(ROOT_PATH) - -filesystem/libfat.a: - cd filesystem && $(MAKE) ROOT_PATH=../$(ROOT_PATH) - -usb/libusb.a: - cd usb && $(MAKE) ROOT_PATH=../$(ROOT_PATH) - -../tools/bootloader/lpcfix: -# cd ../tools/bootloader && $(MAKE) - -$(LD_TEMP): - -@echo "MEMORY" > $(LD_TEMP) - -@echo "{" >> $(LD_TEMP) - -@echo " flash(rx): ORIGIN = 0x00000000, LENGTH = $(FLASH)" >> $(LD_TEMP) - -@echo " sram(rwx): ORIGIN = 0x10000000+$(SRAM_USB), LENGTH = $(SRAM)-$(SRAM_USB)-$(RAMCODE)" >> $(LD_TEMP) - -@echo "}" >> $(LD_TEMP) - -@echo "INCLUDE $(LD_SCRIPT)" >> $(LD_TEMP) - -.IGNORE: $(OUTFILE).elf -$(OUTFILE).elf: $(OBJS) $(SYS_OBJS) $(LIBS) $(LPCFIX) $(LD_TEMP) - $(CC) $(LDFLAGS) -T $(LD_TEMP) -o $(OUTFILE).elf $(OBJS) $(LDLIBS) - -@echo "" -# $(SIZE) $(OUTFILE).elf -# -@echo "" - -%.bin: %.elf -# $(OBJCOPY) $(OCFLAGS) -O binary $< $@ - -@echo "" -# $(LPCFIX) -c $@ - -.PHONY: $(LD_TEMP) lcd/liblcd.a applications/libapp.a filesystem/libfat.a usb/libusb.a +# GENERATED INCLUDE BRIDGE/ +include ../../firmware/Makefile +.IGNORE: $(OUTFILE).elf $(OUTFILE).bin