Skip to content

Commit a8f7e73

Browse files
WestfWdamellis
authored andcommitted
Fix errors in LDSECTIONS refactoring
(found during atmega8 testing.) (cherry picked from commit 422398e08c8e011bf490b54af88271c54e56ddb9)
1 parent 0ad7a6d commit a8f7e73

File tree

5 files changed

+23
-23
lines changed

5 files changed

+23
-23
lines changed

bootloaders/optiboot/Makefile

+7-7
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ virboot328: TARGET = atmega328
129129
virboot328: MCU_TARGET = atmega328p
130130
virboot328: CFLAGS += '-DLED_START_FLASHES=3' '-DBAUD_RATE=115200' '-DVIRTUAL_BOOT'
131131
virboot328: AVR_FREQ = 16000000L
132-
virboot328: LDSECTIONS = --section-start=.text=0x7e00 -Wl,--section-start=.version=0x7ffe
132+
virboot328: LDSECTIONS = -Wl,--section-start=.text=0x7e00 -Wl,--section-start=.version=0x7ffe
133133
virboot328: $(PROGRAM)_atmega328.hex
134134
virboot328: $(PROGRAM)_atmega328.lst
135135

@@ -221,7 +221,7 @@ sanguino: TARGET = atmega644p
221221
sanguino: MCU_TARGET = atmega644p
222222
sanguino: CFLAGS += '-DLED_START_FLASHES=3' '-DBAUD_RATE=115200' '-DBIGBOOT'
223223
sanguino: AVR_FREQ = 16000000L
224-
sanguino: LDSECTION = --section-start=.text=0xfc00
224+
sanguino: LDSECTIONS = -Wl,--section-start=.text=0xfc00
225225
sanguino: $(PROGRAM)_atmega644p.hex
226226
sanguino: $(PROGRAM)_atmega644p.lst
227227

@@ -241,7 +241,7 @@ sanguino_isp: isp
241241
mega: MCU_TARGET = atmega1280
242242
mega: CFLAGS += '-DLED_START_FLASHES=3' '-DBAUD_RATE=115200' '-DBIGBOOT'
243243
mega: AVR_FREQ = 16000000L
244-
mega: LDSECTION = --section-start=.text=0x1fc00
244+
mega: LDSECTIONS = -Wl,--section-start=.text=0x1fc00
245245
mega: $(PROGRAM)_atmega1280.hex
246246
mega: $(PROGRAM)_atmega1280.lst
247247

@@ -262,7 +262,7 @@ atmega8: TARGET = atmega8
262262
atmega8: MCU_TARGET = atmega8
263263
atmega8: CFLAGS += '-DLED_START_FLASHES=3' '-DBAUD_RATE=115200'
264264
atmega8: AVR_FREQ = 16000000L
265-
atmega8: LDSECTIONS = --section-start=.text=0x1e00 -Wl,--section-start=.version=0x1ffe
265+
atmega8: LDSECTIONS = -Wl,--section-start=.text=0x1e00 -Wl,--section-start=.version=0x1ffe
266266
atmega8: $(PROGRAM)_atmega8.hex
267267
atmega8: $(PROGRAM)_atmega8.lst
268268

@@ -281,7 +281,7 @@ atmega88: TARGET = atmega88
281281
atmega88: MCU_TARGET = atmega88
282282
atmega88: CFLAGS += '-DLED_START_FLASHES=3' '-DBAUD_RATE=115200'
283283
atmega88: AVR_FREQ = 16000000L
284-
atmega88: LDSECTIONS = --section-start=.text=0x1e00 -Wl,--section-start=.version=0x1ffe
284+
atmega88: LDSECTIONS = -Wl,--section-start=.text=0x1e00 -Wl,--section-start=.version=0x1ffe
285285
atmega88: $(PROGRAM)_atmega88.hex
286286
atmega88: $(PROGRAM)_atmega88.lst
287287

@@ -357,7 +357,7 @@ atmega328_pro8: TARGET = atmega328_pro_8MHz
357357
atmega328_pro8: MCU_TARGET = atmega328p
358358
atmega328_pro8: CFLAGS += '-DLED_START_FLASHES=3' '-DBAUD_RATE=115200'
359359
atmega328_pro8: AVR_FREQ = 8000000L
360-
atmega328_pro8: LDSECTIONS = --section-start=.text=0x7e00 -Wl,--section-start=.version=0x7ffe
360+
atmega328_pro8: LDSECTIONS = -Wl,--section-start=.text=0x7e00 -Wl,--section-start=.version=0x7ffe
361361
atmega328_pro8: $(PROGRAM)_atmega328_pro_8MHz.hex
362362
atmega328_pro8: $(PROGRAM)_atmega328_pro_8MHz.lst
363363

@@ -382,7 +382,7 @@ luminet: MCU_TARGET = attiny84
382382
luminet: CFLAGS += '-DLED_START_FLASHES=3' '-DSOFT_UART' '-DBAUD_RATE=9600'
383383
luminet: CFLAGS += '-DVIRTUAL_BOOT_PARTITION'
384384
luminet: AVR_FREQ = 1000000L
385-
luminet: LDSECTIONS = --section-start=.text=0x1d00 -Wl,--section-start=.version=0x1efe
385+
luminet: LDSECTIONS = -Wl,--section-start=.text=0x1d00 -Wl,--section-start=.version=0x1efe
386386
luminet: $(PROGRAM)_luminet.hex
387387
luminet: $(PROGRAM)_luminet.lst
388388

