X-Git-Url: http://git.asbjorn.biz/?p=rapper.git;a=blobdiff_plain;f=new_cmsis%2FMakefile;fp=new_cmsis%2FMakefile;h=bf7dcc7df9ed3bb5c9bb612ed2ae31b10deadd42;hp=f143b3b92dc48c5a632b58014b711f6965103954;hb=2253dc3498d4ace7f07884ec6d40d654ca677571;hpb=678d5839c35477bcb24f2a29ebb5bce4ce5f8152

diff --git a/new_cmsis/Makefile b/new_cmsis/Makefile
index f143b3b..bf7dcc7 100644
--- a/new_cmsis/Makefile
+++ b/new_cmsis/Makefile
@@ -1,26 +1,36 @@
-PROJECT=rapper
-PLATFORM ?= arm-none-eabi
-LDFLAGS=--gc-sections -g -T LPC1768-flash.ld
-CFLAGS=-W -Wall --std=gnu99 -fgnu89-inline -mcpu=cortex-m3 -mthumb -ffunction-sections -fdata-sections -I. -g
-#CFLAGS+=-Os
-
-# objects are separated by space
-OBJECTS=startup.o system_LPC17xx.o main.o core_cm3.o
-
-
-all: $(PROJECT).elf
-
-$(PROJECT).elf: $(OBJECTS)
-	$(PLATFORM)-ld -Map $(PROJECT).map $(LDFLAGS) $(OBJECTS) -o $@
-
-%.o: %.c
-	$(PLATFORM)-gcc -MM $< -MF $(patsubst %.o,%.d,$@) -MP
-	$(PLATFORM)-gcc $(CFLAGS) -c $< -o $@
-
-.PHONY: clean gdb
-
-clean:
-	rm -f $(PROJECT).elf $(OBJECTS) $(OBJECTS:.o=.d) $(PROJECT).map
-
-gdb:
-	$(PLATFORM)-gdb $(PROJECT).elf
+PROJECT=rapper
+PLATFORM ?= arm-none-eabi
+BOARD?=lpc1768
+BPATH=boards/$(BOARD)
+LDFLAGS=--gc-sections -g -T $(BPATH)/flash.ld
+CFLAGS=-W -Wall --std=gnu99 -fgnu89-inline -mcpu=cortex-m3 -mthumb -ffunction-sections -fdata-sections -I$(BPATH) -I. -g
+#CFLAGS+=-Os
+
+# objects are separated by space
+USB_OBJS=usb/serial.o usb/core.o usb/desc.o usb/hw.o usb/user.o usb/vcom.o usb/cdcuser.o
+BOARD_OBJS=$(BPATH)/startup.o $(BPATH)/system.o boards/cortex_m3/core_cm3.o
+OBJECTS=main.o $(BOARD_OBJS) $(USB_OBJS)
+
+
+all: crc
+
+$(PROJECT).elf: $(OBJECTS)
+	$(PLATFORM)-ld -Map $(PROJECT).map $(LDFLAGS) $(OBJECTS) -o $@
+
+%.bin: %.elf
+	$(PLATFORM)-objcopy -O binary $< $*.bin
+
+%.o: %.c
+	$(PLATFORM)-gcc -MM $< -MF $(patsubst %.o,%.d,$@) -MP
+	$(PLATFORM)-gcc $(CFLAGS) -c $< -o $@
+
+.PHONY: clean gdb crc
+
+clean:
+	rm -f $(PROJECT).elf $(OBJECTS) $(OBJECTS:.o=.d) $(PROJECT).map
+
+gdb:
+	$(PLATFORM)-gdb $(PROJECT).elf
+
+crc:	$(PROJECT).bin
+	../tools/lpcrc/lpcrc.sh $(PROJECT).bin $(BPATH)/startup.c