fix stuff after merge
This commit is contained in:
		
							
								
								
									
										6
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										6
									
								
								Makefile
									
									
									
									
									
								
							@@ -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 
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user