change the build-process of the updater (do some linker magic)

[pub/USBaspLoader.git] / updater / Makefile

diff --git a/updater/Makefile b/updater/Makefile
index de347cd..a3aa145 100644 (file)
--- a/updater/Makefile
+++ b/updater/Makefile
@@ -8,7 +8,7 @@
 include ../Makefile.inc
 
 # elsewise gcc would complain unnecessary
-CFLAGS = -Wall -Wno-pointer-to-int-cast -Os -fno-move-loop-invariants -fno-tree-scev-cprop -fno-inline-small-functions -I. -mmcu=$(DEVICE) -DF_CPU=$(F_CPU) -DNEW_BOOTLOADER_ADDRESS=$(NEW_BOOTLOADER_ADDRESS) $(DEFINES)
+CFLAGS = -Wall -Wno-pointer-to-int-cast -Os -fno-move-loop-invariants -fno-tree-scev-cprop -fno-inline-small-functions -I. -mmcu=$(DEVICE) -DF_CPU=$(F_CPU) -DBOOTLOADER_ADDRESS=$(BOOTLOADER_ADDRESS) -DNEW_BOOTLOADER_ADDRESS=$(NEW_BOOTLOADER_ADDRESS) $(DEFINES)
 LDFLAGS = -Wl,--relax,--gc-sections
 
 ifneq ($(FLASHADDRESS), 0)
@@ -39,11 +39,20 @@ all:  updater.hex
 ../firmware/main.bin:
        $(MAKE) -C ../firmware main.hex
 
-updater.o: updater.c firmware.h
-       $(CC) updater.c -c -o updater.o $(CFLAGS)
 
-updater.elf: updater.o
-       $(CC) updater.o -o updater.elf $(CFLAGS) $(LDFLAGS)
+usbasploader.raw:
+       $(OBC) -j .text -j .data -O binary ../firmware/main.bin usbasploader.raw
+
+usbasploader.o: usbasploader.raw
+       $(OBC) -I binary -O elf32-avr --rename-section .data=.text --redefine-sym _binary_usbasploader_raw_start=usbasploader  usbasploader.raw usbasploader.o
+
+
+updater.o: updater.c usbasploader.h usbasploader.raw usbasploader.o
+       $(CC) updater.c -c -o updater.o -DSIZEOF_new_firmware=$(shell stat -c %s usbasploader.raw) $(CFLAGS)
+#      $(CC) updater.c -c -o updater.o $(CFLAGS)
+
+updater.elf: updater.o usbasploader.o
+       $(CC) updater.o usbasploader.o -o updater.elf $(CFLAGS) $(LDFLAGS)
 
 updater.hex: updater.elf
        $(OBC) -j .text -j .data -O ihex updater.elf updater.hex
@@ -54,18 +63,6 @@ updater.hex: updater.elf
        $(ECHO) "."
 
 
-
-firmware_gen.o: firmware_gen.c
-       $(GCC) firmware_gen.c -c -o firmware_gen.o
-
-firmware_gen: firmware_gen.o
-       $(GCC) firmware_gen.o -o firmware_gen
-
-firmware.h: firmware_gen ../firmware/main.bin
-       $(OBC) -j .text -j .data -O binary ../firmware/main.bin usbasploader.raw
-       @./firmware_gen > firmware.h
-
-
 deepclean: clean
        $(RM) *~
 
@@ -74,5 +71,4 @@ clean:
        $(RM) *.raw
        $(RM) updater.hex
        $(RM) updater.elf
-       $(RM) firmware_gen
-       $(RM) firmware.h
\ No newline at end of file
+       $(RM) usbasploader.raw
\ No newline at end of file