move fixcrc to patcheeprom, add patching of node id (pretty ugly)

[fnordlicht-mini] / firmware / fnordlicht-firmware / Makefile

diff --git a/firmware/fnordlicht-firmware/Makefile b/firmware/fnordlicht-firmware/Makefile
index 0fffc69227e7dbe5769f922e838696ba99023964..345a4c1ef2a43f0e3be6459f409b61c572f1c319 100644 (file)
--- a/firmware/fnordlicht-firmware/Makefile
+++ b/firmware/fnordlicht-firmware/Makefile
@@ -56,8 +56,6 @@ CONFIG_REMOTE = 1
 CONFIG_SECONDARY_PWM = 1
 # default baudrate
 CONFIG_SERIAL_BAUDRATE = 19200
 CONFIG_SECONDARY_PWM = 1
 # default baudrate
 CONFIG_SERIAL_BAUDRATE = 19200

-# check jumper for master mode
-CONFIG_MASTER_MODE = 1

 
 # avrdude programmer protocol
 PROG = usbasp
 
 # avrdude programmer protocol
 PROG = usbasp


@@ -70,7 +68,6 @@ CFLAGS += -DHARDWARE_$(HARDWARE)=1 -DCONFIG_SCRIPT_DEFAULT=$(CONFIG_SCRIPT_DEFAU
 CFLAGS += -DCONFIG_SCRIPT=$(CONFIG_SCRIPT) -DCONFIG_SERIAL=$(CONFIG_SERIAL)
 CFLAGS += -DCONFIG_REMOTE=$(CONFIG_REMOTE) -DCONFIG_SECONDARY_PWM=$(CONFIG_SECONDARY_PWM)
 CFLAGS += -DCONFIG_SERIAL_BAUDRATE=$(CONFIG_SERIAL_BAUDRATE)
 CFLAGS += -DCONFIG_SCRIPT=$(CONFIG_SCRIPT) -DCONFIG_SERIAL=$(CONFIG_SERIAL)
 CFLAGS += -DCONFIG_REMOTE=$(CONFIG_REMOTE) -DCONFIG_SECONDARY_PWM=$(CONFIG_SECONDARY_PWM)
 CFLAGS += -DCONFIG_SERIAL_BAUDRATE=$(CONFIG_SERIAL_BAUDRATE)

-CFLAGS += -DCONFIG_MASTER_MODE=$(CONFIG_MASTER_MODE)

 
 ####################################################
 # 'make' configuration
 
 ####################################################
 # 'make' configuration


@@ -199,8 +196,8 @@ avrdude-terminal:
 program-%: %.hex
        $(AVRDUDE) $(AVRDUDE_FLAGS) -c $(PROG) -P $(DEV) -U flash:w:$<
 
 program-%: %.hex
        $(AVRDUDE) $(AVRDUDE_FLAGS) -c $(PROG) -P $(DEV) -U flash:w:$<
 

-program-eeprom-%: %.eep.hex
-       $(AVRDUDE) $(AVRDUDE_FLAGS) -c $(PROG) -P $(DEV) -U eeprom:w:$<
+program-eeprom-%: %.eep.bincs
+       $(AVRDUDE) $(AVRDUDE_FLAGS) -c $(PROG) -P $(DEV) -U eeprom:w:$<:r

 
 # special programming targets
 %.hex: %.elf
 
 # special programming targets
 %.hex: %.elf


@@ -219,6 +216,12 @@ program-eeprom-%: %.eep.hex
 %.eep.hex: %.elf
        $(OBJCOPY) --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex -j .eeprom $< $@
 
 %.eep.hex: %.elf
        $(OBJCOPY) --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O ihex -j .eeprom $< $@
 

+%.bincs: %.bin
+       ../tools/fixcrc < $< > $@
+
+%.eep.bin: %.elf
+       $(OBJCOPY) --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 -O binary -j .eeprom $< $@
+

 %.lss: %.elf
        $(OBJDUMP) -h -S $< > $@
 
 %.lss: %.elf
        $(OBJDUMP) -h -S $< > $@