From a97e460bea62375c9c870fb3e3650fbff20c5ad1 Mon Sep 17 00:00:00 2001 From: laforge Date: Wed, 13 Sep 2006 16:02:52 +0000 Subject: Completely separate DFU from application program, we now have a real bootloader. DFU occupies 0x00100000 - 0x00100fff in flash, application starts at 0x00101000. DFU also occupies the first couple of bytes in SRAM, application starts at 0x00200024. In order to produce a samba-flashable image, first build dfu.bin by typing 'make -f Makefule.dfu', succeeded by 'make TARGET=... DEBUG=... BOARD=...' and then concatenating the two files together, e.g. cat dfu.bin main_reqa.bin > flash.bin. Actual flashing via DFU is still not operational, but will be implemented next git-svn-id: https://svn.openpcd.org:2342/trunk@194 6dc7ffe9-61d6-0310-9af1-9938baff3ed1 --- firmware/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'firmware/Makefile') diff --git a/firmware/Makefile b/firmware/Makefile index 3d8c42d..a916ae6 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -53,7 +53,7 @@ RUN_MODE=RUN_FROM_ROM #RUN_MODE=RUN_FROM_RAM ## We want to produce a full-flash image, but including DFU -IMGTYPE=-dfu-fullimage +IMGTYPE=-sam7dfu-app # with / at end PATH_TO_LINKSCRIPTS=link/ @@ -86,8 +86,8 @@ endif SRCARM += src/os/pcd_enumerate.c src/os/fifo.c src/os/dbgu.c \ src/os/led.c src/os/req_ctx.c src/os/trigger.c \ src/os/main.c src/os/syscalls.c src/os/usb_handler.c \ - src/os/usb_benchmark.c src/os/dfu.c src/start/Cstartup_SAM7.c \ - src/os/tc_cdiv.c src/os/pit.c src/os/pwm.c src/os/pio_irq.c + src/os/usb_benchmark.c src/os/tc_cdiv.c src/os/pit.c \ + src/os/pwm.c src/os/pio_irq.c ifeq ($(BOARD), PCD) # PCD support code @@ -134,7 +134,7 @@ ASRCLIB += lib/lib1funcs.S lib/div64.S endif # List Assembler source files here which must be assembled in ARM-Mode.. -ASRCARM = src/start/Cstartup.S $(ASRCLIB) +ASRCARM = src/start/Cstartup_app.S $(ASRCLIB) ## Output format. (can be ihex or binary) ## (binary i.e. for openocd and SAM-BA, hex i.e. for lpc21isp and uVision) -- cgit v1.2.3