bootloaders/optiboot/optiboot_atmega328.hex

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@
2828
:107FB000F1DF803219F088E0F5DFFFCF84E1E2CF16
2929
:107FC0001F93182FE7DF1150E9F7F2DF1F91089593
3030
:0A7FD00080E0E8DFEE27FF270994A8
31-
:027FFE0001047C
31+
:027FFE0002047B
3232
:0400000300007E007B
3333
:00000001FF

bootloaders/optiboot/optiboot_atmega328.lst

+7-7
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@ Idx Name Size VMA LMA File off Algn
1111
CONTENTS, READONLY, DEBUGGING
1212
3 .debug_pubnames 0000005f 00000000 00000000 00000258 2**0
1313
CONTENTS, READONLY, DEBUGGING
14-
4 .debug_info 0000028c 00000000 00000000 000002b7 2**0
14+
4 .debug_info 0000028d 00000000 00000000 000002b7 2**0
1515
CONTENTS, READONLY, DEBUGGING
16-
5 .debug_abbrev 00000199 00000000 00000000 00000543 2**0
16+
5 .debug_abbrev 0000018a 00000000 00000000 00000544 2**0
1717
CONTENTS, READONLY, DEBUGGING
18-
6 .debug_line 00000456 00000000 00000000 000006dc 2**0
18+
6 .debug_line 00000456 00000000 00000000 000006ce 2**0
1919
CONTENTS, READONLY, DEBUGGING
20-
7 .debug_frame 00000080 00000000 00000000 00000b34 2**2
20+
7 .debug_frame 00000080 00000000 00000000 00000b24 2**2
2121
CONTENTS, READONLY, DEBUGGING
22-
8 .debug_str 00000149 00000000 00000000 00000bb4 2**0
22+
8 .debug_str 00000149 00000000 00000000 00000ba4 2**0
2323
CONTENTS, READONLY, DEBUGGING
24-
9 .debug_loc 0000027e 00000000 00000000 00000cfd 2**0
24+
9 .debug_loc 0000027e 00000000 00000000 00000ced 2**0
2525
CONTENTS, READONLY, DEBUGGING
26-
10 .debug_ranges 00000060 00000000 00000000 00000f7b 2**0
26+
10 .debug_ranges 00000060 00000000 00000000 00000f6b 2**0
2727
CONTENTS, READONLY, DEBUGGING
2828

2929
Disassembly of section .text:

bootloaders/optiboot/optiboot_diecimila.hex

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@
2828
:103FB000F1DF803219F088E0F5DFFFCF84E1E2CF56
2929
:103FC0001F93182FE7DF1150E9F7F2DF1F910895D3
3030
:0A3FD00080E0E8DFEE27FF270994E8
31-
:023FFE000104BC
31+
:023FFE000204BB
3232
:0400000300003E00BB
3333
:00000001FF

bootloaders/optiboot/optiboot_diecimila.lst

+7-7
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,19 @@ Idx Name Size VMA LMA File off Algn
1111
CONTENTS, READONLY, DEBUGGING
1212
3 .debug_pubnames 0000005f 00000000 00000000 00000258 2**0
1313
CONTENTS, READONLY, DEBUGGING
14-
4 .debug_info 0000028c 00000000 00000000 000002b7 2**0
14+
4 .debug_info 0000028d 00000000 00000000 000002b7 2**0
1515
CONTENTS, READONLY, DEBUGGING
16-
5 .debug_abbrev 00000199 00000000 00000000 00000543 2**0
16+
5 .debug_abbrev 0000018a 00000000 00000000 00000544 2**0
1717
CONTENTS, READONLY, DEBUGGING
18-
6 .debug_line 00000456 00000000 00000000 000006dc 2**0
18+
6 .debug_line 00000456 00000000 00000000 000006ce 2**0
1919
CONTENTS, READONLY, DEBUGGING
20-
7 .debug_frame 00000080 00000000 00000000 00000b34 2**2
20+
7 .debug_frame 00000080 00000000 00000000 00000b24 2**2
2121
CONTENTS, READONLY, DEBUGGING
22-
8 .debug_str 00000149 00000000 00000000 00000bb4 2**0
22+
8 .debug_str 00000149 00000000 00000000 00000ba4 2**0
2323
CONTENTS, READONLY, DEBUGGING
24-
9 .debug_loc 0000027e 00000000 00000000 00000cfd 2**0
24+
9 .debug_loc 0000027e 00000000 00000000 00000ced 2**0
2525
CONTENTS, READONLY, DEBUGGING
26-
10 .debug_ranges 00000060 00000000 00000000 00000f7b 2**0
26+
10 .debug_ranges 00000060 00000000 00000000 00000f6b 2**0
2727
CONTENTS, READONLY, DEBUGGING
2828

2929
Disassembly of section .text:

0 commit comments

Comments
 (0)