Skip to content

Commit 2dbcfc9

Browse files
Virtual-JavaVirtual-Java
committed
Add parameter for bigboot in filename
1 parent c61e703 commit 2dbcfc9

File tree

1 file changed

+24
-33
lines changed

1 file changed

+24
-33
lines changed

‎optiboot/bootloaders/optiboot/Makefile.usbmcus

Lines changed: 24 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ atmega8u2atUART: LDSECTIONS = -Wl,--section-start=.text=0x1e00 -Wl,--section-sta
2727
else ## bigboot version is 1024 Bytes long; starts earlier
2828
atmega8u2atUART: LDSECTIONS = -Wl,--section-start=.text=0x1c00 -Wl,--section-start=.version=0x1ffe
2929
endif
30-
atmega8u2atUART: $(PROGRAM)_atmega8u2_UART$(UART)_$(BAUD_RATE)_$(AVR_FREQ).hex
30+
atmega8u2atUART: $(PROGRAM)_atmega8u2_UART$(UART)_$(BAUD_RATE)_$(AVR_FREQ)_BB$(BIGBOOT).hex
3131
ifndef PRODUCTION
32-
atmega8u2atUART: $(PROGRAM)_atmega8u2_UART$(UART)_$(BAUD_RATE)_$(AVR_FREQ).lst
32+
atmega8u2atUART: $(PROGRAM)_atmega8u2_UART$(UART)_$(BAUD_RATE)_$(AVR_FREQ)_BB$(BIGBOOT).lst
3333
endif
3434
atmega8u2:
3535
"$(MAKE)" atmega8u2atUART UART?=1
@@ -60,9 +60,9 @@ atmega16u2atUART: LDSECTIONS = -Wl,--section-start=.text=0x3e00 -Wl,--section-st
6060
else ## bigboot version is 1024 Bytes long; starts earlier
6161
atmega16u2atUART: LDSECTIONS = -Wl,--section-start=.text=0x3c00 -Wl,--section-start=.version=0x3ffe
6262
endif
63-
atmega16u2atUART: $(PROGRAM)_atmega16u2_UART$(UART)_$(BAUD_RATE)_$(AVR_FREQ).hex
63+
atmega16u2atUART: $(PROGRAM)_atmega16u2_UART$(UART)_$(BAUD_RATE)_$(AVR_FREQ)_BB$(BIGBOOT).hex
6464
ifndef PRODUCTION
65-
atmega16u2atUART: $(PROGRAM)_atmega16u2_UART$(UART)_$(BAUD_RATE)_$(AVR_FREQ).lst
65+
atmega16u2atUART: $(PROGRAM)_atmega16u2_UART$(UART)_$(BAUD_RATE)_$(AVR_FREQ)_BB$(BIGBOOT).lst
6666
endif
6767
atmega16u2:
6868
"$(MAKE)" atmega16u2atUART UART?=1
@@ -93,9 +93,9 @@ atmega32u2atUART: LDSECTIONS = -Wl,--section-start=.text=0x7e00 -Wl,--section-st
9393
else ## bigboot version is 1024 Bytes long; starts earlier
9494
atmega32u2atUART: LDSECTIONS = -Wl,--section-start=.text=0x7c00 -Wl,--section-start=.version=0x7ffe
9595
endif
96-
atmega32u2atUART: $(PROGRAM)_atmega32u2_UART$(UART)_$(BAUD_RATE)_$(AVR_FREQ).hex
96+
atmega32u2atUART: $(PROGRAM)_atmega32u2_UART$(UART)_$(BAUD_RATE)_$(AVR_FREQ)_BB$(BIGBOOT).hex
9797
ifndef PRODUCTION
98-
atmega32u2atUART: $(PROGRAM)_atmega32u2_UART$(UART)_$(BAUD_RATE)_$(AVR_FREQ).lst
98+
atmega32u2atUART: $(PROGRAM)_atmega32u2_UART$(UART)_$(BAUD_RATE)_$(AVR_FREQ)_BB$(BIGBOOT).lst
9999
endif
100100
atmega32u2:
101101
"$(MAKE)" atmega32u2atUART UART?=1
@@ -126,9 +126,9 @@ atmega16u4atUART: LDSECTIONS = -Wl,--section-start=.text=0x3e00 -Wl,--section-st
126126
else ## bigboot version is 1024 Bytes long; starts earlier
127127
atmega16u4atUART: LDSECTIONS = -Wl,--section-start=.text=0x3c00 -Wl,--section-start=.version=0x3ffe
128128
endif
129-
atmega16u4atUART: $(PROGRAM)_atmega16u4_UART$(UART)_$(BAUD_RATE)_$(AVR_FREQ).hex
129+
atmega16u4atUART: $(PROGRAM)_atmega16u4_UART$(UART)_$(BAUD_RATE)_$(AVR_FREQ)_BB$(BIGBOOT).hex
130130
ifndef PRODUCTION
131-
atmega16u4atUART: $(PROGRAM)_atmega16u4_UART$(UART)_$(BAUD_RATE)_$(AVR_FREQ).lst
131+
atmega16u4atUART: $(PROGRAM)_atmega16u4_UART$(UART)_$(BAUD_RATE)_$(AVR_FREQ)_BB$(BIGBOOT).lst
132132
endif
133133
atmega16u4:
134134
# disable blinking the LED to make the bootloader to fit in 512 Bytes Bootsection
@@ -161,9 +161,9 @@ atmega32u4atUART: LDSECTIONS = -Wl,--section-start=.text=0x7e00 -Wl,--section-st
161161
else ## bigboot version is 1024 Bytes long; starts earlier
162162
atmega32u4atUART: LDSECTIONS = -Wl,--section-start=.text=0x7c00 -Wl,--section-start=.version=0x7ffe
163163
endif
164-
atmega32u4atUART: $(PROGRAM)_atmega32u4_UART$(UART)_$(BAUD_RATE)_$(AVR_FREQ).hex
164+
atmega32u4atUART: $(PROGRAM)_atmega32u4_UART$(UART)_$(BAUD_RATE)_$(AVR_FREQ)_BB$(BIGBOOT).hex
165165
ifndef PRODUCTION
166-
atmega32u4atUART: $(PROGRAM)_atmega32u4_UART$(UART)_$(BAUD_RATE)_$(AVR_FREQ).lst
166+
atmega32u4atUART: $(PROGRAM)_atmega32u4_UART$(UART)_$(BAUD_RATE)_$(AVR_FREQ)_BB$(BIGBOOT).lst
167167
endif
168168
atmega32u4:
169169
# disable blinking the LED to make the bootloader to fit in 512 Bytes Bootsection
@@ -196,9 +196,9 @@ atmega32u6atUART: LDSECTIONS = -Wl,--section-start=.text=0x7e00 -Wl,--section-st
196196
else ## bigboot version is 1024 Bytes long; starts earlier
197197
atmega32u6atUART: LDSECTIONS = -Wl,--section-start=.text=0x7c00 -Wl,--section-start=.version=0x7ffe
198198
endif
199-
atmega32u6atUART: $(PROGRAM)_atmega32u6_UART$(UART)_$(BAUD_RATE)_$(AVR_FREQ).hex
199+
atmega32u6atUART: $(PROGRAM)_atmega32u6_UART$(UART)_$(BAUD_RATE)_$(AVR_FREQ)_BB$(BIGBOOT).hex
200200
ifndef PRODUCTION
201-
atmega32u6atUART: $(PROGRAM)_atmega32u6_UART$(UART)_$(BAUD_RATE)_$(AVR_FREQ).lst
201+
atmega32u6atUART: $(PROGRAM)_atmega32u6_UART$(UART)_$(BAUD_RATE)_$(AVR_FREQ)_BB$(BIGBOOT).lst
202202
endif
203203
atmega32u6:
204204
"$(MAKE)" atmega32u6atUART UART?=1
@@ -230,12 +230,12 @@ at90usb646atUART: LDSECTIONS = -Wl,--section-start=.text=0xfc00 -Wl,--section-st
230230
else ## bigboot version is 1024 Bytes long; starts earlier
231231
at90usb646atUART: LDSECTIONS = -Wl,--section-start=.text=0xf800 -Wl,--section-start=.version=0xfffe
232232
endif
233-
at90usb646atUART: $(PROGRAM)_at90usb646_UART$(UART)_$(BAUD_RATE)_$(AVR_FREQ).hex
233+
at90usb646atUART: $(PROGRAM)_at90usb646_UART$(UART)_$(BAUD_RATE)_$(AVR_FREQ)_BB$(BIGBOOT).hex
234234
ifndef PRODUCTION
235-
at90usb646atUART: $(PROGRAM)_at90usb646_UART$(UART)_$(BAUD_RATE)_$(AVR_FREQ).lst
235+
at90usb646atUART: $(PROGRAM)_at90usb646_UART$(UART)_$(BAUD_RATE)_$(AVR_FREQ)_BB$(BIGBOOT).lst
236236
endif
237237
at90usb646:
238-
"$(MAKE)" at90usb646atUART UART?=1
238+
"$(MAKE)" at90usb646atUART UART?=1 BIGBOOT?=1
239239

