adafruit-mirror/arduino-pico
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove binary info header, was crashing picotool (#831)

Browse source 
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 #803
This commit is contained in:
Earle F. Philhower, III 2022-09-02 23:17:03 -07:00 committed by GitHub
parent 34d311fd81
commit 36d5cebde6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 2 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
lib/libpico-ipv6.a
View file

Binary file not shown.

BIN
lib/libpico.a
View file

Binary file not shown.

9
lib/memmap_default.ld
View file

@ -132,15 +132,6 @@ SECTIONS
} > FLASH } > FLASH
__exidx_end = .; __exidx_end = .;
/* Machine inspectable binary information */
. = ALIGN(4);
__binary_info_start = .;
.binary_info :
{
KEEP(*(.binary_info.keep.*))
*(.binary_info.*)
} > FLASH
__binary_info_end = .;
. = ALIGN(4); . = ALIGN(4);
/* End of .text-like segments */ /* End of .text-like segments */

BIN
lib/ota.o
View file

Binary file not shown.

1
ota/CMakeLists.txt
View file

@ -44,6 +44,7 @@ target_compile_definitions(ota PUBLIC
LFS_NO_MALLOC=1 LFS_NO_MALLOC=1
PICO_PANIC_FUNCTION= PICO_PANIC_FUNCTION=
PICO_TIME_DEFAULT_ALARM_POOL_DISABLED=1 PICO_TIME_DEFAULT_ALARM_POOL_DISABLED=1
PICO_NO_BINARY_INFO=1
) )
target_compile_options(ota PUBLIC target_compile_options(ota PUBLIC

9
ota/memmap_ota.ld
View file

@ -84,15 +84,6 @@ SECTIONS
} > FLASH } > FLASH
__exidx_end = .; __exidx_end = .;
/* Machine inspectable binary information */
. = ALIGN(4);
__binary_info_start = .;
.binary_info :
{
KEEP(*(.binary_info.keep.*))
*(.binary_info.*)
} > FLASH
__binary_info_end = .;
. = ALIGN(4); . = ALIGN(4);
/* Vector table goes first in RAM, to avoid large alignment hole */ /* Vector table goes first in RAM, to avoid large alignment hole */

1
tools/libpico/CMakeLists.txt
View file

@ -31,6 +31,7 @@ target_compile_definitions(pico PUBLIC
PICO_RP2040_B0_SUPPORTED=1 PICO_RP2040_B0_SUPPORTED=1
PICO_RP2040_B1_SUPPORTED=1 PICO_RP2040_B1_SUPPORTED=1
PICO_RP2040_B2_SUPPORTED=1 PICO_RP2040_B2_SUPPORTED=1
PICO_NO_BINARY_INFO=1
) )
target_compile_options(pico PUBLIC target_compile_options(pico PUBLIC