Remove bianry info header, was crashing picotool

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
earlephilhower · Sep 3, 2022 · bf523a9 · bf523a9
1 parent 34d311f
commit bf523a9
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 18 deletions.
diff --git a/lib/libpico-ipv6.a b/lib/libpico-ipv6.a
diff --git a/lib/libpico.a b/lib/libpico.a
diff --git a/lib/memmap_default.ld b/lib/memmap_default.ld
@@ -132,15 +132,6 @@ SECTIONS
     } > FLASH
     __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);
 
     /* End of .text-like segments */

diff --git a/lib/ota.o b/lib/ota.o
diff --git a/ota/CMakeLists.txt b/ota/CMakeLists.txt
@@ -44,6 +44,7 @@ target_compile_definitions(ota PUBLIC
         LFS_NO_MALLOC=1
         PICO_PANIC_FUNCTION=
         PICO_TIME_DEFAULT_ALARM_POOL_DISABLED=1
+        PICO_NO_BINARY_INFO=1
 )
 
 target_compile_options(ota PUBLIC

diff --git a/ota/memmap_ota.ld b/ota/memmap_ota.ld
@@ -84,15 +84,6 @@ SECTIONS
     } > FLASH
     __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);
 
     /* Vector table goes first in RAM, to avoid large alignment hole */

diff --git a/tools/libpico/CMakeLists.txt b/tools/libpico/CMakeLists.txt
@@ -31,6 +31,7 @@ target_compile_definitions(pico PUBLIC
         PICO_RP2040_B0_SUPPORTED=1
         PICO_RP2040_B1_SUPPORTED=1
         PICO_RP2040_B2_SUPPORTED=1
+        PICO_NO_BINARY_INFO=1
 )
 
 target_compile_options(pico PUBLIC