240240
at90usb646_isp: at90usb646
241241
at90usb646_isp: TARGET = at90usb646
@@ -264,12 +264,12 @@ at90usb647atUART: LDSECTIONS = -Wl,--section-start=.text=0xfc00 -Wl,--section-st
264264
else ## bigboot version is 2048 Bytes long; starts earlier
265265
at90usb647atUART: LDSECTIONS = -Wl,--section-start=.text=0xf800 -Wl,--section-start=.version=0xfffe
266266
endif
267-
at90usb647atUART: $(PROGRAM)_at90usb647_UART$(UART)_$(BAUD_RATE)_$(AVR_FREQ).hex
267+
at90usb647atUART: $(PROGRAM)_at90usb647_UART$(UART)_$(BAUD_RATE)_$(AVR_FREQ)_BB$(BIGBOOT).hex
268268
ifndef PRODUCTION
269-
at90usb647atUART: $(PROGRAM)_at90usb647_UART$(UART)_$(BAUD_RATE)_$(AVR_FREQ).lst
269+
at90usb647atUART: $(PROGRAM)_at90usb647_UART$(UART)_$(BAUD_RATE)_$(AVR_FREQ)_BB$(BIGBOOT).lst
270270
endif
271271
at90usb647:
272-
"$(MAKE)" at90usb647atUART UART?=1
272+
"$(MAKE)" at90usb647atUART UART?=1 BIGBOOT?=1
273273

