fix stuff after merge

This commit is contained in:
Stefan Rupp 2014-03-08 23:52:30 +01:00
parent 3565ff42c7
commit ae83f35241

View File

@ -44,12 +44,10 @@ bin: $(PRG).bin
%.hex: %.elf %.hex: %.elf
$(OBJCOPY) -j .text -j .data -O ihex $< $@ $(OBJCOPY) -j .text -j .data -O ihex $< $@
%.bin: %.elf
$(OBJCOPY) -j .text -j .data -O binary $< $@
%.bin: %.elf %.bin: %.elf
$(OBJCOPY) -j .text -j .data -O binary $< $@ $(OBJCOPY) -j .text -j .data -O binary $< $@
prg: $(PRG).hex prg: $(PRG).bin
python2 ../megaHidProg -C -c 1000 -t 4 -b $(PRG).bin python2 ../megaHidProg/megaHidProg.py -C -c 1000 -t 4 -b $(PRG).bin