arduino/optiboot
1
0
Fork 0
mirror of https://github.com/Optiboot/optiboot.git synced 2025-09-04 12:02:07 +03:00
Code Activity

Merge pull request #259 from majekw/issue-258

Browse Source 
Fix compilation of attiny828at8_5v, atmega168 BIGBOOT=1 and attiny84
This commit is contained in:
Bill Westfield
2018-10-09 21:43:40 -07:00
committed by GitHub
parent eea6dad0ae e866cae9d7
commit 7c5be22831
4 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
optiboot/bootloaders/optiboot/Makefile
View File

@@ -381,7 +381,7 @@ atmega168: AVR_FREQ ?= 16000000L
ifndef BIGBOOT ifndef BIGBOOT
atmega168: LDSECTIONS = -Wl,--section-start=.text=0x3e00 -Wl,--section-start=.version=0x3ffe atmega168: LDSECTIONS = -Wl,--section-start=.text=0x3e00 -Wl,--section-start=.version=0x3ffe
else else
atmeg168: LDSECTIONS = -Wl,--section-start=.text=0x3c00 -Wl,--section-start=.version=0x3ffe atmega168: LDSECTIONS = -Wl,--section-start=.text=0x3c00 -Wl,--section-start=.version=0x3ffe
endif endif
atmega168: $(PROGRAM)_atmega168.hex atmega168: $(PROGRAM)_atmega168.hex
ifndef PRODUCTION ifndef PRODUCTION

18
optiboot/bootloaders/optiboot/Makefile.MCUdude
View File

@@ -115,15 +115,15 @@ endif
atmega164pa: atmega164p atmega164pa: atmega164p
#ATmega168/A #ATmega168/A
atmega168: TARGET = atmega168 #atmega168: TARGET = atmega168
atmega168: MCU_TARGET = atmega168 #atmega168: MCU_TARGET = atmega168
atmega168: CFLAGS += $(COMMON_OPTIONS) $(UART_CMD) #atmega168: CFLAGS += $(COMMON_OPTIONS) $(UART_CMD)
atmega168: AVR_FREQ ?= 16000000L #atmega168: AVR_FREQ ?= 16000000L
atmega168: LDSECTIONS = -Wl,--section-start=.text=0x3e00 -Wl,--section-start=.version=0x3ffe #atmega168: LDSECTIONS = -Wl,--section-start=.text=0x3e00 -Wl,--section-start=.version=0x3ffe
atmega168: $(PROGRAM)_atmega168_UART$(UART)_$(BAUD_RATE)_$(AVR_FREQ).hex #atmega168: $(PROGRAM)_atmega168_UART$(UART)_$(BAUD_RATE)_$(AVR_FREQ).hex
ifndef PRODUCTION #ifndef PRODUCTION
atmega168: $(PROGRAM)_atmega168_UART$(UART)_$(BAUD_RATE)_$(AVR_FREQ).lst #atmega168: $(PROGRAM)_atmega168_UART$(UART)_$(BAUD_RATE)_$(AVR_FREQ).lst
endif #endif
atmega168a: atmega168 atmega168a: atmega168
#ATmega168P/PA #ATmega168P/PA

2
optiboot/bootloaders/optiboot/Makefile.tiny
View File

@@ -353,7 +353,7 @@ ifndef PRODUCTION
endif endif
attiny828at8_5v: attiny828at8_5v:
$(MAKE) attiny828at8 AVR_FREQ=8200000L BAUD_RATE=57600 $(MAKE) attiny828 AVR_FREQ=8200000L BAUD_RATE=57600
mv $(PROGRAM)_attiny828.hex $(PROGRAM)_$@.hex mv $(PROGRAM)_attiny828.hex $(PROGRAM)_$@.hex
ifndef PRODUCTION ifndef PRODUCTION
mv $(PROGRAM)_attiny828.lst $(PROGRAM)_$@.lst mv $(PROGRAM)_attiny828.lst $(PROGRAM)_$@.lst

2
optiboot/bootloaders/optiboot/pin_defs.h
View File

@@ -42,6 +42,7 @@
* Note that mega8/m32 still needs special handling, because ubrr is handled * Note that mega8/m32 still needs special handling, because ubrr is handled
* differently. * differently.
*/ */
#ifndef SOFT_UART
#if UART == 0 #if UART == 0
#if defined(UDR0) #if defined(UDR0)
# define UART_SRA UCSR0A # define UART_SRA UCSR0A
@@ -93,6 +94,7 @@
# define UART_SRL UBRR3L # define UART_SRL UBRR3L
# define UART_UDR UDR3 # define UART_UDR UDR3
#endif #endif
#endif
#if defined(__AVR_ATmega8__) \ #if defined(__AVR_ATmega8__) \
|| defined (__AVR_ATmega32__) \ || defined (__AVR_ATmega32__) \