diff --git a/firmware/export/config/echor1.h b/firmware/export/config/echor1.h
index 41149258c9..8f11ab8533 100644
--- a/firmware/export/config/echor1.h
+++ b/firmware/export/config/echor1.h
@@ -89,9 +89,9 @@
 #define BATTERY_CAPACITY_MAX     1100
 #define BATTERY_CAPACITY_INC     0
 
-/* Multiboot */
-#define HAVE_BOOTDATA
-#define BOOT_REDIR "rockbox_main.echor1"
+/* TODO: Multiboot */
+//#define HAVE_BOOTDATA
+//#define BOOT_REDIR "rockbox_main.echor1"
 
 /* USB support */
 #ifndef SIMULATOR
diff --git a/firmware/target/arm/stm32/app.lds b/firmware/target/arm/stm32/app.lds
index 4e5e393d28..cd20766d2e 100644
--- a/firmware/target/arm/stm32/app.lds
+++ b/firmware/target/arm/stm32/app.lds
@@ -39,7 +39,6 @@ SECTIONS
     {
         loadaddress = .; /* only needed to keep ROLO happy */
 
-        KEEP(*(.bootdata))
         *(.init.text*)
         *(.text*)
     } > SRAM_AXI :sram_rx
diff --git a/firmware/target/arm/stm32/crt0-stm32h7.S b/firmware/target/arm/stm32/crt0-stm32h7.S
index 9130848785..6be820c390 100644
--- a/firmware/target/arm/stm32/crt0-stm32h7.S
+++ b/firmware/target/arm/stm32/crt0-stm32h7.S
@@ -19,18 +19,11 @@
  *
  ****************************************************************************/
 #include "config.h"
-#include "bootdata.h"
 #include "regs/stm32h743/pwr.h"
 
     .syntax unified
     .text
 
-#if defined(HAVE_BOOTDATA) && !defined(BOOTLOADER)
-    .section .bootdata
-
-put_boot_data_here
-#endif
-
     .section .init.text,"ax",%progbits
 
     .global reset_handler