Skip to content

Commit 36d5ceb

Browse files
Remove binary info header, was crashing picotool (earlephilhower#831)
Because OTA has changed the flash map from standard, picotool ends up crashing or hanging while trying to operate on the current built files. Remove the binary_info calls and structures completely to avoid any issue. Fixes earlephilhower#803
1 parent 34d311f commit 36d5ceb

File tree

7 files changed

+2
-18
lines changed

7 files changed

+2
-18
lines changed

lib/libpico-ipv6.a

-10.1 KB
Binary file not shown.

lib/libpico.a

-10.1 KB
Binary file not shown.

lib/memmap_default.ld

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -132,15 +132,6 @@ SECTIONS
132132
} > FLASH
133133
__exidx_end = .;
134134

135-
/* Machine inspectable binary information */
136-
. = ALIGN(4);
137-
__binary_info_start = .;
138-
.binary_info :
139-
{
140-
KEEP(*(.binary_info.keep.*))
141-
*(.binary_info.*)
142-
} > FLASH
143-
__binary_info_end = .;
144135
. = ALIGN(4);
145136

146137
/* End of .text-like segments */

lib/ota.o

-196 Bytes
Binary file not shown.

ota/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ target_compile_definitions(ota PUBLIC
4444
LFS_NO_MALLOC=1
4545
PICO_PANIC_FUNCTION=
4646
PICO_TIME_DEFAULT_ALARM_POOL_DISABLED=1
47+
PICO_NO_BINARY_INFO=1
4748
)
4849

4950
target_compile_options(ota PUBLIC

ota/memmap_ota.ld

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -84,15 +84,6 @@ SECTIONS
8484
} > FLASH
8585
__exidx_end = .;
8686

87-
/* Machine inspectable binary information */
88-
. = ALIGN(4);
89-
__binary_info_start = .;
90-
.binary_info :
91-
{
92-
KEEP(*(.binary_info.keep.*))
93-
*(.binary_info.*)
94-
} > FLASH
95-
__binary_info_end = .;
9687
. = ALIGN(4);
9788

9889
/* Vector table goes first in RAM, to avoid large alignment hole */

tools/libpico/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ target_compile_definitions(pico PUBLIC
3131
PICO_RP2040_B0_SUPPORTED=1
3232
PICO_RP2040_B1_SUPPORTED=1
3333
PICO_RP2040_B2_SUPPORTED=1
34+
PICO_NO_BINARY_INFO=1
3435
)
3536

3637
target_compile_options(pico PUBLIC

0 commit comments

Comments
 (0)