274274
at90usb647_isp: at90usb647
275275
at90usb647_isp: TARGET = at90usb647
@@ -298,12 +298,12 @@ at90usb1286atUART: LDSECTIONS = -Wl,--section-start=.text=0x1fc00 -Wl,--section-
298298
else ## bigboot version is 2048 Bytes long; starts earlier
299299
at90usb1286atUART: LDSECTIONS = -Wl,--section-start=.text=0x1f800 -Wl,--section-start=.version=0x1fffe
300300
endif
301-
at90usb1286atUART: $(PROGRAM)_at90usb1286_UART$(UART)_$(BAUD_RATE)_$(AVR_FREQ).hex
301+
at90usb1286atUART: $(PROGRAM)_at90usb1286_UART$(UART)_$(BAUD_RATE)_$(AVR_FREQ)_BB$(BIGBOOT).hex
302302
ifndef PRODUCTION
303-
at90usb1286atUART: $(PROGRAM)_at90usb1286_UART$(UART)_$(BAUD_RATE)_$(AVR_FREQ).lst
303+
at90usb1286atUART: $(PROGRAM)_at90usb1286_UART$(UART)_$(BAUD_RATE)_$(AVR_FREQ)_BB$(BIGBOOT).lst
304304
endif
305305
at90usb1286:
306-
"$(MAKE)" at90usb1286atUART UART?=1
306+
"$(MAKE)" at90usb1286atUART UART?=1 BIGBOOT?=1
307307

308308
at90usb1286_isp: at90usb1286
309309
at90usb1286_isp: TARGET = at90usb1286
@@ -332,21 +332,12 @@ at90usb1287atUART: LDSECTIONS = -Wl,--section-start=.text=0x1fc00 -Wl,--section-
332332
else ## bigboot version is 2048 Bytes long; starts earlier
333333
at90usb1287atUART: LDSECTIONS = -Wl,--section-start=.text=0x1f800 -Wl,--section-start=.version=0x1fffe
334334
endif
335-
#at90usb1287atUART: OUTPUT_FILE_ROOT=$(PROGRAM)_$(TARGET)_UART${UART:-"d_d"}_$(BAUD_RATE)_$(AVR_FREQ)
336-
#at90usb1287atUART: $(OUTPUT_FILE_ROOT).hex
337-
test=atm1
338-
at90usb1287atUART: $(PROGRAM)_${test:-"ddd"}_UART${UART_CMD:-"d_d"}_$(BAUD_RATE)_$(AVR_FREQ).hex
339-
340-
#at90usb1287atUART: $(PROGRAM)_at90usb1287_UART$(UART)_$(BAUD_RATE)_$(AVR_FREQ).hex
335+
at90usb1287atUART: $(PROGRAM)_at90usb1287_UART$(UART)_$(BAUD_RATE)_$(AVR_FREQ)_BB$(BIGBOOT).hex
341336
ifndef PRODUCTION
342-
#at90usb1287atUART: $(PROGRAM)_$(TARGET)_UART$(UART)_$(BAUD_RATE)_$(AVR_FREQ).lst
343-
344-
#at90usb1287atUART: $(OUTPUT_FILE_ROOT).lst
345-
#at90usb1287atUART: $(PROGRAM)_at90usb1287_UART${UART:? "d_d"}_$(BAUD_RATE)_$(AVR_FREQ).lst
346-
at90usb1287atUART: $(PROGRAM)_at90usb1287_${(UART):-"d_d"}_$(BAUD_RATE)_$(AVR_FREQ).lst
337+
at90usb1287atUART: $(PROGRAM)_at90usb1287_UART$(UART)_$(BAUD_RATE)_$(AVR_FREQ)_BB$(BIGBOOT).lst
347338
endif
348339
at90usb1287:
349-
"$(MAKE)" at90usb1287atUART UART?=1
340+
"$(MAKE)" at90usb1287atUART UART?=1 BIGBOOT?=1 BIGBOOT?=1
350341

351342
at90usb1287_isp: at90usb1287
352343
at90usb1287_isp: TARGET = at90usb1287

0 commit comments

Comments
 (0)