From 1a3d232e7b5dadf65bca9cad1a671e9efa90dfef Mon Sep 17 00:00:00 2001 From: Julian Oes Date: Wed, 29 Apr 2026 13:04:03 +1200 Subject: [PATCH] fix(bootloader): remove broken PROTO_SET_DELAY boot-delay feature (#27081) The bootloader boot-delay feature has been mechanically broken on every modern FMU board since the STM32F7/H7 transition. It has three independent bugs that prevent it from ever working: 1. Offset mismatch: BOOT_DELAY_ADDRESS is hardcoded to 0x1a0, but the NuttX vector table is 504 B (F76x) to 664 B (H743) long. The linker places _bootdelay_signature at ALIGN(32) past end of vectors (e.g. 0x2a0 on CubeOrange), never at 0x1a0. The bootloader reads random exception_common pointers in place of the magic and never matches BOOT_DELAY_SIGNATURE1/2. Verified on CubeOrange with objdump of cubepilot_cubeorange_default.elf. 2. Flash cache never flushes: fc_write() stores arbitrary writes in cache line 1 and only flushes on a very specific condition tied to the sequential firmware upload flow. A standalone write during PROTO_SET_DELAY is cached forever. fc_read() then returns the cached value, so the post-write verify lies and the bootloader reports success. Nothing ever reaches flash. 3. H7 write granularity: the STM32H7 flash controller requires a full 32-byte program cycle per write. Single 32-bit writes from flash_func_write_word() would not be accepted by the controller even if they reached it. The feature has been silently dead on every H7/F7 FMU board for years and no one noticed, which is strong evidence nothing actually depends on it. Rather than fix it (which would mean rewriting PROTO_SET_DELAY, the flash cache path, and the H7 flash programming path), remove it. Changes: - bl.c: PROTO_SET_DELAY case now immediately NACKs (goto cmd_bad) so clients that still send the command get a clear rejection instead of the previous silent fake-success. The opcode stays in the protocol enum for backwards compatibility. - bl.h: drop BOOT_DELAY_SIGNATURE1/2 and BOOT_DELAY_MAX. - stm/stm32_common/main.c, nxp/imxrt_common/main.c: drop the startup boot-delay sig check block. - image_toc.c: decouple find_toc() from BOOT_DELAY_ADDRESS. BOARD_IMAGE_TOC_OFFSET is now the required define when BOOTLOADER_USE_TOC is enabled. The body is wrapped in #ifdef BOOTLOADER_USE_TOC and falls back to a stub returning false when the TOC is not in use (no upstream board currently enables it). - Linker scripts: strip EXTERN(_bootdelay_signature) and the FILL/. += 8 block from all 142 affected .ld files across boards/. - hw_config.h: strip the #define BOOT_DELAY_ADDRESS and its comment block entry from all 48 affected boards. - Tools/px4_uploader.py, Tools/teensy_uploader.py: remove --boot-delay, set_boot_delay(), and SET_BOOT_DELAY client-side counterpart. Smoke-built on cubepilot_cubeorange_default and cubepilot_cubeorange_bootloader; no link errors, no unresolved symbols, flash usage unchanged. Tested: - New BL, new FW - Old BL, old FW - Old BL, new FW - New BL, old FW --- Tools/px4_uploader.py | 24 -------- Tools/teensy_uploader.py | 1 - .../nuttx-config/scripts/bootloader_script.ld | 8 --- .../nuttx-config/scripts/script.ld | 8 --- .../3dr/ctrl-zero-h7-oem-revg/src/hw_config.h | 3 - .../nuttx-config/scripts/bootloader_script.ld | 8 --- .../ga1/nuttx-config/scripts/script.ld | 7 --- boards/accton-godwit/ga1/src/hw_config.h | 3 - .../mindpx-v2/nuttx-config/scripts/script.ld | 8 --- .../nuttx-config/scripts/script.ld | 2 - .../can-flow/nuttx-config/scripts/script.ld | 2 - .../can-gps/nuttx-config/scripts/script.ld | 2 - .../nuttx-config/scripts/script.ld | 2 - .../cannode/nuttx-config/scripts/script.ld | 2 - .../ark/dist/nuttx-config/scripts/script.ld | 2 - .../f9p-gps/nuttx-config/scripts/script.ld | 2 - .../nuttx-config/scripts/bootloader_script.ld | 8 --- .../fmu-v6x/nuttx-config/scripts/script.ld | 7 --- boards/ark/fmu-v6x/src/hw_config.h | 3 - .../nuttx-config/scripts/bootloader_script.ld | 8 --- boards/ark/fpv/nuttx-config/scripts/script.ld | 7 --- boards/ark/fpv/src/hw_config.h | 3 - boards/ark/mag/nuttx-config/scripts/script.ld | 2 - .../nuttx-config/scripts/bootloader_script.ld | 8 --- .../ark/pi6x/nuttx-config/scripts/script.ld | 7 --- boards/ark/pi6x/src/hw_config.h | 3 - .../nuttx-config/scripts/script.ld | 2 - .../teseo-gps/nuttx-config/scripts/script.ld | 2 - .../x20-gps/nuttx-config/scripts/script.ld | 2 - .../mantis-edu/nuttx-config/scripts/script.ld | 7 --- .../nuttx-config/scripts/bootloader_script.ld | 8 --- .../fmu-v6s/nuttx-config/scripts/script.ld | 7 --- boards/auterion/fmu-v6s/src/hw_config.h | 3 - .../nuttx-config/scripts/bootloader_script.ld | 8 --- .../fmu-v6x/nuttx-config/scripts/script.ld | 7 --- boards/auterion/fmu-v6x/src/hw_config.h | 3 - boards/av/x-v1/nuttx-config/scripts/script.ld | 8 --- .../crazyflie/nuttx-config/scripts/script.ld | 6 -- .../nuttx-config/scripts/script.ld | 6 -- .../nuttx-config/scripts/bootloader_script.ld | 8 --- .../743v1/nuttx-config/scripts/script.ld | 8 --- boards/corvon/743v1/src/hw_config.h | 3 - .../nuttx-config/scripts/bootloader_script.ld | 8 --- .../7-nano/nuttx-config/scripts/script.ld | 7 --- boards/cuav/7-nano/src/hw_config.h | 3 - .../can-gps-v1/nuttx-config/scripts/script.ld | 2 - .../nuttx-config/scripts/bootloader_script.ld | 8 --- .../fmu-v6x/nuttx-config/scripts/script.ld | 7 --- boards/cuav/fmu-v6x/src/hw_config.h | 3 - .../nuttx-config/scripts/bootloader_script.ld | 8 --- .../cuav/nora/nuttx-config/scripts/script.ld | 8 --- boards/cuav/nora/src/hw_config.h | 3 - .../nuttx-config/scripts/bootloader_script.ld | 8 --- .../x25-evo/nuttx-config/scripts/script.ld | 7 --- boards/cuav/x25-evo/src/hw_config.h | 3 - .../nuttx-config/scripts/bootloader_script.ld | 8 --- .../x25-super/nuttx-config/scripts/script.ld | 7 --- boards/cuav/x25-super/src/hw_config.h | 3 - .../nuttx-config/scripts/bootloader_script.ld | 8 --- .../cuav/x7pro/nuttx-config/scripts/script.ld | 8 --- boards/cuav/x7pro/src/hw_config.h | 3 - .../nuttx-config/scripts/bootloader_script.ld | 8 --- .../cubeorange/nuttx-config/scripts/script.ld | 8 --- boards/cubepilot/cubeorange/src/hw_config.h | 3 - .../nuttx-config/scripts/bootloader_script.ld | 8 --- .../nuttx-config/scripts/script.ld | 8 --- .../cubepilot/cubeorangeplus/src/hw_config.h | 3 - .../cubeyellow/nuttx-config/scripts/script.ld | 8 --- .../nuttx-config/scripts/script.ld | 2 - .../nuttx-config/scripts/bootloader_script.ld | 8 --- .../nuttx-config/scripts/script.ld | 8 --- boards/gearup/airbrainh743/src/hw_config.h | 1 - .../nuttx-config/scripts/bootloader_script.ld | 8 --- .../nxt-dual/nuttx-config/scripts/script.ld | 8 --- boards/hkust/nxt-dual/src/hw_config.h | 3 - .../nuttx-config/scripts/bootloader_script.ld | 8 --- .../nxt-v1/nuttx-config/scripts/script.ld | 8 --- boards/hkust/nxt-v1/src/hw_config.h | 3 - .../can-gps-v1/nuttx-config/scripts/script.ld | 2 - .../nuttx-config/scripts/bootloader_script.ld | 8 --- .../nuttx-config/scripts/script.ld | 8 --- boards/holybro/durandal-v1/src/hw_config.h | 3 - .../h-flow/nuttx-config/scripts/script.ld | 2 - .../kakutef7/nuttx-config/scripts/script.ld | 8 --- .../nuttx-config/scripts/bootloader_script.ld | 8 --- .../nuttx-config/scripts/script.ld | 8 --- boards/holybro/kakuteh7-wing/src/hw_config.h | 3 - .../nuttx-config/scripts/bootloader_script.ld | 8 --- .../kakuteh7/nuttx-config/scripts/script.ld | 8 --- boards/holybro/kakuteh7/src/hw_config.h | 3 - .../nuttx-config/scripts/bootloader_script.ld | 8 --- .../nuttx-config/scripts/script.ld | 8 --- .../holybro/kakuteh7dualimu/src/hw_config.h | 3 - .../nuttx-config/scripts/bootloader_script.ld | 8 --- .../nuttx-config/scripts/script.ld | 8 --- boards/holybro/kakuteh7mini/src/hw_config.h | 3 - .../nuttx-config/scripts/bootloader_script.ld | 8 --- .../kakuteh7v2/nuttx-config/scripts/script.ld | 8 --- boards/holybro/kakuteh7v2/src/hw_config.h | 3 - .../pix32v5/nuttx-config/scripts/script.ld | 8 --- .../nuttx-config/scripts/script.ld | 2 - .../nuttx-config/scripts/bootloader_script.ld | 8 --- .../h743-mini/nuttx-config/scripts/script.ld | 8 --- boards/matek/h743-mini/src/hw_config.h | 3 - .../nuttx-config/scripts/bootloader_script.ld | 8 --- .../h743-slim/nuttx-config/scripts/script.ld | 8 --- boards/matek/h743-slim/src/hw_config.h | 3 - .../nuttx-config/scripts/bootloader_script.ld | 8 --- .../matek/h743/nuttx-config/scripts/script.ld | 8 --- boards/matek/h743/src/hw_config.h | 3 - .../nuttx-config/scripts/bootloader_script.ld | 8 --- .../h743-aio/nuttx-config/scripts/script.ld | 8 --- boards/micoair/h743-aio/src/hw_config.h | 3 - .../nuttx-config/scripts/bootloader_script.ld | 8 --- .../h743-lite/nuttx-config/scripts/script.ld | 8 --- boards/micoair/h743-lite/src/hw_config.h | 3 - .../nuttx-config/scripts/bootloader_script.ld | 8 --- .../h743-v2/nuttx-config/scripts/script.ld | 8 --- boards/micoair/h743-v2/src/hw_config.h | 3 - .../nuttx-config/scripts/bootloader_script.ld | 8 --- .../h743/nuttx-config/scripts/script.ld | 8 --- boards/micoair/h743/src/hw_config.h | 3 - .../fc-v1/nuttx-config/scripts/script.ld | 8 --- .../nuttx-config/scripts/bootloader_script.ld | 8 --- .../fc-v2/nuttx-config/scripts/script.ld | 7 --- boards/modalai/fc-v2/src/hw_config.h | 3 - .../nuttx-config/scripts/bootloader_script.ld | 8 --- .../nuttx-config/scripts/script.ld | 8 --- boards/mro/ctrl-zero-classic/src/hw_config.h | 3 - .../nuttx-config/scripts/script.ld | 8 --- .../nuttx-config/scripts/script.ld | 8 --- .../nuttx-config/scripts/bootloader_script.ld | 8 --- .../nuttx-config/scripts/script.ld | 8 --- boards/mro/ctrl-zero-h7-oem/src/hw_config.h | 3 - .../nuttx-config/scripts/bootloader_script.ld | 8 --- .../nuttx-config/scripts/script.ld | 8 --- boards/mro/ctrl-zero-h7/src/hw_config.h | 3 - .../nuttx-config/scripts/bootloader_script.ld | 8 --- .../nuttx-config/scripts/script.ld | 8 --- boards/mro/pixracerpro/src/hw_config.h | 3 - .../x21-777/nuttx-config/scripts/script.ld | 8 --- boards/mro/x21/nuttx-config/scripts/script.ld | 8 --- .../nuttx-config/scripts/bootloader_script.ld | 8 --- .../narinfc/h7/nuttx-config/scripts/script.ld | 8 --- boards/narinfc/h7/src/hw_config.h | 3 - .../nuttx-config/scripts/bootloader_script.ld | 8 --- .../mr-tropic/nuttx-config/scripts/script.ld | 8 --- boards/nxp/mr-tropic/src/hw_config.h | 3 - .../px4/fmu-v2/nuttx-config/scripts/script.ld | 8 --- .../px4/fmu-v3/nuttx-config/scripts/script.ld | 8 --- .../px4/fmu-v4/nuttx-config/scripts/script.ld | 8 --- .../fmu-v4pro/nuttx-config/scripts/script.ld | 7 --- .../nuttx-config/scripts/kernel-space.ld | 7 --- .../px4/fmu-v5/nuttx-config/scripts/script.ld | 7 --- .../fmu-v5x/nuttx-config/scripts/script.ld | 7 --- .../nuttx-config/scripts/bootloader_script.ld | 8 --- .../fmu-v6c/nuttx-config/scripts/script.ld | 7 --- boards/px4/fmu-v6c/src/hw_config.h | 3 - .../nuttx-config/scripts/bootloader_script.ld | 8 --- .../fmu-v6u/nuttx-config/scripts/script.ld | 7 --- boards/px4/fmu-v6u/src/hw_config.h | 3 - .../nuttx-config/scripts/bootloader_script.ld | 8 --- .../fmu-v6x/nuttx-config/scripts/script.ld | 7 --- boards/px4/fmu-v6x/src/hw_config.h | 3 - .../nuttx-config/scripts/allyes-script.ld | 7 --- .../nuttx-config/scripts/bootloader_script.ld | 8 --- .../fmu-v6xrt/nuttx-config/scripts/script.ld | 7 --- boards/px4/fmu-v6xrt/src/hw_config.h | 3 - .../PIX6/nuttx-config/scripts/kernel-space.ld | 7 --- .../PIX6/nuttx-config/scripts/script.ld | 8 --- .../nuttx-config/scripts/script.ld | 8 --- .../nuttx-config/scripts/bootloader_script.ld | 8 --- boards/siyi/n7/nuttx-config/scripts/script.ld | 7 --- boards/siyi/n7/src/hw_config.h | 3 - .../nuttx-config/scripts/script.ld | 7 --- .../h7extreme/nuttx-config/scripts/script.ld | 8 --- .../nuttx-config/scripts/bootloader_script.ld | 8 --- .../e2/nuttx-config/scripts/script.ld | 7 --- boards/svehicle/e2/src/hw_config.h | 3 - .../k1/nuttx-config/scripts/script.ld | 8 --- .../r1/nuttx-config/scripts/script.ld | 8 --- .../uvify/core/nuttx-config/scripts/script.ld | 8 --- .../nuttx-config/scripts/bootloader_script.ld | 8 --- .../ap-h743r1/nuttx-config/scripts/script.ld | 8 --- boards/x-mav/ap-h743r1/src/hw_config.h | 3 - .../nuttx-config/scripts/bootloader_script.ld | 8 --- .../ap-h743v2/nuttx-config/scripts/script.ld | 8 --- boards/x-mav/ap-h743v2/src/hw_config.h | 3 - .../nuttx-config/scripts/bootloader_script.ld | 8 --- .../zeroone/x6/nuttx-config/scripts/script.ld | 7 --- boards/zeroone/x6/src/hw_config.h | 3 - platforms/nuttx/src/bootloader/common/bl.c | 58 +++++-------------- platforms/nuttx/src/bootloader/common/bl.h | 6 -- .../nuttx/src/bootloader/common/image_toc.c | 20 ++++++- .../src/bootloader/nxp/imxrt_common/main.c | 27 --------- .../src/bootloader/stm/stm32_common/main.c | 27 --------- 196 files changed, 33 insertions(+), 1274 deletions(-) diff --git a/Tools/px4_uploader.py b/Tools/px4_uploader.py index 3b549507471..10814b2c267 100755 --- a/Tools/px4_uploader.py +++ b/Tools/px4_uploader.py @@ -198,7 +198,6 @@ class BootloaderCommand(IntEnum): GET_OTP = 0x2A # rev4+, get a word from OTP area GET_SN = 0x2B # rev4+, get a word from SN area GET_CHIP = 0x2C # rev5+, get chip version - SET_BOOT_DELAY = 0x2D # rev5+, set boot delay GET_CHIP_DES = 0x2E # rev5+, get chip description in ASCII GET_VERSION = 0x2F # rev5+, get bootloader version in ASCII REBOOT = 0x30 @@ -1148,20 +1147,6 @@ class BootloaderProtocol: else: self.verify_read(firmware, progress_callback) - def set_boot_delay(self, delay_ms: int) -> None: - """Set boot delay in flash (v5+). - - Args: - delay_ms: Boot delay in milliseconds - """ - if self.bl_rev < 5: - logger.warning("Boot delay requires bootloader v5+") - return - - self._send_command(BootloaderCommand.SET_BOOT_DELAY, struct.pack("b", delay_ms)) - self._get_sync() - logger.info(f"Boot delay set to {delay_ms}ms") - def reboot(self) -> None: """Reboot into the application. @@ -1569,7 +1554,6 @@ class UploaderConfig: baud_flightstack: list[int] = field(default_factory=lambda: [57600]) force: bool = False force_erase: bool = False - boot_delay: Optional[int] = None use_protocol_splitter: bool = False retry_count: int = 3 windowed: bool = False @@ -1924,10 +1908,6 @@ class Uploader: # Verify protocol.verify(firmware, progress_callback=progress.update_verify) - # Set boot delay if requested - if self.config.boot_delay is not None: - protocol.set_boot_delay(self.config.boot_delay) - # Reboot and show summary protocol.reboot() progress.finish() @@ -2009,9 +1989,6 @@ Examples: action="store_true", help="Force full chip erase (v6+ bootloader)", ) - parser.add_argument( - "--boot-delay", type=int, help="Boot delay in milliseconds to store in flash" - ) parser.add_argument( "--use-protocol-splitter-format", action="store_true", @@ -2068,7 +2045,6 @@ Examples: baud_flightstack=baud_flightstack, force=args.force, force_erase=args.force_erase, - boot_delay=args.boot_delay, use_protocol_splitter=args.use_protocol_splitter_format, windowed=args.windowed, noninteractive=args.noninteractive or args.noninteractive_json, diff --git a/Tools/teensy_uploader.py b/Tools/teensy_uploader.py index aad97135c3d..81b8fbae6a3 100644 --- a/Tools/teensy_uploader.py +++ b/Tools/teensy_uploader.py @@ -80,7 +80,6 @@ def main(): parser = argparse.ArgumentParser(description="Firmware uploader for the PX autopilot system.") parser.add_argument('--port', action="store", required=True, help="Comma-separated list of serial port(s) to which the FMU may be attached") parser.add_argument('--force', action='store_true', default=False, help='Override board type check, or silicon errata checks and continue loading') - parser.add_argument('--boot-delay', type=int, default=None, help='minimum boot delay to store in flash') parser.add_argument('--vendor-id', type=lambda x: int(x,0), default=None, help='PX4 USB vendorid') parser.add_argument('--product-id', type=lambda x: int(x,0), default=None, help='PX4 USB productid') parser.add_argument('firmware', action="store", nargs='+', help="Firmware file(s)") diff --git a/boards/3dr/ctrl-zero-h7-oem-revg/nuttx-config/scripts/bootloader_script.ld b/boards/3dr/ctrl-zero-h7-oem-revg/nuttx-config/scripts/bootloader_script.ld index 3fb4cc1f33c..bd3b8890f1b 100755 --- a/boards/3dr/ctrl-zero-h7-oem-revg/nuttx-config/scripts/bootloader_script.ld +++ b/boards/3dr/ctrl-zero-h7-oem-revg/nuttx-config/scripts/bootloader_script.ld @@ -130,20 +130,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/3dr/ctrl-zero-h7-oem-revg/nuttx-config/scripts/script.ld b/boards/3dr/ctrl-zero-h7-oem-revg/nuttx-config/scripts/script.ld index 02e763a790f..bb0aedb134c 100755 --- a/boards/3dr/ctrl-zero-h7-oem-revg/nuttx-config/scripts/script.ld +++ b/boards/3dr/ctrl-zero-h7-oem-revg/nuttx-config/scripts/script.ld @@ -131,20 +131,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/3dr/ctrl-zero-h7-oem-revg/src/hw_config.h b/boards/3dr/ctrl-zero-h7-oem-revg/src/hw_config.h index b212ccd6027..5633e11167c 100755 --- a/boards/3dr/ctrl-zero-h7-oem-revg/src/hw_config.h +++ b/boards/3dr/ctrl-zero-h7-oem-revg/src/hw_config.h @@ -53,8 +53,6 @@ * INTERFACE_USART 1 - (Optional) Scan and use the Serial interface for bootloading * USBDEVICESTRING "PX4 BL FMU v2.x" - USB id string * USBPRODUCTID 0x0011 - PID Should match defconfig - * BOOT_DELAY_ADDRESS 0x000001a0 - (Optional) From the linker script from Linker Script to get a custom - * delay provided by an APP FW * BOARD_TYPE 9 - Must match .prototype boad_id * _FLASH_KBYTES (*(uint16_t *)0x1fff7a22) - Run time flash size detection * BOARD_FLASH_SECTORS ((_FLASH_KBYTES == 0x400) ? 11 : 23) - Run time determine the physical last sector @@ -95,7 +93,6 @@ //#define USE_VBUS_PULL_DOWN #define INTERFACE_USART 1 #define INTERFACE_USART_CONFIG "/dev/ttyS0,115200" -#define BOOT_DELAY_ADDRESS 0x000001a0 #define BOARD_TYPE 1124 #define _FLASH_KBYTES (*(uint32_t *)0x1FF1E880) #define BOARD_FLASH_SECTORS (15) diff --git a/boards/accton-godwit/ga1/nuttx-config/scripts/bootloader_script.ld b/boards/accton-godwit/ga1/nuttx-config/scripts/bootloader_script.ld index 2e6eba3607b..293b6cccece 100644 --- a/boards/accton-godwit/ga1/nuttx-config/scripts/bootloader_script.ld +++ b/boards/accton-godwit/ga1/nuttx-config/scripts/bootloader_script.ld @@ -132,20 +132,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/accton-godwit/ga1/nuttx-config/scripts/script.ld b/boards/accton-godwit/ga1/nuttx-config/scripts/script.ld index b6b341d4e84..32d7cf662ab 100644 --- a/boards/accton-godwit/ga1/nuttx-config/scripts/script.ld +++ b/boards/accton-godwit/ga1/nuttx-config/scripts/script.ld @@ -131,7 +131,6 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) EXTERN(board_get_manifest) SECTIONS @@ -140,12 +139,6 @@ SECTIONS _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/accton-godwit/ga1/src/hw_config.h b/boards/accton-godwit/ga1/src/hw_config.h index a2bdf7398cf..98de3dcc2c6 100644 --- a/boards/accton-godwit/ga1/src/hw_config.h +++ b/boards/accton-godwit/ga1/src/hw_config.h @@ -28,8 +28,6 @@ * INTERFACE_USART 1 - (Optional) Scan and use the Serial interface for bootloading * USBDEVICESTRING "PX4 BL FMU v2.x" - USB id string * USBPRODUCTID 0x0011 - PID Should match defconfig - * BOOT_DELAY_ADDRESS 0x000001a0 - (Optional) From the linker script from Linker Script to get a custom - * delay provided by an APP FW * BOARD_TYPE 9 - Must match .prototype boad_id * _FLASH_KBYTES (*(uint16_t *)0x1fff7a22) - Run time flash size detection * BOARD_FLASH_SECTORS ((_FLASH_KBYTES == 0x400) ? 11 : 23) - Run time determine the physical last sector @@ -70,7 +68,6 @@ //#define USE_VBUS_PULL_DOWN #define INTERFACE_USART 1 #define INTERFACE_USART_CONFIG "/dev/ttyS0,1500000" -#define BOOT_DELAY_ADDRESS 0x000001a0 #define BOARD_TYPE 7120 #define _FLASH_KBYTES (*(uint32_t *)0x1FF1E880) #define BOARD_FLASH_SECTORS (15) diff --git a/boards/airmind/mindpx-v2/nuttx-config/scripts/script.ld b/boards/airmind/mindpx-v2/nuttx-config/scripts/script.ld index 6d92733df88..cf3e2bcd203 100644 --- a/boards/airmind/mindpx-v2/nuttx-config/scripts/script.ld +++ b/boards/airmind/mindpx-v2/nuttx-config/scripts/script.ld @@ -65,20 +65,12 @@ EXTERN(_vectors) /* force the vectors to be included in the output */ * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/ark/can-flow-mr/nuttx-config/scripts/script.ld b/boards/ark/can-flow-mr/nuttx-config/scripts/script.ld index 2f4769b8f5b..77322893e35 100644 --- a/boards/ark/can-flow-mr/nuttx-config/scripts/script.ld +++ b/boards/ark/can-flow-mr/nuttx-config/scripts/script.ld @@ -64,8 +64,6 @@ EXTERN(_vectors) /* force the vectors to be included in the output */ * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { diff --git a/boards/ark/can-flow/nuttx-config/scripts/script.ld b/boards/ark/can-flow/nuttx-config/scripts/script.ld index c63c7499419..17a892f885c 100644 --- a/boards/ark/can-flow/nuttx-config/scripts/script.ld +++ b/boards/ark/can-flow/nuttx-config/scripts/script.ld @@ -64,8 +64,6 @@ EXTERN(_vectors) /* force the vectors to be included in the output */ * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { diff --git a/boards/ark/can-gps/nuttx-config/scripts/script.ld b/boards/ark/can-gps/nuttx-config/scripts/script.ld index c63c7499419..17a892f885c 100644 --- a/boards/ark/can-gps/nuttx-config/scripts/script.ld +++ b/boards/ark/can-gps/nuttx-config/scripts/script.ld @@ -64,8 +64,6 @@ EXTERN(_vectors) /* force the vectors to be included in the output */ * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { diff --git a/boards/ark/can-rtk-gps/nuttx-config/scripts/script.ld b/boards/ark/can-rtk-gps/nuttx-config/scripts/script.ld index c63c7499419..17a892f885c 100644 --- a/boards/ark/can-rtk-gps/nuttx-config/scripts/script.ld +++ b/boards/ark/can-rtk-gps/nuttx-config/scripts/script.ld @@ -64,8 +64,6 @@ EXTERN(_vectors) /* force the vectors to be included in the output */ * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { diff --git a/boards/ark/cannode/nuttx-config/scripts/script.ld b/boards/ark/cannode/nuttx-config/scripts/script.ld index daf33d4b97b..69d99d59bac 100644 --- a/boards/ark/cannode/nuttx-config/scripts/script.ld +++ b/boards/ark/cannode/nuttx-config/scripts/script.ld @@ -64,8 +64,6 @@ EXTERN(_vectors) /* force the vectors to be included in the output */ * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { diff --git a/boards/ark/dist/nuttx-config/scripts/script.ld b/boards/ark/dist/nuttx-config/scripts/script.ld index 2f4769b8f5b..77322893e35 100644 --- a/boards/ark/dist/nuttx-config/scripts/script.ld +++ b/boards/ark/dist/nuttx-config/scripts/script.ld @@ -64,8 +64,6 @@ EXTERN(_vectors) /* force the vectors to be included in the output */ * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { diff --git a/boards/ark/f9p-gps/nuttx-config/scripts/script.ld b/boards/ark/f9p-gps/nuttx-config/scripts/script.ld index 2f4769b8f5b..77322893e35 100644 --- a/boards/ark/f9p-gps/nuttx-config/scripts/script.ld +++ b/boards/ark/f9p-gps/nuttx-config/scripts/script.ld @@ -64,8 +64,6 @@ EXTERN(_vectors) /* force the vectors to be included in the output */ * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { diff --git a/boards/ark/fmu-v6x/nuttx-config/scripts/bootloader_script.ld b/boards/ark/fmu-v6x/nuttx-config/scripts/bootloader_script.ld index 5b1bb4cb056..30444b56027 100644 --- a/boards/ark/fmu-v6x/nuttx-config/scripts/bootloader_script.ld +++ b/boards/ark/fmu-v6x/nuttx-config/scripts/bootloader_script.ld @@ -132,20 +132,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/ark/fmu-v6x/nuttx-config/scripts/script.ld b/boards/ark/fmu-v6x/nuttx-config/scripts/script.ld index d06a7d7aa7e..5809b3bec26 100644 --- a/boards/ark/fmu-v6x/nuttx-config/scripts/script.ld +++ b/boards/ark/fmu-v6x/nuttx-config/scripts/script.ld @@ -131,7 +131,6 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) EXTERN(board_get_manifest) SECTIONS @@ -140,12 +139,6 @@ SECTIONS _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/ark/fmu-v6x/src/hw_config.h b/boards/ark/fmu-v6x/src/hw_config.h index 3a0205c87bf..6875e7f8b03 100644 --- a/boards/ark/fmu-v6x/src/hw_config.h +++ b/boards/ark/fmu-v6x/src/hw_config.h @@ -28,8 +28,6 @@ * INTERFACE_USART 1 - (Optional) Scan and use the Serial interface for bootloading * USBDEVICESTRING "PX4 BL FMU v2.x" - USB id string * USBPRODUCTID 0x0011 - PID Should match defconfig - * BOOT_DELAY_ADDRESS 0x000001a0 - (Optional) From the linker script from Linker Script to get a custom - * delay provided by an APP FW * BOARD_TYPE 9 - Must match .prototype boad_id * _FLASH_KBYTES (*(uint16_t *)0x1fff7a22) - Run time flash size detection * BOARD_FLASH_SECTORS ((_FLASH_KBYTES == 0x400) ? 11 : 23) - Run time determine the physical last sector @@ -70,7 +68,6 @@ //#define USE_VBUS_PULL_DOWN #define INTERFACE_USART 1 #define INTERFACE_USART_CONFIG "/dev/ttyS0,115200" -#define BOOT_DELAY_ADDRESS 0x000001a0 #define BOARD_TYPE 57 #define _FLASH_KBYTES (*(uint32_t *)0x1FF1E880) #define BOARD_FLASH_SECTORS (15) diff --git a/boards/ark/fpv/nuttx-config/scripts/bootloader_script.ld b/boards/ark/fpv/nuttx-config/scripts/bootloader_script.ld index b0515c91c7f..4000b99f4a3 100644 --- a/boards/ark/fpv/nuttx-config/scripts/bootloader_script.ld +++ b/boards/ark/fpv/nuttx-config/scripts/bootloader_script.ld @@ -132,20 +132,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/ark/fpv/nuttx-config/scripts/script.ld b/boards/ark/fpv/nuttx-config/scripts/script.ld index 8e6dca3e494..9dd8cef679a 100644 --- a/boards/ark/fpv/nuttx-config/scripts/script.ld +++ b/boards/ark/fpv/nuttx-config/scripts/script.ld @@ -131,7 +131,6 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) EXTERN(board_get_manifest) SECTIONS @@ -140,12 +139,6 @@ SECTIONS _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/ark/fpv/src/hw_config.h b/boards/ark/fpv/src/hw_config.h index f677802289e..8a08be111d0 100644 --- a/boards/ark/fpv/src/hw_config.h +++ b/boards/ark/fpv/src/hw_config.h @@ -28,8 +28,6 @@ * INTERFACE_USART 1 - (Optional) Scan and use the Serial interface for bootloading * USBDEVICESTRING "PX4 BL FMU v2.x" - USB id string * USBPRODUCTID 0x0011 - PID Should match defconfig - * BOOT_DELAY_ADDRESS 0x000001a0 - (Optional) From the linker script from Linker Script to get a custom - * delay provided by an APP FW * BOARD_TYPE 9 - Must match .prototype boad_id * _FLASH_KBYTES (*(uint16_t *)0x1fff7a22) - Run time flash size detection * BOARD_FLASH_SECTORS ((_FLASH_KBYTES == 0x400) ? 11 : 23) - Run time determine the physical last sector @@ -70,7 +68,6 @@ //#define USE_VBUS_PULL_DOWN #define INTERFACE_USART 1 #define INTERFACE_USART_CONFIG "/dev/ttyS0,921600" -#define BOOT_DELAY_ADDRESS 0x000001a0 #define BOARD_TYPE 59 #define _FLASH_KBYTES (*(uint32_t *)0x1FF1E880) #define BOARD_FLASH_SECTORS (14) diff --git a/boards/ark/mag/nuttx-config/scripts/script.ld b/boards/ark/mag/nuttx-config/scripts/script.ld index 2f4769b8f5b..77322893e35 100644 --- a/boards/ark/mag/nuttx-config/scripts/script.ld +++ b/boards/ark/mag/nuttx-config/scripts/script.ld @@ -64,8 +64,6 @@ EXTERN(_vectors) /* force the vectors to be included in the output */ * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { diff --git a/boards/ark/pi6x/nuttx-config/scripts/bootloader_script.ld b/boards/ark/pi6x/nuttx-config/scripts/bootloader_script.ld index b0515c91c7f..4000b99f4a3 100644 --- a/boards/ark/pi6x/nuttx-config/scripts/bootloader_script.ld +++ b/boards/ark/pi6x/nuttx-config/scripts/bootloader_script.ld @@ -132,20 +132,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/ark/pi6x/nuttx-config/scripts/script.ld b/boards/ark/pi6x/nuttx-config/scripts/script.ld index 8e6dca3e494..9dd8cef679a 100644 --- a/boards/ark/pi6x/nuttx-config/scripts/script.ld +++ b/boards/ark/pi6x/nuttx-config/scripts/script.ld @@ -131,7 +131,6 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) EXTERN(board_get_manifest) SECTIONS @@ -140,12 +139,6 @@ SECTIONS _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/ark/pi6x/src/hw_config.h b/boards/ark/pi6x/src/hw_config.h index 52c70ec748d..ae542c72670 100644 --- a/boards/ark/pi6x/src/hw_config.h +++ b/boards/ark/pi6x/src/hw_config.h @@ -28,8 +28,6 @@ * INTERFACE_USART 1 - (Optional) Scan and use the Serial interface for bootloading * USBDEVICESTRING "PX4 BL FMU v2.x" - USB id string * USBPRODUCTID 0x0011 - PID Should match defconfig - * BOOT_DELAY_ADDRESS 0x000001a0 - (Optional) From the linker script from Linker Script to get a custom - * delay provided by an APP FW * BOARD_TYPE 9 - Must match .prototype boad_id * _FLASH_KBYTES (*(uint16_t *)0x1fff7a22) - Run time flash size detection * BOARD_FLASH_SECTORS ((_FLASH_KBYTES == 0x400) ? 11 : 23) - Run time determine the physical last sector @@ -70,7 +68,6 @@ //#define USE_VBUS_PULL_DOWN #define INTERFACE_USART 1 #define INTERFACE_USART_CONFIG "/dev/ttyS5,921600" -#define BOOT_DELAY_ADDRESS 0x000001a0 #define BOARD_TYPE 58 #define _FLASH_KBYTES (*(uint32_t *)0x1FF1E880) #define BOARD_FLASH_SECTORS (14) diff --git a/boards/ark/septentrio-gps/nuttx-config/scripts/script.ld b/boards/ark/septentrio-gps/nuttx-config/scripts/script.ld index 2f4769b8f5b..77322893e35 100644 --- a/boards/ark/septentrio-gps/nuttx-config/scripts/script.ld +++ b/boards/ark/septentrio-gps/nuttx-config/scripts/script.ld @@ -64,8 +64,6 @@ EXTERN(_vectors) /* force the vectors to be included in the output */ * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { diff --git a/boards/ark/teseo-gps/nuttx-config/scripts/script.ld b/boards/ark/teseo-gps/nuttx-config/scripts/script.ld index 2f4769b8f5b..77322893e35 100644 --- a/boards/ark/teseo-gps/nuttx-config/scripts/script.ld +++ b/boards/ark/teseo-gps/nuttx-config/scripts/script.ld @@ -64,8 +64,6 @@ EXTERN(_vectors) /* force the vectors to be included in the output */ * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { diff --git a/boards/ark/x20-gps/nuttx-config/scripts/script.ld b/boards/ark/x20-gps/nuttx-config/scripts/script.ld index 2f4769b8f5b..77322893e35 100644 --- a/boards/ark/x20-gps/nuttx-config/scripts/script.ld +++ b/boards/ark/x20-gps/nuttx-config/scripts/script.ld @@ -64,8 +64,6 @@ EXTERN(_vectors) /* force the vectors to be included in the output */ * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { diff --git a/boards/atl/mantis-edu/nuttx-config/scripts/script.ld b/boards/atl/mantis-edu/nuttx-config/scripts/script.ld index fc70ef1de83..342fea76780 100644 --- a/boards/atl/mantis-edu/nuttx-config/scripts/script.ld +++ b/boards/atl/mantis-edu/nuttx-config/scripts/script.ld @@ -90,7 +90,6 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) EXTERN(_main_toc) SECTIONS @@ -99,12 +98,6 @@ SECTIONS _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xb4ecc2925d7d05c5) - . += 8; *(.main_toc) *(.text .text.*) *(.fixup) diff --git a/boards/auterion/fmu-v6s/nuttx-config/scripts/bootloader_script.ld b/boards/auterion/fmu-v6s/nuttx-config/scripts/bootloader_script.ld index 706140b4661..2078b0e969a 100644 --- a/boards/auterion/fmu-v6s/nuttx-config/scripts/bootloader_script.ld +++ b/boards/auterion/fmu-v6s/nuttx-config/scripts/bootloader_script.ld @@ -132,20 +132,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/auterion/fmu-v6s/nuttx-config/scripts/script.ld b/boards/auterion/fmu-v6s/nuttx-config/scripts/script.ld index 89c8913ddf5..d665df024f3 100644 --- a/boards/auterion/fmu-v6s/nuttx-config/scripts/script.ld +++ b/boards/auterion/fmu-v6s/nuttx-config/scripts/script.ld @@ -131,7 +131,6 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) EXTERN(board_get_manifest) SECTIONS @@ -140,12 +139,6 @@ SECTIONS _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/auterion/fmu-v6s/src/hw_config.h b/boards/auterion/fmu-v6s/src/hw_config.h index 5979d95fb6d..62cf19440bd 100644 --- a/boards/auterion/fmu-v6s/src/hw_config.h +++ b/boards/auterion/fmu-v6s/src/hw_config.h @@ -28,8 +28,6 @@ * INTERFACE_USART 1 - (Optional) Scan and use the Serial interface for bootloading * USBDEVICESTRING "PX4 BL FMU v2.x" - USB id string * USBPRODUCTID 0x0011 - PID Should match defconfig - * BOOT_DELAY_ADDRESS 0x000001a0 - (Optional) From the linker script from Linker Script to get a custom - * delay provided by an APP FW * BOARD_TYPE 9 - Must match .prototype boad_id * _FLASH_KBYTES (*(uint16_t *)0x1fff7a22) - Run time flash size detection * BOARD_FLASH_SECTORS ((_FLASH_KBYTES == 0x400) ? 11 : 23) - Run time determine the physical last sector @@ -64,7 +62,6 @@ #define INTERFACE_USB 0 #define INTERFACE_USART 1 #define INTERFACE_USART_CONFIG "/dev/ttyS0,1500000" -#define BOOT_DELAY_ADDRESS 0x000001a0 #define BOARD_TYPE 60 #define _FLASH_KBYTES (*(uint32_t *)0x1FF1E880) #define BOARD_FLASH_SECTORS (15) diff --git a/boards/auterion/fmu-v6x/nuttx-config/scripts/bootloader_script.ld b/boards/auterion/fmu-v6x/nuttx-config/scripts/bootloader_script.ld index 037356efd3b..a325dafc1f8 100644 --- a/boards/auterion/fmu-v6x/nuttx-config/scripts/bootloader_script.ld +++ b/boards/auterion/fmu-v6x/nuttx-config/scripts/bootloader_script.ld @@ -132,20 +132,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/auterion/fmu-v6x/nuttx-config/scripts/script.ld b/boards/auterion/fmu-v6x/nuttx-config/scripts/script.ld index 860eb2ddd96..60718994cb1 100644 --- a/boards/auterion/fmu-v6x/nuttx-config/scripts/script.ld +++ b/boards/auterion/fmu-v6x/nuttx-config/scripts/script.ld @@ -131,7 +131,6 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) EXTERN(board_get_manifest) SECTIONS @@ -140,12 +139,6 @@ SECTIONS _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/auterion/fmu-v6x/src/hw_config.h b/boards/auterion/fmu-v6x/src/hw_config.h index 949a9284a5b..8bff7112acc 100644 --- a/boards/auterion/fmu-v6x/src/hw_config.h +++ b/boards/auterion/fmu-v6x/src/hw_config.h @@ -28,8 +28,6 @@ * INTERFACE_USART 1 - (Optional) Scan and use the Serial interface for bootloading * USBDEVICESTRING "PX4 BL FMU v2.x" - USB id string * USBPRODUCTID 0x0011 - PID Should match defconfig - * BOOT_DELAY_ADDRESS 0x000001a0 - (Optional) From the linker script from Linker Script to get a custom - * delay provided by an APP FW * BOARD_TYPE 9 - Must match .prototype boad_id * _FLASH_KBYTES (*(uint16_t *)0x1fff7a22) - Run time flash size detection * BOARD_FLASH_SECTORS ((_FLASH_KBYTES == 0x400) ? 11 : 23) - Run time determine the physical last sector @@ -65,7 +63,6 @@ #define INTERFACE_USB 0 #define INTERFACE_USART 1 #define INTERFACE_USART_CONFIG "/dev/ttyS0,1500000" -#define BOOT_DELAY_ADDRESS 0x000001a0 #define BOARD_TYPE 53 #define _FLASH_KBYTES (*(uint32_t *)0x1FF1E880) #define BOARD_FLASH_SECTORS (15) diff --git a/boards/av/x-v1/nuttx-config/scripts/script.ld b/boards/av/x-v1/nuttx-config/scripts/script.ld index db0f740cf00..b9a2dce0cc5 100644 --- a/boards/av/x-v1/nuttx-config/scripts/script.ld +++ b/boards/av/x-v1/nuttx-config/scripts/script.ld @@ -89,20 +89,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/bitcraze/crazyflie/nuttx-config/scripts/script.ld b/boards/bitcraze/crazyflie/nuttx-config/scripts/script.ld index 0c6b6693c87..ab7b7a85d55 100644 --- a/boards/bitcraze/crazyflie/nuttx-config/scripts/script.ld +++ b/boards/bitcraze/crazyflie/nuttx-config/scripts/script.ld @@ -72,12 +72,6 @@ SECTIONS _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/bitcraze/crazyflie21/nuttx-config/scripts/script.ld b/boards/bitcraze/crazyflie21/nuttx-config/scripts/script.ld index 178b10ae356..94faeff178f 100644 --- a/boards/bitcraze/crazyflie21/nuttx-config/scripts/script.ld +++ b/boards/bitcraze/crazyflie21/nuttx-config/scripts/script.ld @@ -71,12 +71,6 @@ SECTIONS _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/corvon/743v1/nuttx-config/scripts/bootloader_script.ld b/boards/corvon/743v1/nuttx-config/scripts/bootloader_script.ld index fb877cc443f..fcf84a4c60e 100644 --- a/boards/corvon/743v1/nuttx-config/scripts/bootloader_script.ld +++ b/boards/corvon/743v1/nuttx-config/scripts/bootloader_script.ld @@ -130,20 +130,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/corvon/743v1/nuttx-config/scripts/script.ld b/boards/corvon/743v1/nuttx-config/scripts/script.ld index 1dc1a0ef97e..3686e2d66ec 100644 --- a/boards/corvon/743v1/nuttx-config/scripts/script.ld +++ b/boards/corvon/743v1/nuttx-config/scripts/script.ld @@ -131,20 +131,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/corvon/743v1/src/hw_config.h b/boards/corvon/743v1/src/hw_config.h index bd463227782..64caafa45db 100644 --- a/boards/corvon/743v1/src/hw_config.h +++ b/boards/corvon/743v1/src/hw_config.h @@ -53,8 +53,6 @@ * INTERFACE_USART 1 - (Optional) Scan and use the Serial interface for bootloading * USBDEVICESTRING "PX4 BL FMU v2.x" - USB id string * USBPRODUCTID 0x0011 - PID Should match defconfig - * BOOT_DELAY_ADDRESS 0x000001a0 - (Optional) From the linker script from Linker Script to get a custom - * delay provided by an APP FW * BOARD_TYPE 9 - Must match .prototype boad_id * _FLASH_KBYTES (*(uint16_t *)0x1fff7a22) - Run time flash size detection * BOARD_FLASH_SECTORS ((_FLASH_KBYTES == 0x400) ? 11 : 23) - Run time determine the physical last sector @@ -95,7 +93,6 @@ //#define USE_VBUS_PULL_DOWN #define INTERFACE_USART 1 #define INTERFACE_USART_CONFIG "/dev/ttyS0,115200" -#define BOOT_DELAY_ADDRESS 0x000001a0 #define BOARD_TYPE 1189 #define BOARD_FLASH_SECTORS (14) #define BOARD_FLASH_SIZE (16 * 128 * 1024) diff --git a/boards/cuav/7-nano/nuttx-config/scripts/bootloader_script.ld b/boards/cuav/7-nano/nuttx-config/scripts/bootloader_script.ld index 7ce63598b5a..e5d9986f6e4 100644 --- a/boards/cuav/7-nano/nuttx-config/scripts/bootloader_script.ld +++ b/boards/cuav/7-nano/nuttx-config/scripts/bootloader_script.ld @@ -132,20 +132,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/cuav/7-nano/nuttx-config/scripts/script.ld b/boards/cuav/7-nano/nuttx-config/scripts/script.ld index 9b50b4b397a..3889da035d1 100644 --- a/boards/cuav/7-nano/nuttx-config/scripts/script.ld +++ b/boards/cuav/7-nano/nuttx-config/scripts/script.ld @@ -131,7 +131,6 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) EXTERN(board_get_manifest) SECTIONS @@ -140,12 +139,6 @@ SECTIONS _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/cuav/7-nano/src/hw_config.h b/boards/cuav/7-nano/src/hw_config.h index a3ee52dea72..cff5b2c3fe3 100644 --- a/boards/cuav/7-nano/src/hw_config.h +++ b/boards/cuav/7-nano/src/hw_config.h @@ -28,8 +28,6 @@ * INTERFACE_USART 1 - (Optional) Scan and use the Serial interface for bootloading * USBDEVICESTRING "PX4 BL FMU v2.x" - USB id string * USBPRODUCTID 0x0011 - PID Should match defconfig - * BOOT_DELAY_ADDRESS 0x000001a0 - (Optional) From the linker script from Linker Script to get a custom - * delay provided by an APP FW * BOARD_TYPE 9 - Must match .prototype boad_id * _FLASH_KBYTES (*(uint16_t *)0x1fff7a22) - Run time flash size detection * BOARD_FLASH_SECTORS ((_FLASH_KBYTES == 0x400) ? 11 : 23) - Run time determine the physical last sector @@ -70,7 +68,6 @@ //#define USE_VBUS_PULL_DOWN #define INTERFACE_USART 1 #define INTERFACE_USART_CONFIG "/dev/ttyS0,1500000" -#define BOOT_DELAY_ADDRESS 0x000001a0 #define BOARD_TYPE 7000 #define _FLASH_KBYTES (*(uint32_t *)0x1FF1E880) #define BOARD_FLASH_SECTORS (15) diff --git a/boards/cuav/can-gps-v1/nuttx-config/scripts/script.ld b/boards/cuav/can-gps-v1/nuttx-config/scripts/script.ld index 4e866c5acf3..07b9ecfb830 100644 --- a/boards/cuav/can-gps-v1/nuttx-config/scripts/script.ld +++ b/boards/cuav/can-gps-v1/nuttx-config/scripts/script.ld @@ -65,8 +65,6 @@ EXTERN(_vectors) /* force the vectors to be included in the output */ * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { diff --git a/boards/cuav/fmu-v6x/nuttx-config/scripts/bootloader_script.ld b/boards/cuav/fmu-v6x/nuttx-config/scripts/bootloader_script.ld index 44844638602..f8740dab3f3 100644 --- a/boards/cuav/fmu-v6x/nuttx-config/scripts/bootloader_script.ld +++ b/boards/cuav/fmu-v6x/nuttx-config/scripts/bootloader_script.ld @@ -132,20 +132,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/cuav/fmu-v6x/nuttx-config/scripts/script.ld b/boards/cuav/fmu-v6x/nuttx-config/scripts/script.ld index 57909007089..3646ce2b4b3 100644 --- a/boards/cuav/fmu-v6x/nuttx-config/scripts/script.ld +++ b/boards/cuav/fmu-v6x/nuttx-config/scripts/script.ld @@ -131,7 +131,6 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) EXTERN(board_get_manifest) SECTIONS @@ -140,12 +139,6 @@ SECTIONS _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/cuav/fmu-v6x/src/hw_config.h b/boards/cuav/fmu-v6x/src/hw_config.h index 1f9c4d46598..cac2da02672 100644 --- a/boards/cuav/fmu-v6x/src/hw_config.h +++ b/boards/cuav/fmu-v6x/src/hw_config.h @@ -28,8 +28,6 @@ * INTERFACE_USART 1 - (Optional) Scan and use the Serial interface for bootloading * USBDEVICESTRING "PX4 BL FMU v2.x" - USB id string * USBPRODUCTID 0x0011 - PID Should match defconfig - * BOOT_DELAY_ADDRESS 0x000001a0 - (Optional) From the linker script from Linker Script to get a custom - * delay provided by an APP FW * BOARD_TYPE 9 - Must match .prototype boad_id * _FLASH_KBYTES (*(uint16_t *)0x1fff7a22) - Run time flash size detection * BOARD_FLASH_SECTORS ((_FLASH_KBYTES == 0x400) ? 11 : 23) - Run time determine the physical last sector @@ -70,7 +68,6 @@ //#define USE_VBUS_PULL_DOWN #define INTERFACE_USART 1 #define INTERFACE_USART_CONFIG "/dev/ttyS0,1500000" -#define BOOT_DELAY_ADDRESS 0x000001a0 #define BOARD_TYPE 7001 #define _FLASH_KBYTES (*(uint32_t *)0x1FF1E880) #define BOARD_FLASH_SECTORS (15) diff --git a/boards/cuav/nora/nuttx-config/scripts/bootloader_script.ld b/boards/cuav/nora/nuttx-config/scripts/bootloader_script.ld index c2eba58f26c..ed55056e974 100644 --- a/boards/cuav/nora/nuttx-config/scripts/bootloader_script.ld +++ b/boards/cuav/nora/nuttx-config/scripts/bootloader_script.ld @@ -132,20 +132,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/cuav/nora/nuttx-config/scripts/script.ld b/boards/cuav/nora/nuttx-config/scripts/script.ld index f213ad2ff42..dbda50503d1 100644 --- a/boards/cuav/nora/nuttx-config/scripts/script.ld +++ b/boards/cuav/nora/nuttx-config/scripts/script.ld @@ -131,20 +131,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/cuav/nora/src/hw_config.h b/boards/cuav/nora/src/hw_config.h index 4a1fca54470..9f322dee71b 100644 --- a/boards/cuav/nora/src/hw_config.h +++ b/boards/cuav/nora/src/hw_config.h @@ -53,8 +53,6 @@ * INTERFACE_USART 1 - (Optional) Scan and use the Serial interface for bootloading * USBDEVICESTRING "PX4 BL FMU v2.x" - USB id string * USBPRODUCTID 0x0011 - PID Should match defconfig - * BOOT_DELAY_ADDRESS 0x000001a0 - (Optional) From the linker script from Linker Script to get a custom - * delay provided by an APP FW * BOARD_TYPE 9 - Must match .prototype boad_id * _FLASH_KBYTES (*(uint16_t *)0x1fff7a22) - Run time flash size detection * BOARD_FLASH_SECTORS ((_FLASH_KBYTES == 0x400) ? 11 : 23) - Run time determine the physical last sector @@ -95,7 +93,6 @@ //#define USE_VBUS_PULL_DOWN #define INTERFACE_USART 1 #define INTERFACE_USART_CONFIG "/dev/ttyS4,57600" -#define BOOT_DELAY_ADDRESS 0x000001a0 #define BOARD_TYPE 1009 #define _FLASH_KBYTES (*(uint32_t *)0x1FF1E880) #define BOARD_FLASH_SECTORS (15) diff --git a/boards/cuav/x25-evo/nuttx-config/scripts/bootloader_script.ld b/boards/cuav/x25-evo/nuttx-config/scripts/bootloader_script.ld index 44844638602..f8740dab3f3 100644 --- a/boards/cuav/x25-evo/nuttx-config/scripts/bootloader_script.ld +++ b/boards/cuav/x25-evo/nuttx-config/scripts/bootloader_script.ld @@ -132,20 +132,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/cuav/x25-evo/nuttx-config/scripts/script.ld b/boards/cuav/x25-evo/nuttx-config/scripts/script.ld index 57909007089..3646ce2b4b3 100644 --- a/boards/cuav/x25-evo/nuttx-config/scripts/script.ld +++ b/boards/cuav/x25-evo/nuttx-config/scripts/script.ld @@ -131,7 +131,6 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) EXTERN(board_get_manifest) SECTIONS @@ -140,12 +139,6 @@ SECTIONS _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/cuav/x25-evo/src/hw_config.h b/boards/cuav/x25-evo/src/hw_config.h index 3703686f0b9..825aab65ec9 100644 --- a/boards/cuav/x25-evo/src/hw_config.h +++ b/boards/cuav/x25-evo/src/hw_config.h @@ -28,8 +28,6 @@ * INTERFACE_USART 1 - (Optional) Scan and use the Serial interface for bootloading * USBDEVICESTRING "PX4 BL FMU v2.x" - USB id string * USBPRODUCTID 0x0011 - PID Should match defconfig - * BOOT_DELAY_ADDRESS 0x000001a0 - (Optional) From the linker script from Linker Script to get a custom - * delay provided by an APP FW * BOARD_TYPE 9 - Must match .prototype boad_id * _FLASH_KBYTES (*(uint16_t *)0x1fff7a22) - Run time flash size detection * BOARD_FLASH_SECTORS ((_FLASH_KBYTES == 0x400) ? 11 : 23) - Run time determine the physical last sector @@ -70,7 +68,6 @@ //#define USE_VBUS_PULL_DOWN #define INTERFACE_USART 1 #define INTERFACE_USART_CONFIG "/dev/ttyS0,1500000" -#define BOOT_DELAY_ADDRESS 0x000001a0 #define BOARD_TYPE 7002 #define _FLASH_KBYTES (*(uint32_t *)0x1FF1E880) #define BOARD_FLASH_SECTORS (15) diff --git a/boards/cuav/x25-super/nuttx-config/scripts/bootloader_script.ld b/boards/cuav/x25-super/nuttx-config/scripts/bootloader_script.ld index cbef5dc6502..c7299bd13cb 100644 --- a/boards/cuav/x25-super/nuttx-config/scripts/bootloader_script.ld +++ b/boards/cuav/x25-super/nuttx-config/scripts/bootloader_script.ld @@ -132,20 +132,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/cuav/x25-super/nuttx-config/scripts/script.ld b/boards/cuav/x25-super/nuttx-config/scripts/script.ld index 50fb8f85535..804a7e97c75 100644 --- a/boards/cuav/x25-super/nuttx-config/scripts/script.ld +++ b/boards/cuav/x25-super/nuttx-config/scripts/script.ld @@ -131,7 +131,6 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) EXTERN(board_get_manifest) SECTIONS @@ -140,12 +139,6 @@ SECTIONS _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/cuav/x25-super/src/hw_config.h b/boards/cuav/x25-super/src/hw_config.h index ba1f8684b81..a9505b38036 100644 --- a/boards/cuav/x25-super/src/hw_config.h +++ b/boards/cuav/x25-super/src/hw_config.h @@ -28,8 +28,6 @@ * INTERFACE_USART 1 - (Optional) Scan and use the Serial interface for bootloading * USBDEVICESTRING "PX4 BL FMU v2.x" - USB id string * USBPRODUCTID 0x0011 - PID Should match defconfig - * BOOT_DELAY_ADDRESS 0x000001a0 - (Optional) From the linker script from Linker Script to get a custom - * delay provided by an APP FW * BOARD_TYPE 9 - Must match .prototype boad_id * _FLASH_KBYTES (*(uint16_t *)0x1fff7a22) - Run time flash size detection * BOARD_FLASH_SECTORS ((_FLASH_KBYTES == 0x400) ? 11 : 23) - Run time determine the physical last sector @@ -70,7 +68,6 @@ //#define USE_VBUS_PULL_DOWN #define INTERFACE_USART 1 #define INTERFACE_USART_CONFIG "/dev/ttyS0,1500000" -#define BOOT_DELAY_ADDRESS 0x000001a0 #define BOARD_TYPE 7003 #define _FLASH_KBYTES (*(uint32_t *)0x1FF1E880) #define BOARD_FLASH_SECTORS (15) diff --git a/boards/cuav/x7pro/nuttx-config/scripts/bootloader_script.ld b/boards/cuav/x7pro/nuttx-config/scripts/bootloader_script.ld index c2eba58f26c..ed55056e974 100644 --- a/boards/cuav/x7pro/nuttx-config/scripts/bootloader_script.ld +++ b/boards/cuav/x7pro/nuttx-config/scripts/bootloader_script.ld @@ -132,20 +132,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/cuav/x7pro/nuttx-config/scripts/script.ld b/boards/cuav/x7pro/nuttx-config/scripts/script.ld index f213ad2ff42..dbda50503d1 100644 --- a/boards/cuav/x7pro/nuttx-config/scripts/script.ld +++ b/boards/cuav/x7pro/nuttx-config/scripts/script.ld @@ -131,20 +131,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/cuav/x7pro/src/hw_config.h b/boards/cuav/x7pro/src/hw_config.h index ced086d448b..dc81a85b5ee 100644 --- a/boards/cuav/x7pro/src/hw_config.h +++ b/boards/cuav/x7pro/src/hw_config.h @@ -53,8 +53,6 @@ * INTERFACE_USART 1 - (Optional) Scan and use the Serial interface for bootloading * USBDEVICESTRING "PX4 BL FMU v2.x" - USB id string * USBPRODUCTID 0x0011 - PID Should match defconfig - * BOOT_DELAY_ADDRESS 0x000001a0 - (Optional) From the linker script from Linker Script to get a custom - * delay provided by an APP FW * BOARD_TYPE 9 - Must match .prototype boad_id * _FLASH_KBYTES (*(uint16_t *)0x1fff7a22) - Run time flash size detection * BOARD_FLASH_SECTORS ((_FLASH_KBYTES == 0x400) ? 11 : 23) - Run time determine the physical last sector @@ -95,7 +93,6 @@ //#define USE_VBUS_PULL_DOWN #define INTERFACE_USART 1 #define INTERFACE_USART_CONFIG "/dev/ttyS4,57600" -#define BOOT_DELAY_ADDRESS 0x000001a0 #define BOARD_TYPE 1010 #define _FLASH_KBYTES (*(uint32_t *)0x1FF1E880) #define BOARD_FLASH_SECTORS (15) diff --git a/boards/cubepilot/cubeorange/nuttx-config/scripts/bootloader_script.ld b/boards/cubepilot/cubeorange/nuttx-config/scripts/bootloader_script.ld index 8d5c394482b..5d842052a35 100644 --- a/boards/cubepilot/cubeorange/nuttx-config/scripts/bootloader_script.ld +++ b/boards/cubepilot/cubeorange/nuttx-config/scripts/bootloader_script.ld @@ -132,20 +132,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/cubepilot/cubeorange/nuttx-config/scripts/script.ld b/boards/cubepilot/cubeorange/nuttx-config/scripts/script.ld index f213ad2ff42..dbda50503d1 100644 --- a/boards/cubepilot/cubeorange/nuttx-config/scripts/script.ld +++ b/boards/cubepilot/cubeorange/nuttx-config/scripts/script.ld @@ -131,20 +131,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/cubepilot/cubeorange/src/hw_config.h b/boards/cubepilot/cubeorange/src/hw_config.h index 58b55e0977c..70342a604a6 100644 --- a/boards/cubepilot/cubeorange/src/hw_config.h +++ b/boards/cubepilot/cubeorange/src/hw_config.h @@ -53,8 +53,6 @@ * INTERFACE_USART 1 - (Optional) Scan and use the Serial interface for bootloading * USBDEVICESTRING "PX4 BL FMU v2.x" - USB id string * USBPRODUCTID 0x0011 - PID Should match defconfig - * BOOT_DELAY_ADDRESS 0x000001a0 - (Optional) From the linker script from Linker Script to get a custom - * delay provided by an APP FW * BOARD_TYPE 9 - Must match .prototype boad_id * _FLASH_KBYTES (*(uint16_t *)0x1fff7a22) - Run time flash size detection * BOARD_FLASH_SECTORS ((_FLASH_KBYTES == 0x400) ? 11 : 23) - Run time determine the physical last sector @@ -95,7 +93,6 @@ //#define USE_VBUS_PULL_DOWN #define INTERFACE_USART 1 #define INTERFACE_USART_CONFIG "/dev/ttyS0,115200" -#define BOOT_DELAY_ADDRESS 0x000001a0 #define BOARD_TYPE 140 #define _FLASH_KBYTES (*(uint32_t *)0x1FF1E880) #define BOARD_FLASH_SECTORS (15) diff --git a/boards/cubepilot/cubeorangeplus/nuttx-config/scripts/bootloader_script.ld b/boards/cubepilot/cubeorangeplus/nuttx-config/scripts/bootloader_script.ld index 4a255ada187..9b2b6653482 100644 --- a/boards/cubepilot/cubeorangeplus/nuttx-config/scripts/bootloader_script.ld +++ b/boards/cubepilot/cubeorangeplus/nuttx-config/scripts/bootloader_script.ld @@ -132,20 +132,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/cubepilot/cubeorangeplus/nuttx-config/scripts/script.ld b/boards/cubepilot/cubeorangeplus/nuttx-config/scripts/script.ld index f4aa39bdb83..f75adafa965 100644 --- a/boards/cubepilot/cubeorangeplus/nuttx-config/scripts/script.ld +++ b/boards/cubepilot/cubeorangeplus/nuttx-config/scripts/script.ld @@ -131,20 +131,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/cubepilot/cubeorangeplus/src/hw_config.h b/boards/cubepilot/cubeorangeplus/src/hw_config.h index dbe6581acb8..d359968fb99 100644 --- a/boards/cubepilot/cubeorangeplus/src/hw_config.h +++ b/boards/cubepilot/cubeorangeplus/src/hw_config.h @@ -53,8 +53,6 @@ * INTERFACE_USART 1 - (Optional) Scan and use the Serial interface for bootloading * USBDEVICESTRING "PX4 BL FMU v2.x" - USB id string * USBPRODUCTID 0x0011 - PID Should match defconfig - * BOOT_DELAY_ADDRESS 0x000001a0 - (Optional) From the linker script from Linker Script to get a custom - * delay provided by an APP FW * BOARD_TYPE 9 - Must match .prototype boad_id * _FLASH_KBYTES (*(uint16_t *)0x1fff7a22) - Run time flash size detection * BOARD_FLASH_SECTORS ((_FLASH_KBYTES == 0x400) ? 11 : 23) - Run time determine the physical last sector @@ -95,7 +93,6 @@ //#define USE_VBUS_PULL_DOWN #define INTERFACE_USART 1 #define INTERFACE_USART_CONFIG "/dev/ttyS0,115200" -#define BOOT_DELAY_ADDRESS 0x000001a0 #define BOARD_TYPE 1063 #define _FLASH_KBYTES (*(uint32_t *)0x1FF1E880) #define BOARD_FLASH_SECTORS (15) diff --git a/boards/cubepilot/cubeyellow/nuttx-config/scripts/script.ld b/boards/cubepilot/cubeyellow/nuttx-config/scripts/script.ld index 89f6ef204b7..3a904a5fc3a 100644 --- a/boards/cubepilot/cubeyellow/nuttx-config/scripts/script.ld +++ b/boards/cubepilot/cubeyellow/nuttx-config/scripts/script.ld @@ -89,20 +89,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/freefly/can-rtk-gps/nuttx-config/scripts/script.ld b/boards/freefly/can-rtk-gps/nuttx-config/scripts/script.ld index 6e6424daa07..8c45dc06069 100644 --- a/boards/freefly/can-rtk-gps/nuttx-config/scripts/script.ld +++ b/boards/freefly/can-rtk-gps/nuttx-config/scripts/script.ld @@ -84,8 +84,6 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { diff --git a/boards/gearup/airbrainh743/nuttx-config/scripts/bootloader_script.ld b/boards/gearup/airbrainh743/nuttx-config/scripts/bootloader_script.ld index fb877cc443f..fcf84a4c60e 100644 --- a/boards/gearup/airbrainh743/nuttx-config/scripts/bootloader_script.ld +++ b/boards/gearup/airbrainh743/nuttx-config/scripts/bootloader_script.ld @@ -130,20 +130,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/gearup/airbrainh743/nuttx-config/scripts/script.ld b/boards/gearup/airbrainh743/nuttx-config/scripts/script.ld index a01eb2e2a86..d0de838f440 100644 --- a/boards/gearup/airbrainh743/nuttx-config/scripts/script.ld +++ b/boards/gearup/airbrainh743/nuttx-config/scripts/script.ld @@ -131,20 +131,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/gearup/airbrainh743/src/hw_config.h b/boards/gearup/airbrainh743/src/hw_config.h index 38e16b4059f..2885da610db 100644 --- a/boards/gearup/airbrainh743/src/hw_config.h +++ b/boards/gearup/airbrainh743/src/hw_config.h @@ -41,7 +41,6 @@ #define INTERFACE_USART 1 #define INTERFACE_USART_CONFIG "/dev/ttyS0,57600" -#define BOOT_DELAY_ADDRESS 0x000001a0 #define BOARD_TYPE 1209 #define _FLASH_KBYTES (*(uint32_t *)0x1FF1E880) #define BOARD_FLASH_SECTORS (14) diff --git a/boards/hkust/nxt-dual/nuttx-config/scripts/bootloader_script.ld b/boards/hkust/nxt-dual/nuttx-config/scripts/bootloader_script.ld index fb877cc443f..fcf84a4c60e 100644 --- a/boards/hkust/nxt-dual/nuttx-config/scripts/bootloader_script.ld +++ b/boards/hkust/nxt-dual/nuttx-config/scripts/bootloader_script.ld @@ -130,20 +130,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/hkust/nxt-dual/nuttx-config/scripts/script.ld b/boards/hkust/nxt-dual/nuttx-config/scripts/script.ld index 1dc1a0ef97e..3686e2d66ec 100644 --- a/boards/hkust/nxt-dual/nuttx-config/scripts/script.ld +++ b/boards/hkust/nxt-dual/nuttx-config/scripts/script.ld @@ -131,20 +131,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/hkust/nxt-dual/src/hw_config.h b/boards/hkust/nxt-dual/src/hw_config.h index 352f29436a0..5fc9b7e11cd 100644 --- a/boards/hkust/nxt-dual/src/hw_config.h +++ b/boards/hkust/nxt-dual/src/hw_config.h @@ -53,8 +53,6 @@ * INTERFACE_USART 1 - (Optional) Scan and use the Serial interface for bootloading * USBDEVICESTRING "PX4 BL FMU v2.x" - USB id string * USBPRODUCTID 0x0011 - PID Should match defconfig - * BOOT_DELAY_ADDRESS 0x000001a0 - (Optional) From the linker script from Linker Script to get a custom - * delay provided by an APP FW * BOARD_TYPE 9 - Must match .prototype boad_id * _FLASH_KBYTES (*(uint16_t *)0x1fff7a22) - Run time flash size detection * BOARD_FLASH_SECTORS ((_FLASH_KBYTES == 0x400) ? 11 : 23) - Run time determine the physical last sector @@ -95,7 +93,6 @@ //#define USE_VBUS_PULL_DOWN #define INTERFACE_USART 6 #define INTERFACE_USART_CONFIG "/dev/ttyS5,57600" -#define BOOT_DELAY_ADDRESS 0x000001a0 #define BOARD_TYPE 1013 #define BOARD_FLASH_SECTORS (14) #define BOARD_FLASH_SIZE (16 * 128 * 1024) diff --git a/boards/hkust/nxt-v1/nuttx-config/scripts/bootloader_script.ld b/boards/hkust/nxt-v1/nuttx-config/scripts/bootloader_script.ld index fb877cc443f..fcf84a4c60e 100644 --- a/boards/hkust/nxt-v1/nuttx-config/scripts/bootloader_script.ld +++ b/boards/hkust/nxt-v1/nuttx-config/scripts/bootloader_script.ld @@ -130,20 +130,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/hkust/nxt-v1/nuttx-config/scripts/script.ld b/boards/hkust/nxt-v1/nuttx-config/scripts/script.ld index 85f4990724d..012bc18d5e3 100644 --- a/boards/hkust/nxt-v1/nuttx-config/scripts/script.ld +++ b/boards/hkust/nxt-v1/nuttx-config/scripts/script.ld @@ -131,20 +131,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/hkust/nxt-v1/src/hw_config.h b/boards/hkust/nxt-v1/src/hw_config.h index 1e91b651457..0e2f6e40d11 100644 --- a/boards/hkust/nxt-v1/src/hw_config.h +++ b/boards/hkust/nxt-v1/src/hw_config.h @@ -53,8 +53,6 @@ * INTERFACE_USART 1 - (Optional) Scan and use the Serial interface for bootloading * USBDEVICESTRING "PX4 BL FMU v2.x" - USB id string * USBPRODUCTID 0x0011 - PID Should match defconfig - * BOOT_DELAY_ADDRESS 0x000001a0 - (Optional) From the linker script from Linker Script to get a custom - * delay provided by an APP FW * BOARD_TYPE 9 - Must match .prototype boad_id * _FLASH_KBYTES (*(uint16_t *)0x1fff7a22) - Run time flash size detection * BOARD_FLASH_SECTORS ((_FLASH_KBYTES == 0x400) ? 11 : 23) - Run time determine the physical last sector @@ -95,7 +93,6 @@ //#define USE_VBUS_PULL_DOWN #define INTERFACE_USART 1 #define INTERFACE_USART_CONFIG "/dev/ttyS0,57600" -#define BOOT_DELAY_ADDRESS 0x000001a0 #define BOARD_TYPE 1013 #define _FLASH_KBYTES (*(uint32_t *)0x1FF1E880) #define BOARD_FLASH_SECTORS (15) diff --git a/boards/holybro/can-gps-v1/nuttx-config/scripts/script.ld b/boards/holybro/can-gps-v1/nuttx-config/scripts/script.ld index 050bce7d772..a9a0715db16 100644 --- a/boards/holybro/can-gps-v1/nuttx-config/scripts/script.ld +++ b/boards/holybro/can-gps-v1/nuttx-config/scripts/script.ld @@ -64,8 +64,6 @@ EXTERN(_vectors) /* force the vectors to be included in the output */ * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { diff --git a/boards/holybro/durandal-v1/nuttx-config/scripts/bootloader_script.ld b/boards/holybro/durandal-v1/nuttx-config/scripts/bootloader_script.ld index fb877cc443f..fcf84a4c60e 100644 --- a/boards/holybro/durandal-v1/nuttx-config/scripts/bootloader_script.ld +++ b/boards/holybro/durandal-v1/nuttx-config/scripts/bootloader_script.ld @@ -130,20 +130,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/holybro/durandal-v1/nuttx-config/scripts/script.ld b/boards/holybro/durandal-v1/nuttx-config/scripts/script.ld index 38b1c3e1b58..f3e9d8bfc46 100644 --- a/boards/holybro/durandal-v1/nuttx-config/scripts/script.ld +++ b/boards/holybro/durandal-v1/nuttx-config/scripts/script.ld @@ -131,20 +131,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/holybro/durandal-v1/src/hw_config.h b/boards/holybro/durandal-v1/src/hw_config.h index ae706c66643..2b7a98eba25 100644 --- a/boards/holybro/durandal-v1/src/hw_config.h +++ b/boards/holybro/durandal-v1/src/hw_config.h @@ -28,8 +28,6 @@ * INTERFACE_USART 1 - (Optional) Scan and use the Serial interface for bootloading * USBDEVICESTRING "PX4 BL FMU v2.x" - USB id string * USBPRODUCTID 0x0011 - PID Should match defconfig - * BOOT_DELAY_ADDRESS 0x000001a0 - (Optional) From the linker script from Linker Script to get a custom - * delay provided by an APP FW * BOARD_TYPE 9 - Must match .prototype boad_id * _FLASH_KBYTES (*(uint16_t *)0x1fff7a22) - Run time flash size detection * BOARD_FLASH_SECTORS ((_FLASH_KBYTES == 0x400) ? 11 : 23) - Run time determine the physical last sector @@ -70,7 +68,6 @@ //#define USE_VBUS_PULL_DOWN #define INTERFACE_USART 1 #define INTERFACE_USART_CONFIG "/dev/ttyS0,115200" -#define BOOT_DELAY_ADDRESS 0x000001a0 #define BOARD_TYPE 139 #define _FLASH_KBYTES (*(uint32_t *)0x1FF1E880) #define BOARD_FLASH_SECTORS (15) diff --git a/boards/holybro/h-flow/nuttx-config/scripts/script.ld b/boards/holybro/h-flow/nuttx-config/scripts/script.ld index 3db1f5dc64c..d11c3a1fd78 100644 --- a/boards/holybro/h-flow/nuttx-config/scripts/script.ld +++ b/boards/holybro/h-flow/nuttx-config/scripts/script.ld @@ -64,8 +64,6 @@ EXTERN(_vectors) /* force the vectors to be included in the output */ * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { diff --git a/boards/holybro/kakutef7/nuttx-config/scripts/script.ld b/boards/holybro/kakutef7/nuttx-config/scripts/script.ld index 903eb2d35c9..860db7dacce 100644 --- a/boards/holybro/kakutef7/nuttx-config/scripts/script.ld +++ b/boards/holybro/kakutef7/nuttx-config/scripts/script.ld @@ -88,20 +88,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/holybro/kakuteh7-wing/nuttx-config/scripts/bootloader_script.ld b/boards/holybro/kakuteh7-wing/nuttx-config/scripts/bootloader_script.ld index fc0a5589be2..d3609b6549b 100644 --- a/boards/holybro/kakuteh7-wing/nuttx-config/scripts/bootloader_script.ld +++ b/boards/holybro/kakuteh7-wing/nuttx-config/scripts/bootloader_script.ld @@ -132,20 +132,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/holybro/kakuteh7-wing/nuttx-config/scripts/script.ld b/boards/holybro/kakuteh7-wing/nuttx-config/scripts/script.ld index 31780fad155..c01e2061c80 100644 --- a/boards/holybro/kakuteh7-wing/nuttx-config/scripts/script.ld +++ b/boards/holybro/kakuteh7-wing/nuttx-config/scripts/script.ld @@ -131,20 +131,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/holybro/kakuteh7-wing/src/hw_config.h b/boards/holybro/kakuteh7-wing/src/hw_config.h index 755fe3ae0fa..57798c1a2b6 100644 --- a/boards/holybro/kakuteh7-wing/src/hw_config.h +++ b/boards/holybro/kakuteh7-wing/src/hw_config.h @@ -28,8 +28,6 @@ * INTERFACE_USART 1 - (Optional) Scan and use the Serial interface for bootloading * USBDEVICESTRING "PX4 BL FMU v2.x" - USB id string * USBPRODUCTID 0x0011 - PID Should match defconfig - * BOOT_DELAY_ADDRESS 0x000001a0 - (Optional) From the linker script from Linker Script to get a custom - * delay provided by an APP FW * BOARD_TYPE 9 - Must match .prototype boad_id * _FLASH_KBYTES (*(uint16_t *)0x1fff7a22) - Run time flash size detection * BOARD_FLASH_SECTORS ((_FLASH_KBYTES == 0x400) ? 11 : 23) - Run time determine the physical last sector @@ -70,7 +68,6 @@ //#define USE_VBUS_PULL_DOWN #define INTERFACE_USART 1 #define INTERFACE_USART_CONFIG "/dev/ttyS0,115200" -#define BOOT_DELAY_ADDRESS 0x000001a0 #define BOARD_TYPE 1105 #define BOARD_FLASH_SECTORS (13) #define BOARD_FLASH_SIZE (16 * 128 * 1024) diff --git a/boards/holybro/kakuteh7/nuttx-config/scripts/bootloader_script.ld b/boards/holybro/kakuteh7/nuttx-config/scripts/bootloader_script.ld index fc0a5589be2..d3609b6549b 100644 --- a/boards/holybro/kakuteh7/nuttx-config/scripts/bootloader_script.ld +++ b/boards/holybro/kakuteh7/nuttx-config/scripts/bootloader_script.ld @@ -132,20 +132,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/holybro/kakuteh7/nuttx-config/scripts/script.ld b/boards/holybro/kakuteh7/nuttx-config/scripts/script.ld index ae07f4bfca0..82181135821 100644 --- a/boards/holybro/kakuteh7/nuttx-config/scripts/script.ld +++ b/boards/holybro/kakuteh7/nuttx-config/scripts/script.ld @@ -131,20 +131,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/holybro/kakuteh7/src/hw_config.h b/boards/holybro/kakuteh7/src/hw_config.h index 01f1a805fa8..09f1693cc81 100644 --- a/boards/holybro/kakuteh7/src/hw_config.h +++ b/boards/holybro/kakuteh7/src/hw_config.h @@ -28,8 +28,6 @@ * INTERFACE_USART 1 - (Optional) Scan and use the Serial interface for bootloading * USBDEVICESTRING "PX4 BL FMU v2.x" - USB id string * USBPRODUCTID 0x0011 - PID Should match defconfig - * BOOT_DELAY_ADDRESS 0x000001a0 - (Optional) From the linker script from Linker Script to get a custom - * delay provided by an APP FW * BOARD_TYPE 9 - Must match .prototype boad_id * _FLASH_KBYTES (*(uint16_t *)0x1fff7a22) - Run time flash size detection * BOARD_FLASH_SECTORS ((_FLASH_KBYTES == 0x400) ? 11 : 23) - Run time determine the physical last sector @@ -68,7 +66,6 @@ #define BOARD_VBUS MK_GPIO_INPUT(GPIO_OTGFS_VBUS) //#define USE_VBUS_PULL_DOWN -#define BOOT_DELAY_ADDRESS 0x000001a0 #define BOARD_TYPE 1048 #define BOARD_FLASH_SECTORS (14) #define BOARD_FLASH_SIZE (16 * 128 * 1024) diff --git a/boards/holybro/kakuteh7dualimu/nuttx-config/scripts/bootloader_script.ld b/boards/holybro/kakuteh7dualimu/nuttx-config/scripts/bootloader_script.ld index fc0a5589be2..d3609b6549b 100644 --- a/boards/holybro/kakuteh7dualimu/nuttx-config/scripts/bootloader_script.ld +++ b/boards/holybro/kakuteh7dualimu/nuttx-config/scripts/bootloader_script.ld @@ -132,20 +132,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/holybro/kakuteh7dualimu/nuttx-config/scripts/script.ld b/boards/holybro/kakuteh7dualimu/nuttx-config/scripts/script.ld index 31780fad155..c01e2061c80 100644 --- a/boards/holybro/kakuteh7dualimu/nuttx-config/scripts/script.ld +++ b/boards/holybro/kakuteh7dualimu/nuttx-config/scripts/script.ld @@ -131,20 +131,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/holybro/kakuteh7dualimu/src/hw_config.h b/boards/holybro/kakuteh7dualimu/src/hw_config.h index 9620345ff3a..37eae2b6f16 100644 --- a/boards/holybro/kakuteh7dualimu/src/hw_config.h +++ b/boards/holybro/kakuteh7dualimu/src/hw_config.h @@ -28,8 +28,6 @@ * INTERFACE_USART 1 - (Optional) Scan and use the Serial interface for bootloading * USBDEVICESTRING "PX4 BL FMU v2.x" - USB id string * USBPRODUCTID 0x0011 - PID Should match defconfig - * BOOT_DELAY_ADDRESS 0x000001a0 - (Optional) From the linker script from Linker Script to get a custom - * delay provided by an APP FW * BOARD_TYPE 9 - Must match .prototype boad_id * _FLASH_KBYTES (*(uint16_t *)0x1fff7a22) - Run time flash size detection * BOARD_FLASH_SECTORS ((_FLASH_KBYTES == 0x400) ? 11 : 23) - Run time determine the physical last sector @@ -68,7 +66,6 @@ #define BOARD_VBUS MK_GPIO_INPUT(GPIO_OTGFS_VBUS) //#define USE_VBUS_PULL_DOWN -#define BOOT_DELAY_ADDRESS 0x000001a0 #define BOARD_TYPE 5409 #define BOARD_FLASH_SECTORS (14) #define BOARD_FLASH_SIZE (16 * 128 * 1024) diff --git a/boards/holybro/kakuteh7mini/nuttx-config/scripts/bootloader_script.ld b/boards/holybro/kakuteh7mini/nuttx-config/scripts/bootloader_script.ld index fc0a5589be2..d3609b6549b 100644 --- a/boards/holybro/kakuteh7mini/nuttx-config/scripts/bootloader_script.ld +++ b/boards/holybro/kakuteh7mini/nuttx-config/scripts/bootloader_script.ld @@ -132,20 +132,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/holybro/kakuteh7mini/nuttx-config/scripts/script.ld b/boards/holybro/kakuteh7mini/nuttx-config/scripts/script.ld index ae07f4bfca0..82181135821 100644 --- a/boards/holybro/kakuteh7mini/nuttx-config/scripts/script.ld +++ b/boards/holybro/kakuteh7mini/nuttx-config/scripts/script.ld @@ -131,20 +131,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/holybro/kakuteh7mini/src/hw_config.h b/boards/holybro/kakuteh7mini/src/hw_config.h index bd7a8a6d3c0..eb5ea2f72ce 100644 --- a/boards/holybro/kakuteh7mini/src/hw_config.h +++ b/boards/holybro/kakuteh7mini/src/hw_config.h @@ -28,8 +28,6 @@ * INTERFACE_USART 1 - (Optional) Scan and use the Serial interface for bootloading * USBDEVICESTRING "PX4 BL FMU v2.x" - USB id string * USBPRODUCTID 0x0011 - PID Should match defconfig - * BOOT_DELAY_ADDRESS 0x000001a0 - (Optional) From the linker script from Linker Script to get a custom - * delay provided by an APP FW * BOARD_TYPE 9 - Must match .prototype boad_id * _FLASH_KBYTES (*(uint16_t *)0x1fff7a22) - Run time flash size detection * BOARD_FLASH_SECTORS ((_FLASH_KBYTES == 0x400) ? 11 : 23) - Run time determine the physical last sector @@ -68,7 +66,6 @@ #define BOARD_VBUS MK_GPIO_INPUT(GPIO_OTGFS_VBUS) //#define USE_VBUS_PULL_DOWN -#define BOOT_DELAY_ADDRESS 0x000001a0 #define BOARD_TYPE 1058 #define BOARD_FLASH_SECTORS (14) #define BOARD_FLASH_SIZE (16 * 128 * 1024) diff --git a/boards/holybro/kakuteh7v2/nuttx-config/scripts/bootloader_script.ld b/boards/holybro/kakuteh7v2/nuttx-config/scripts/bootloader_script.ld index fc0a5589be2..d3609b6549b 100644 --- a/boards/holybro/kakuteh7v2/nuttx-config/scripts/bootloader_script.ld +++ b/boards/holybro/kakuteh7v2/nuttx-config/scripts/bootloader_script.ld @@ -132,20 +132,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/holybro/kakuteh7v2/nuttx-config/scripts/script.ld b/boards/holybro/kakuteh7v2/nuttx-config/scripts/script.ld index ae07f4bfca0..82181135821 100644 --- a/boards/holybro/kakuteh7v2/nuttx-config/scripts/script.ld +++ b/boards/holybro/kakuteh7v2/nuttx-config/scripts/script.ld @@ -131,20 +131,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/holybro/kakuteh7v2/src/hw_config.h b/boards/holybro/kakuteh7v2/src/hw_config.h index 72b3d6ac6c3..c73fb961e6a 100644 --- a/boards/holybro/kakuteh7v2/src/hw_config.h +++ b/boards/holybro/kakuteh7v2/src/hw_config.h @@ -28,8 +28,6 @@ * INTERFACE_USART 1 - (Optional) Scan and use the Serial interface for bootloading * USBDEVICESTRING "PX4 BL FMU v2.x" - USB id string * USBPRODUCTID 0x0011 - PID Should match defconfig - * BOOT_DELAY_ADDRESS 0x000001a0 - (Optional) From the linker script from Linker Script to get a custom - * delay provided by an APP FW * BOARD_TYPE 9 - Must match .prototype boad_id * _FLASH_KBYTES (*(uint16_t *)0x1fff7a22) - Run time flash size detection * BOARD_FLASH_SECTORS ((_FLASH_KBYTES == 0x400) ? 11 : 23) - Run time determine the physical last sector @@ -68,7 +66,6 @@ #define BOARD_VBUS MK_GPIO_INPUT(GPIO_OTGFS_VBUS) //#define USE_VBUS_PULL_DOWN -#define BOOT_DELAY_ADDRESS 0x000001a0 #define BOARD_TYPE 1053 #define BOARD_FLASH_SECTORS (14) #define BOARD_FLASH_SIZE (16 * 128 * 1024) diff --git a/boards/holybro/pix32v5/nuttx-config/scripts/script.ld b/boards/holybro/pix32v5/nuttx-config/scripts/script.ld index db0f740cf00..b9a2dce0cc5 100644 --- a/boards/holybro/pix32v5/nuttx-config/scripts/script.ld +++ b/boards/holybro/pix32v5/nuttx-config/scripts/script.ld @@ -89,20 +89,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/matek/gnss-m9n-f4/nuttx-config/scripts/script.ld b/boards/matek/gnss-m9n-f4/nuttx-config/scripts/script.ld index 70696dfb2ce..85a0dd59052 100755 --- a/boards/matek/gnss-m9n-f4/nuttx-config/scripts/script.ld +++ b/boards/matek/gnss-m9n-f4/nuttx-config/scripts/script.ld @@ -64,8 +64,6 @@ EXTERN(_vectors) /* force the vectors to be included in the output */ * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { diff --git a/boards/matek/h743-mini/nuttx-config/scripts/bootloader_script.ld b/boards/matek/h743-mini/nuttx-config/scripts/bootloader_script.ld index fb877cc443f..fcf84a4c60e 100644 --- a/boards/matek/h743-mini/nuttx-config/scripts/bootloader_script.ld +++ b/boards/matek/h743-mini/nuttx-config/scripts/bootloader_script.ld @@ -130,20 +130,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/matek/h743-mini/nuttx-config/scripts/script.ld b/boards/matek/h743-mini/nuttx-config/scripts/script.ld index 85f4990724d..012bc18d5e3 100644 --- a/boards/matek/h743-mini/nuttx-config/scripts/script.ld +++ b/boards/matek/h743-mini/nuttx-config/scripts/script.ld @@ -131,20 +131,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/matek/h743-mini/src/hw_config.h b/boards/matek/h743-mini/src/hw_config.h index f289dc960d4..b5da75f3868 100644 --- a/boards/matek/h743-mini/src/hw_config.h +++ b/boards/matek/h743-mini/src/hw_config.h @@ -53,8 +53,6 @@ * INTERFACE_USART 1 - (Optional) Scan and use the Serial interface for bootloading * USBDEVICESTRING "PX4 BL FMU v2.x" - USB id string * USBPRODUCTID 0x0011 - PID Should match defconfig - * BOOT_DELAY_ADDRESS 0x000001a0 - (Optional) From the linker script from Linker Script to get a custom - * delay provided by an APP FW * BOARD_TYPE 9 - Must match .prototype boad_id * _FLASH_KBYTES (*(uint16_t *)0x1fff7a22) - Run time flash size detection * BOARD_FLASH_SECTORS ((_FLASH_KBYTES == 0x400) ? 11 : 23) - Run time determine the physical last sector @@ -95,7 +93,6 @@ //#define USE_VBUS_PULL_DOWN #define INTERFACE_USART 1 #define INTERFACE_USART_CONFIG "/dev/ttyS0,57600" -#define BOOT_DELAY_ADDRESS 0x000001a0 #define BOARD_TYPE 139 #define _FLASH_KBYTES (*(uint32_t *)0x1FF1E880) #define BOARD_FLASH_SECTORS (15) diff --git a/boards/matek/h743-slim/nuttx-config/scripts/bootloader_script.ld b/boards/matek/h743-slim/nuttx-config/scripts/bootloader_script.ld index fb877cc443f..fcf84a4c60e 100644 --- a/boards/matek/h743-slim/nuttx-config/scripts/bootloader_script.ld +++ b/boards/matek/h743-slim/nuttx-config/scripts/bootloader_script.ld @@ -130,20 +130,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/matek/h743-slim/nuttx-config/scripts/script.ld b/boards/matek/h743-slim/nuttx-config/scripts/script.ld index c6a8ee1141f..ba84f12d00a 100644 --- a/boards/matek/h743-slim/nuttx-config/scripts/script.ld +++ b/boards/matek/h743-slim/nuttx-config/scripts/script.ld @@ -131,20 +131,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/matek/h743-slim/src/hw_config.h b/boards/matek/h743-slim/src/hw_config.h index 3256b9c63d1..0a880d1c89b 100644 --- a/boards/matek/h743-slim/src/hw_config.h +++ b/boards/matek/h743-slim/src/hw_config.h @@ -53,8 +53,6 @@ * INTERFACE_USART 1 - (Optional) Scan and use the Serial interface for bootloading * USBDEVICESTRING "PX4 BL FMU v2.x" - USB id string * USBPRODUCTID 0x0011 - PID Should match defconfig - * BOOT_DELAY_ADDRESS 0x000001a0 - (Optional) From the linker script from Linker Script to get a custom - * delay provided by an APP FW * BOARD_TYPE 9 - Must match .prototype boad_id * _FLASH_KBYTES (*(uint16_t *)0x1fff7a22) - Run time flash size detection * BOARD_FLASH_SECTORS ((_FLASH_KBYTES == 0x400) ? 11 : 23) - Run time determine the physical last sector @@ -95,7 +93,6 @@ //#define USE_VBUS_PULL_DOWN #define INTERFACE_USART 1 #define INTERFACE_USART_CONFIG "/dev/ttyS0,57600" -#define BOOT_DELAY_ADDRESS 0x000001a0 #define BOARD_TYPE 1013 #define _FLASH_KBYTES (*(uint32_t *)0x1FF1E880) #define BOARD_FLASH_SECTORS (15) diff --git a/boards/matek/h743/nuttx-config/scripts/bootloader_script.ld b/boards/matek/h743/nuttx-config/scripts/bootloader_script.ld index fb877cc443f..fcf84a4c60e 100644 --- a/boards/matek/h743/nuttx-config/scripts/bootloader_script.ld +++ b/boards/matek/h743/nuttx-config/scripts/bootloader_script.ld @@ -130,20 +130,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/matek/h743/nuttx-config/scripts/script.ld b/boards/matek/h743/nuttx-config/scripts/script.ld index c6a8ee1141f..ba84f12d00a 100644 --- a/boards/matek/h743/nuttx-config/scripts/script.ld +++ b/boards/matek/h743/nuttx-config/scripts/script.ld @@ -131,20 +131,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/matek/h743/src/hw_config.h b/boards/matek/h743/src/hw_config.h index f289dc960d4..b5da75f3868 100644 --- a/boards/matek/h743/src/hw_config.h +++ b/boards/matek/h743/src/hw_config.h @@ -53,8 +53,6 @@ * INTERFACE_USART 1 - (Optional) Scan and use the Serial interface for bootloading * USBDEVICESTRING "PX4 BL FMU v2.x" - USB id string * USBPRODUCTID 0x0011 - PID Should match defconfig - * BOOT_DELAY_ADDRESS 0x000001a0 - (Optional) From the linker script from Linker Script to get a custom - * delay provided by an APP FW * BOARD_TYPE 9 - Must match .prototype boad_id * _FLASH_KBYTES (*(uint16_t *)0x1fff7a22) - Run time flash size detection * BOARD_FLASH_SECTORS ((_FLASH_KBYTES == 0x400) ? 11 : 23) - Run time determine the physical last sector @@ -95,7 +93,6 @@ //#define USE_VBUS_PULL_DOWN #define INTERFACE_USART 1 #define INTERFACE_USART_CONFIG "/dev/ttyS0,57600" -#define BOOT_DELAY_ADDRESS 0x000001a0 #define BOARD_TYPE 139 #define _FLASH_KBYTES (*(uint32_t *)0x1FF1E880) #define BOARD_FLASH_SECTORS (15) diff --git a/boards/micoair/h743-aio/nuttx-config/scripts/bootloader_script.ld b/boards/micoair/h743-aio/nuttx-config/scripts/bootloader_script.ld index fb877cc443f..fcf84a4c60e 100644 --- a/boards/micoair/h743-aio/nuttx-config/scripts/bootloader_script.ld +++ b/boards/micoair/h743-aio/nuttx-config/scripts/bootloader_script.ld @@ -130,20 +130,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/micoair/h743-aio/nuttx-config/scripts/script.ld b/boards/micoair/h743-aio/nuttx-config/scripts/script.ld index 85f4990724d..012bc18d5e3 100644 --- a/boards/micoair/h743-aio/nuttx-config/scripts/script.ld +++ b/boards/micoair/h743-aio/nuttx-config/scripts/script.ld @@ -131,20 +131,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/micoair/h743-aio/src/hw_config.h b/boards/micoair/h743-aio/src/hw_config.h index c63c1e65889..6e92529b601 100644 --- a/boards/micoair/h743-aio/src/hw_config.h +++ b/boards/micoair/h743-aio/src/hw_config.h @@ -53,8 +53,6 @@ * INTERFACE_USART 1 - (Optional) Scan and use the Serial interface for bootloading * USBDEVICESTRING "PX4 BL FMU v2.x" - USB id string * USBPRODUCTID 0x0011 - PID Should match defconfig - * BOOT_DELAY_ADDRESS 0x000001a0 - (Optional) From the linker script from Linker Script to get a custom - * delay provided by an APP FW * BOARD_TYPE 9 - Must match .prototype boad_id * _FLASH_KBYTES (*(uint16_t *)0x1fff7a22) - Run time flash size detection * BOARD_FLASH_SECTORS ((_FLASH_KBYTES == 0x400) ? 11 : 23) - Run time determine the physical last sector @@ -95,7 +93,6 @@ //#define USE_VBUS_PULL_DOWN #define INTERFACE_USART 1 #define INTERFACE_USART_CONFIG "/dev/ttyS0,115200" -#define BOOT_DELAY_ADDRESS 0x000001a0 #define BOARD_TYPE 1176 #define _FLASH_KBYTES (*(uint32_t *)0x1FF1E880) #define BOARD_FLASH_SECTORS (15) diff --git a/boards/micoair/h743-lite/nuttx-config/scripts/bootloader_script.ld b/boards/micoair/h743-lite/nuttx-config/scripts/bootloader_script.ld index fb877cc443f..fcf84a4c60e 100644 --- a/boards/micoair/h743-lite/nuttx-config/scripts/bootloader_script.ld +++ b/boards/micoair/h743-lite/nuttx-config/scripts/bootloader_script.ld @@ -130,20 +130,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/micoair/h743-lite/nuttx-config/scripts/script.ld b/boards/micoair/h743-lite/nuttx-config/scripts/script.ld index 85f4990724d..012bc18d5e3 100644 --- a/boards/micoair/h743-lite/nuttx-config/scripts/script.ld +++ b/boards/micoair/h743-lite/nuttx-config/scripts/script.ld @@ -131,20 +131,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/micoair/h743-lite/src/hw_config.h b/boards/micoair/h743-lite/src/hw_config.h index ac210d78d46..aa1103335aa 100644 --- a/boards/micoair/h743-lite/src/hw_config.h +++ b/boards/micoair/h743-lite/src/hw_config.h @@ -53,8 +53,6 @@ * INTERFACE_USART 1 - (Optional) Scan and use the Serial interface for bootloading * USBDEVICESTRING "PX4 BL FMU v2.x" - USB id string * USBPRODUCTID 0x0011 - PID Should match defconfig - * BOOT_DELAY_ADDRESS 0x000001a0 - (Optional) From the linker script from Linker Script to get a custom - * delay provided by an APP FW * BOARD_TYPE 9 - Must match .prototype boad_id * _FLASH_KBYTES (*(uint16_t *)0x1fff7a22) - Run time flash size detection * BOARD_FLASH_SECTORS ((_FLASH_KBYTES == 0x400) ? 11 : 23) - Run time determine the physical last sector @@ -95,7 +93,6 @@ //#define USE_VBUS_PULL_DOWN #define INTERFACE_USART 1 #define INTERFACE_USART_CONFIG "/dev/ttyS0,115200" -#define BOOT_DELAY_ADDRESS 0x000001a0 #define BOARD_TYPE 1202 #define _FLASH_KBYTES (*(uint32_t *)0x1FF1E880) #define BOARD_FLASH_SECTORS (15) diff --git a/boards/micoair/h743-v2/nuttx-config/scripts/bootloader_script.ld b/boards/micoair/h743-v2/nuttx-config/scripts/bootloader_script.ld index fb877cc443f..fcf84a4c60e 100644 --- a/boards/micoair/h743-v2/nuttx-config/scripts/bootloader_script.ld +++ b/boards/micoair/h743-v2/nuttx-config/scripts/bootloader_script.ld @@ -130,20 +130,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/micoair/h743-v2/nuttx-config/scripts/script.ld b/boards/micoair/h743-v2/nuttx-config/scripts/script.ld index 85f4990724d..012bc18d5e3 100644 --- a/boards/micoair/h743-v2/nuttx-config/scripts/script.ld +++ b/boards/micoair/h743-v2/nuttx-config/scripts/script.ld @@ -131,20 +131,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/micoair/h743-v2/src/hw_config.h b/boards/micoair/h743-v2/src/hw_config.h index ded5196d732..76359de78bc 100644 --- a/boards/micoair/h743-v2/src/hw_config.h +++ b/boards/micoair/h743-v2/src/hw_config.h @@ -53,8 +53,6 @@ * INTERFACE_USART 1 - (Optional) Scan and use the Serial interface for bootloading * USBDEVICESTRING "PX4 BL FMU v2.x" - USB id string * USBPRODUCTID 0x0011 - PID Should match defconfig - * BOOT_DELAY_ADDRESS 0x000001a0 - (Optional) From the linker script from Linker Script to get a custom - * delay provided by an APP FW * BOARD_TYPE 9 - Must match .prototype boad_id * _FLASH_KBYTES (*(uint16_t *)0x1fff7a22) - Run time flash size detection * BOARD_FLASH_SECTORS ((_FLASH_KBYTES == 0x400) ? 11 : 23) - Run time determine the physical last sector @@ -95,7 +93,6 @@ //#define USE_VBUS_PULL_DOWN #define INTERFACE_USART 1 #define INTERFACE_USART_CONFIG "/dev/ttyS0,115200" -#define BOOT_DELAY_ADDRESS 0x000001a0 #define BOARD_TYPE 1179 #define _FLASH_KBYTES (*(uint32_t *)0x1FF1E880) #define BOARD_FLASH_SECTORS (15) diff --git a/boards/micoair/h743/nuttx-config/scripts/bootloader_script.ld b/boards/micoair/h743/nuttx-config/scripts/bootloader_script.ld index fb877cc443f..fcf84a4c60e 100644 --- a/boards/micoair/h743/nuttx-config/scripts/bootloader_script.ld +++ b/boards/micoair/h743/nuttx-config/scripts/bootloader_script.ld @@ -130,20 +130,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/micoair/h743/nuttx-config/scripts/script.ld b/boards/micoair/h743/nuttx-config/scripts/script.ld index 85f4990724d..012bc18d5e3 100644 --- a/boards/micoair/h743/nuttx-config/scripts/script.ld +++ b/boards/micoair/h743/nuttx-config/scripts/script.ld @@ -131,20 +131,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/micoair/h743/src/hw_config.h b/boards/micoair/h743/src/hw_config.h index 5ed11808290..585418d25f8 100644 --- a/boards/micoair/h743/src/hw_config.h +++ b/boards/micoair/h743/src/hw_config.h @@ -53,8 +53,6 @@ * INTERFACE_USART 1 - (Optional) Scan and use the Serial interface for bootloading * USBDEVICESTRING "PX4 BL FMU v2.x" - USB id string * USBPRODUCTID 0x0011 - PID Should match defconfig - * BOOT_DELAY_ADDRESS 0x000001a0 - (Optional) From the linker script from Linker Script to get a custom - * delay provided by an APP FW * BOARD_TYPE 9 - Must match .prototype boad_id * _FLASH_KBYTES (*(uint16_t *)0x1fff7a22) - Run time flash size detection * BOARD_FLASH_SECTORS ((_FLASH_KBYTES == 0x400) ? 11 : 23) - Run time determine the physical last sector @@ -95,7 +93,6 @@ //#define USE_VBUS_PULL_DOWN #define INTERFACE_USART 1 #define INTERFACE_USART_CONFIG "/dev/ttyS0,115200" -#define BOOT_DELAY_ADDRESS 0x000001a0 #define BOARD_TYPE 1166 #define _FLASH_KBYTES (*(uint32_t *)0x1FF1E880) #define BOARD_FLASH_SECTORS (15) diff --git a/boards/modalai/fc-v1/nuttx-config/scripts/script.ld b/boards/modalai/fc-v1/nuttx-config/scripts/script.ld index db0f740cf00..b9a2dce0cc5 100644 --- a/boards/modalai/fc-v1/nuttx-config/scripts/script.ld +++ b/boards/modalai/fc-v1/nuttx-config/scripts/script.ld @@ -89,20 +89,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/modalai/fc-v2/nuttx-config/scripts/bootloader_script.ld b/boards/modalai/fc-v2/nuttx-config/scripts/bootloader_script.ld index 5cc69e66f11..c92d838ceba 100644 --- a/boards/modalai/fc-v2/nuttx-config/scripts/bootloader_script.ld +++ b/boards/modalai/fc-v2/nuttx-config/scripts/bootloader_script.ld @@ -132,20 +132,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/modalai/fc-v2/nuttx-config/scripts/script.ld b/boards/modalai/fc-v2/nuttx-config/scripts/script.ld index b31de772cea..e234eea14af 100644 --- a/boards/modalai/fc-v2/nuttx-config/scripts/script.ld +++ b/boards/modalai/fc-v2/nuttx-config/scripts/script.ld @@ -131,7 +131,6 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) EXTERN(board_get_manifest) SECTIONS @@ -140,12 +139,6 @@ SECTIONS _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/modalai/fc-v2/src/hw_config.h b/boards/modalai/fc-v2/src/hw_config.h index 474a55c0fda..e5dee8d0a33 100644 --- a/boards/modalai/fc-v2/src/hw_config.h +++ b/boards/modalai/fc-v2/src/hw_config.h @@ -28,8 +28,6 @@ * INTERFACE_USART 1 - (Optional) Scan and use the Serial interface for bootloading * USBDEVICESTRING "PX4 BL FMU v2.x" - USB id string * USBPRODUCTID 0x0011 - PID Should match defconfig - * BOOT_DELAY_ADDRESS 0x000001a0 - (Optional) From the linker script from Linker Script to get a custom - * delay provided by an APP FW * BOARD_TYPE 9 - Must match .prototype boad_id * _FLASH_KBYTES (*(uint16_t *)0x1fff7a22) - Run time flash size detection * BOARD_FLASH_SECTORS ((_FLASH_KBYTES == 0x400) ? 11 : 23) - Run time determine the physical last sector @@ -70,7 +68,6 @@ //#define USE_VBUS_PULL_DOWN #define INTERFACE_USART 1 #define INTERFACE_USART_CONFIG "/dev/ttyS0,115200" -#define BOOT_DELAY_ADDRESS 0x000001a0 #define BOARD_TYPE 41776 #define _FLASH_KBYTES (*(uint32_t *)0x1FF1E880) #define BOARD_FLASH_SECTORS (15) diff --git a/boards/mro/ctrl-zero-classic/nuttx-config/scripts/bootloader_script.ld b/boards/mro/ctrl-zero-classic/nuttx-config/scripts/bootloader_script.ld index 3fb4cc1f33c..bd3b8890f1b 100644 --- a/boards/mro/ctrl-zero-classic/nuttx-config/scripts/bootloader_script.ld +++ b/boards/mro/ctrl-zero-classic/nuttx-config/scripts/bootloader_script.ld @@ -130,20 +130,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/mro/ctrl-zero-classic/nuttx-config/scripts/script.ld b/boards/mro/ctrl-zero-classic/nuttx-config/scripts/script.ld index 02e763a790f..bb0aedb134c 100644 --- a/boards/mro/ctrl-zero-classic/nuttx-config/scripts/script.ld +++ b/boards/mro/ctrl-zero-classic/nuttx-config/scripts/script.ld @@ -131,20 +131,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/mro/ctrl-zero-classic/src/hw_config.h b/boards/mro/ctrl-zero-classic/src/hw_config.h index 8fdaec9e7e4..70f2cd31738 100644 --- a/boards/mro/ctrl-zero-classic/src/hw_config.h +++ b/boards/mro/ctrl-zero-classic/src/hw_config.h @@ -53,8 +53,6 @@ * INTERFACE_USART 1 - (Optional) Scan and use the Serial interface for bootloading * USBDEVICESTRING "PX4 BL FMU v2.x" - USB id string * USBPRODUCTID 0x0011 - PID Should match defconfig - * BOOT_DELAY_ADDRESS 0x000001a0 - (Optional) From the linker script from Linker Script to get a custom - * delay provided by an APP FW * BOARD_TYPE 9 - Must match .prototype boad_id * _FLASH_KBYTES (*(uint16_t *)0x1fff7a22) - Run time flash size detection * BOARD_FLASH_SECTORS ((_FLASH_KBYTES == 0x400) ? 11 : 23) - Run time determine the physical last sector @@ -95,7 +93,6 @@ //#define USE_VBUS_PULL_DOWN #define INTERFACE_USART 1 #define INTERFACE_USART_CONFIG "/dev/ttyS0,115200" -#define BOOT_DELAY_ADDRESS 0x000001a0 #define BOARD_TYPE 1024 #define _FLASH_KBYTES (*(uint32_t *)0x1FF1E880) #define BOARD_FLASH_SECTORS (15) diff --git a/boards/mro/ctrl-zero-f7-oem/nuttx-config/scripts/script.ld b/boards/mro/ctrl-zero-f7-oem/nuttx-config/scripts/script.ld index 47b29d3493f..f20b38caaba 100644 --- a/boards/mro/ctrl-zero-f7-oem/nuttx-config/scripts/script.ld +++ b/boards/mro/ctrl-zero-f7-oem/nuttx-config/scripts/script.ld @@ -89,20 +89,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/mro/ctrl-zero-f7/nuttx-config/scripts/script.ld b/boards/mro/ctrl-zero-f7/nuttx-config/scripts/script.ld index 47b29d3493f..f20b38caaba 100644 --- a/boards/mro/ctrl-zero-f7/nuttx-config/scripts/script.ld +++ b/boards/mro/ctrl-zero-f7/nuttx-config/scripts/script.ld @@ -89,20 +89,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/mro/ctrl-zero-h7-oem/nuttx-config/scripts/bootloader_script.ld b/boards/mro/ctrl-zero-h7-oem/nuttx-config/scripts/bootloader_script.ld index 3fb4cc1f33c..bd3b8890f1b 100644 --- a/boards/mro/ctrl-zero-h7-oem/nuttx-config/scripts/bootloader_script.ld +++ b/boards/mro/ctrl-zero-h7-oem/nuttx-config/scripts/bootloader_script.ld @@ -130,20 +130,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/mro/ctrl-zero-h7-oem/nuttx-config/scripts/script.ld b/boards/mro/ctrl-zero-h7-oem/nuttx-config/scripts/script.ld index 02e763a790f..bb0aedb134c 100644 --- a/boards/mro/ctrl-zero-h7-oem/nuttx-config/scripts/script.ld +++ b/boards/mro/ctrl-zero-h7-oem/nuttx-config/scripts/script.ld @@ -131,20 +131,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/mro/ctrl-zero-h7-oem/src/hw_config.h b/boards/mro/ctrl-zero-h7-oem/src/hw_config.h index 8fdaec9e7e4..70f2cd31738 100644 --- a/boards/mro/ctrl-zero-h7-oem/src/hw_config.h +++ b/boards/mro/ctrl-zero-h7-oem/src/hw_config.h @@ -53,8 +53,6 @@ * INTERFACE_USART 1 - (Optional) Scan and use the Serial interface for bootloading * USBDEVICESTRING "PX4 BL FMU v2.x" - USB id string * USBPRODUCTID 0x0011 - PID Should match defconfig - * BOOT_DELAY_ADDRESS 0x000001a0 - (Optional) From the linker script from Linker Script to get a custom - * delay provided by an APP FW * BOARD_TYPE 9 - Must match .prototype boad_id * _FLASH_KBYTES (*(uint16_t *)0x1fff7a22) - Run time flash size detection * BOARD_FLASH_SECTORS ((_FLASH_KBYTES == 0x400) ? 11 : 23) - Run time determine the physical last sector @@ -95,7 +93,6 @@ //#define USE_VBUS_PULL_DOWN #define INTERFACE_USART 1 #define INTERFACE_USART_CONFIG "/dev/ttyS0,115200" -#define BOOT_DELAY_ADDRESS 0x000001a0 #define BOARD_TYPE 1024 #define _FLASH_KBYTES (*(uint32_t *)0x1FF1E880) #define BOARD_FLASH_SECTORS (15) diff --git a/boards/mro/ctrl-zero-h7/nuttx-config/scripts/bootloader_script.ld b/boards/mro/ctrl-zero-h7/nuttx-config/scripts/bootloader_script.ld index 3fb4cc1f33c..bd3b8890f1b 100644 --- a/boards/mro/ctrl-zero-h7/nuttx-config/scripts/bootloader_script.ld +++ b/boards/mro/ctrl-zero-h7/nuttx-config/scripts/bootloader_script.ld @@ -130,20 +130,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/mro/ctrl-zero-h7/nuttx-config/scripts/script.ld b/boards/mro/ctrl-zero-h7/nuttx-config/scripts/script.ld index 02e763a790f..bb0aedb134c 100644 --- a/boards/mro/ctrl-zero-h7/nuttx-config/scripts/script.ld +++ b/boards/mro/ctrl-zero-h7/nuttx-config/scripts/script.ld @@ -131,20 +131,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/mro/ctrl-zero-h7/src/hw_config.h b/boards/mro/ctrl-zero-h7/src/hw_config.h index 8fdaec9e7e4..70f2cd31738 100644 --- a/boards/mro/ctrl-zero-h7/src/hw_config.h +++ b/boards/mro/ctrl-zero-h7/src/hw_config.h @@ -53,8 +53,6 @@ * INTERFACE_USART 1 - (Optional) Scan and use the Serial interface for bootloading * USBDEVICESTRING "PX4 BL FMU v2.x" - USB id string * USBPRODUCTID 0x0011 - PID Should match defconfig - * BOOT_DELAY_ADDRESS 0x000001a0 - (Optional) From the linker script from Linker Script to get a custom - * delay provided by an APP FW * BOARD_TYPE 9 - Must match .prototype boad_id * _FLASH_KBYTES (*(uint16_t *)0x1fff7a22) - Run time flash size detection * BOARD_FLASH_SECTORS ((_FLASH_KBYTES == 0x400) ? 11 : 23) - Run time determine the physical last sector @@ -95,7 +93,6 @@ //#define USE_VBUS_PULL_DOWN #define INTERFACE_USART 1 #define INTERFACE_USART_CONFIG "/dev/ttyS0,115200" -#define BOOT_DELAY_ADDRESS 0x000001a0 #define BOARD_TYPE 1024 #define _FLASH_KBYTES (*(uint32_t *)0x1FF1E880) #define BOARD_FLASH_SECTORS (15) diff --git a/boards/mro/pixracerpro/nuttx-config/scripts/bootloader_script.ld b/boards/mro/pixracerpro/nuttx-config/scripts/bootloader_script.ld index 0b9772c878d..f8b22f0f525 100644 --- a/boards/mro/pixracerpro/nuttx-config/scripts/bootloader_script.ld +++ b/boards/mro/pixracerpro/nuttx-config/scripts/bootloader_script.ld @@ -130,20 +130,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/mro/pixracerpro/nuttx-config/scripts/script.ld b/boards/mro/pixracerpro/nuttx-config/scripts/script.ld index 5102235444c..da6c68135d8 100644 --- a/boards/mro/pixracerpro/nuttx-config/scripts/script.ld +++ b/boards/mro/pixracerpro/nuttx-config/scripts/script.ld @@ -131,20 +131,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/mro/pixracerpro/src/hw_config.h b/boards/mro/pixracerpro/src/hw_config.h index bb074690fe5..fabd09b92a8 100644 --- a/boards/mro/pixracerpro/src/hw_config.h +++ b/boards/mro/pixracerpro/src/hw_config.h @@ -53,8 +53,6 @@ * INTERFACE_USART 1 - (Optional) Scan and use the Serial interface for bootloading * USBDEVICESTRING "PX4 BL FMU v2.x" - USB id string * USBPRODUCTID 0x0011 - PID Should match defconfig - * BOOT_DELAY_ADDRESS 0x000001a0 - (Optional) From the linker script from Linker Script to get a custom - * delay provided by an APP FW * BOARD_TYPE 9 - Must match .prototype boad_id * _FLASH_KBYTES (*(uint16_t *)0x1fff7a22) - Run time flash size detection * BOARD_FLASH_SECTORS ((_FLASH_KBYTES == 0x400) ? 11 : 23) - Run time determine the physical last sector @@ -95,7 +93,6 @@ //#define USE_VBUS_PULL_DOWN #define INTERFACE_USART 1 #define INTERFACE_USART_CONFIG "/dev/ttyS0,115200" -#define BOOT_DELAY_ADDRESS 0x000001a0 #define BOARD_TYPE 1017 #define _FLASH_KBYTES (*(uint32_t *)0x1FF1E880) #define BOARD_FLASH_SECTORS (15) diff --git a/boards/mro/x21-777/nuttx-config/scripts/script.ld b/boards/mro/x21-777/nuttx-config/scripts/script.ld index 70f4ecc6ce5..8671d153cab 100644 --- a/boards/mro/x21-777/nuttx-config/scripts/script.ld +++ b/boards/mro/x21-777/nuttx-config/scripts/script.ld @@ -89,20 +89,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/mro/x21/nuttx-config/scripts/script.ld b/boards/mro/x21/nuttx-config/scripts/script.ld index 6d92733df88..cf3e2bcd203 100644 --- a/boards/mro/x21/nuttx-config/scripts/script.ld +++ b/boards/mro/x21/nuttx-config/scripts/script.ld @@ -65,20 +65,12 @@ EXTERN(_vectors) /* force the vectors to be included in the output */ * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/narinfc/h7/nuttx-config/scripts/bootloader_script.ld b/boards/narinfc/h7/nuttx-config/scripts/bootloader_script.ld index c2eba58f26c..ed55056e974 100644 --- a/boards/narinfc/h7/nuttx-config/scripts/bootloader_script.ld +++ b/boards/narinfc/h7/nuttx-config/scripts/bootloader_script.ld @@ -132,20 +132,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/narinfc/h7/nuttx-config/scripts/script.ld b/boards/narinfc/h7/nuttx-config/scripts/script.ld index f213ad2ff42..dbda50503d1 100644 --- a/boards/narinfc/h7/nuttx-config/scripts/script.ld +++ b/boards/narinfc/h7/nuttx-config/scripts/script.ld @@ -131,20 +131,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/narinfc/h7/src/hw_config.h b/boards/narinfc/h7/src/hw_config.h index 05cb9e67e30..0b0293cec10 100644 --- a/boards/narinfc/h7/src/hw_config.h +++ b/boards/narinfc/h7/src/hw_config.h @@ -53,8 +53,6 @@ * INTERFACE_USART 1 - (Optional) Scan and use the Serial interface for bootloading * USBDEVICESTRING "PX4 BL FMU v2.x" - USB id string * USBPRODUCTID 0x0011 - PID Should match defconfig - * BOOT_DELAY_ADDRESS 0x000001a0 - (Optional) From the linker script from Linker Script to get a custom - * delay provided by an APP FW * BOARD_TYPE 9 - Must match .prototype boad_id * _FLASH_KBYTES (*(uint16_t *)0x1fff7a22) - Run time flash size detection * BOARD_FLASH_SECTORS ((_FLASH_KBYTES == 0x400) ? 11 : 23) - Run time determine the physical last sector @@ -95,7 +93,6 @@ //#define USE_VBUS_PULL_DOWN #define INTERFACE_USART 1 #define INTERFACE_USART_CONFIG "/dev/ttyS4,57600" -#define BOOT_DELAY_ADDRESS 0x000001a0 #define BOARD_TYPE 1183 #define _FLASH_KBYTES (*(uint32_t *)0x1FF1E880) #define BOARD_FLASH_SECTORS (15) diff --git a/boards/nxp/mr-tropic/nuttx-config/scripts/bootloader_script.ld b/boards/nxp/mr-tropic/nuttx-config/scripts/bootloader_script.ld index 81fb1e0c402..82a781993db 100644 --- a/boards/nxp/mr-tropic/nuttx-config/scripts/bootloader_script.ld +++ b/boards/nxp/mr-tropic/nuttx-config/scripts/bootloader_script.ld @@ -34,8 +34,6 @@ EXTERN(g_flash_config) EXTERN(g_image_vector_table) EXTERN(g_boot_data) EXTERN(board_get_manifest) -EXTERN(_bootdelay_signature) - ENTRY(_stext) SECTIONS @@ -81,12 +79,6 @@ SECTIONS _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/nxp/mr-tropic/nuttx-config/scripts/script.ld b/boards/nxp/mr-tropic/nuttx-config/scripts/script.ld index 8e5f852a82f..f5d5cb2db5d 100644 --- a/boards/nxp/mr-tropic/nuttx-config/scripts/script.ld +++ b/boards/nxp/mr-tropic/nuttx-config/scripts/script.ld @@ -35,8 +35,6 @@ EXTERN(g_flash_config) EXTERN(g_image_vector_table) EXTERN(g_boot_data) EXTERN(board_get_manifest) -EXTERN(_bootdelay_signature) - ENTRY(_stext) SECTIONS @@ -90,12 +88,6 @@ SECTIONS _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/nxp/mr-tropic/src/hw_config.h b/boards/nxp/mr-tropic/src/hw_config.h index 22e06802039..7505e2c39a2 100644 --- a/boards/nxp/mr-tropic/src/hw_config.h +++ b/boards/nxp/mr-tropic/src/hw_config.h @@ -28,8 +28,6 @@ * INTERFACE_USART 1 - (Optional) Scan and use the Serial interface for bootloading * USBDEVICESTRING "PX4 BL FMU v2.x" - USB id string * USBPRODUCTID 0x0011 - PID Should match defconfig - * BOOT_DELAY_ADDRESS 0x000001a0 - (Optional) From the linker script from Linker Script to get a custom - * delay provided by an APP FW * BOARD_TYPE 9 - Must match .prototype boad_id * _FLASH_KBYTES (*(uint16_t *)0x1fff7a22) - Run time flash size detection * BOARD_FLASH_SECTORS ((_FLASH_KBYTES == 0x400) ? 11 : 23) - Run time determine the physical last sector @@ -70,7 +68,6 @@ //#define USE_VBUS_PULL_DOWN #define INTERFACE_USART 1 #define INTERFACE_USART_CONFIG "/dev/ttyS0,1500000" -#define BOOT_DELAY_ADDRESS 0x00039FA0 #define BOARD_TYPE 37 // The board has a 64 Mb part with 16384, 4K secors, but we artificialy limit it to 4 Mb // as 1024, 4K sectors diff --git a/boards/px4/fmu-v2/nuttx-config/scripts/script.ld b/boards/px4/fmu-v2/nuttx-config/scripts/script.ld index a2d5f9fd577..f1b12d1780c 100644 --- a/boards/px4/fmu-v2/nuttx-config/scripts/script.ld +++ b/boards/px4/fmu-v2/nuttx-config/scripts/script.ld @@ -66,20 +66,12 @@ EXTERN(_vectors) /* force the vectors to be included in the output */ * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/px4/fmu-v3/nuttx-config/scripts/script.ld b/boards/px4/fmu-v3/nuttx-config/scripts/script.ld index 6d92733df88..cf3e2bcd203 100644 --- a/boards/px4/fmu-v3/nuttx-config/scripts/script.ld +++ b/boards/px4/fmu-v3/nuttx-config/scripts/script.ld @@ -65,20 +65,12 @@ EXTERN(_vectors) /* force the vectors to be included in the output */ * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/px4/fmu-v4/nuttx-config/scripts/script.ld b/boards/px4/fmu-v4/nuttx-config/scripts/script.ld index ff95ca6ba14..934c1591d33 100644 --- a/boards/px4/fmu-v4/nuttx-config/scripts/script.ld +++ b/boards/px4/fmu-v4/nuttx-config/scripts/script.ld @@ -65,20 +65,12 @@ EXTERN(_vectors) /* force the vectors to be included in the output */ * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; KEEP(*(.app_descriptor)) *(.text .text.*) *(.fixup) diff --git a/boards/px4/fmu-v4pro/nuttx-config/scripts/script.ld b/boards/px4/fmu-v4pro/nuttx-config/scripts/script.ld index d43f2e7f3bc..0620a33a6ae 100644 --- a/boards/px4/fmu-v4pro/nuttx-config/scripts/script.ld +++ b/boards/px4/fmu-v4pro/nuttx-config/scripts/script.ld @@ -65,7 +65,6 @@ EXTERN(_vectors) /* force the vectors to be included in the output */ * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) EXTERN(board_get_manifest) SECTIONS @@ -74,12 +73,6 @@ SECTIONS _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/px4/fmu-v5/nuttx-config/scripts/kernel-space.ld b/boards/px4/fmu-v5/nuttx-config/scripts/kernel-space.ld index 8ad6e7bf44a..8214a990ab9 100644 --- a/boards/px4/fmu-v5/nuttx-config/scripts/kernel-space.ld +++ b/boards/px4/fmu-v5/nuttx-config/scripts/kernel-space.ld @@ -46,7 +46,6 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) /* * TODO: Fill in the signature location into TOC from user-space elf EXTERN(_main_toc) @@ -58,12 +57,6 @@ SECTIONS _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; /* *(.main_toc) */ diff --git a/boards/px4/fmu-v5/nuttx-config/scripts/script.ld b/boards/px4/fmu-v5/nuttx-config/scripts/script.ld index d73a97deb9c..85badf2539a 100644 --- a/boards/px4/fmu-v5/nuttx-config/scripts/script.ld +++ b/boards/px4/fmu-v5/nuttx-config/scripts/script.ld @@ -89,7 +89,6 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) EXTERN(_main_toc) SECTIONS @@ -98,12 +97,6 @@ SECTIONS _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.main_toc) *(.text .text.*) *(.fixup) diff --git a/boards/px4/fmu-v5x/nuttx-config/scripts/script.ld b/boards/px4/fmu-v5x/nuttx-config/scripts/script.ld index 3b080f1d2b2..ad276569362 100644 --- a/boards/px4/fmu-v5x/nuttx-config/scripts/script.ld +++ b/boards/px4/fmu-v5x/nuttx-config/scripts/script.ld @@ -89,7 +89,6 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) EXTERN(board_get_manifest) SECTIONS @@ -112,12 +111,6 @@ SECTIONS .text : { _stext = ABSOLUTE(.); . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/px4/fmu-v6c/nuttx-config/scripts/bootloader_script.ld b/boards/px4/fmu-v6c/nuttx-config/scripts/bootloader_script.ld index c10e790824c..6dbc75cee5b 100644 --- a/boards/px4/fmu-v6c/nuttx-config/scripts/bootloader_script.ld +++ b/boards/px4/fmu-v6c/nuttx-config/scripts/bootloader_script.ld @@ -132,20 +132,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/px4/fmu-v6c/nuttx-config/scripts/script.ld b/boards/px4/fmu-v6c/nuttx-config/scripts/script.ld index fcc97ec862f..c6cde153894 100644 --- a/boards/px4/fmu-v6c/nuttx-config/scripts/script.ld +++ b/boards/px4/fmu-v6c/nuttx-config/scripts/script.ld @@ -131,7 +131,6 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) EXTERN(board_get_manifest) SECTIONS @@ -140,12 +139,6 @@ SECTIONS _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/px4/fmu-v6c/src/hw_config.h b/boards/px4/fmu-v6c/src/hw_config.h index 07bf6f40aab..6042415ff1e 100644 --- a/boards/px4/fmu-v6c/src/hw_config.h +++ b/boards/px4/fmu-v6c/src/hw_config.h @@ -28,8 +28,6 @@ * INTERFACE_USART 1 - (Optional) Scan and use the Serial interface for bootloading * USBDEVICESTRING "PX4 BL FMU v2.x" - USB id string * USBPRODUCTID 0x0011 - PID Should match defconfig - * BOOT_DELAY_ADDRESS 0x000001a0 - (Optional) From the linker script from Linker Script to get a custom - * delay provided by an APP FW * BOARD_TYPE 9 - Must match .prototype boad_id * _FLASH_KBYTES (*(uint16_t *)0x1fff7a22) - Run time flash size detection * BOARD_FLASH_SECTORS ((_FLASH_KBYTES == 0x400) ? 11 : 23) - Run time determine the physical last sector @@ -70,7 +68,6 @@ //#define USE_VBUS_PULL_DOWN #define INTERFACE_USART 1 #define INTERFACE_USART_CONFIG "/dev/ttyS0,115200" -#define BOOT_DELAY_ADDRESS 0x000001a0 #define BOARD_TYPE 56 #define _FLASH_KBYTES (*(uint32_t *)0x1FF1E880) #define BOARD_FLASH_SECTORS (15) diff --git a/boards/px4/fmu-v6u/nuttx-config/scripts/bootloader_script.ld b/boards/px4/fmu-v6u/nuttx-config/scripts/bootloader_script.ld index 5d8eb37d9b9..248c2506775 100644 --- a/boards/px4/fmu-v6u/nuttx-config/scripts/bootloader_script.ld +++ b/boards/px4/fmu-v6u/nuttx-config/scripts/bootloader_script.ld @@ -132,20 +132,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/px4/fmu-v6u/nuttx-config/scripts/script.ld b/boards/px4/fmu-v6u/nuttx-config/scripts/script.ld index 673116d74e0..82f4e0eaa6d 100644 --- a/boards/px4/fmu-v6u/nuttx-config/scripts/script.ld +++ b/boards/px4/fmu-v6u/nuttx-config/scripts/script.ld @@ -131,7 +131,6 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) EXTERN(board_get_manifest) SECTIONS @@ -140,12 +139,6 @@ SECTIONS _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/px4/fmu-v6u/src/hw_config.h b/boards/px4/fmu-v6u/src/hw_config.h index 2910288ae88..0271d1d04bf 100644 --- a/boards/px4/fmu-v6u/src/hw_config.h +++ b/boards/px4/fmu-v6u/src/hw_config.h @@ -28,8 +28,6 @@ * INTERFACE_USART 1 - (Optional) Scan and use the Serial interface for bootloading * USBDEVICESTRING "PX4 BL FMU v2.x" - USB id string * USBPRODUCTID 0x0011 - PID Should match defconfig - * BOOT_DELAY_ADDRESS 0x000001a0 - (Optional) From the linker script from Linker Script to get a custom - * delay provided by an APP FW * BOARD_TYPE 9 - Must match .prototype boad_id * _FLASH_KBYTES (*(uint16_t *)0x1fff7a22) - Run time flash size detection * BOARD_FLASH_SECTORS ((_FLASH_KBYTES == 0x400) ? 11 : 23) - Run time determine the physical last sector @@ -70,7 +68,6 @@ //#define USE_VBUS_PULL_DOWN #define INTERFACE_USART 1 #define INTERFACE_USART_CONFIG "/dev/ttyS0,115200" -#define BOOT_DELAY_ADDRESS 0x000001a0 #define BOARD_TYPE 54 #define _FLASH_KBYTES (*(uint32_t *)0x1FF1E880) #define BOARD_FLASH_SECTORS (15) diff --git a/boards/px4/fmu-v6x/nuttx-config/scripts/bootloader_script.ld b/boards/px4/fmu-v6x/nuttx-config/scripts/bootloader_script.ld index 2e6eba3607b..293b6cccece 100644 --- a/boards/px4/fmu-v6x/nuttx-config/scripts/bootloader_script.ld +++ b/boards/px4/fmu-v6x/nuttx-config/scripts/bootloader_script.ld @@ -132,20 +132,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/px4/fmu-v6x/nuttx-config/scripts/script.ld b/boards/px4/fmu-v6x/nuttx-config/scripts/script.ld index b6b341d4e84..32d7cf662ab 100644 --- a/boards/px4/fmu-v6x/nuttx-config/scripts/script.ld +++ b/boards/px4/fmu-v6x/nuttx-config/scripts/script.ld @@ -131,7 +131,6 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) EXTERN(board_get_manifest) SECTIONS @@ -140,12 +139,6 @@ SECTIONS _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/px4/fmu-v6x/src/hw_config.h b/boards/px4/fmu-v6x/src/hw_config.h index 4ad1049fed9..2f413854e84 100644 --- a/boards/px4/fmu-v6x/src/hw_config.h +++ b/boards/px4/fmu-v6x/src/hw_config.h @@ -28,8 +28,6 @@ * INTERFACE_USART 1 - (Optional) Scan and use the Serial interface for bootloading * USBDEVICESTRING "PX4 BL FMU v2.x" - USB id string * USBPRODUCTID 0x0011 - PID Should match defconfig - * BOOT_DELAY_ADDRESS 0x000001a0 - (Optional) From the linker script from Linker Script to get a custom - * delay provided by an APP FW * BOARD_TYPE 9 - Must match .prototype boad_id * _FLASH_KBYTES (*(uint16_t *)0x1fff7a22) - Run time flash size detection * BOARD_FLASH_SECTORS ((_FLASH_KBYTES == 0x400) ? 11 : 23) - Run time determine the physical last sector @@ -70,7 +68,6 @@ //#define USE_VBUS_PULL_DOWN #define INTERFACE_USART 1 #define INTERFACE_USART_CONFIG "/dev/ttyS0,1500000" -#define BOOT_DELAY_ADDRESS 0x000001a0 #define BOARD_TYPE 53 #define _FLASH_KBYTES (*(uint32_t *)0x1FF1E880) #define BOARD_FLASH_SECTORS (15) diff --git a/boards/px4/fmu-v6xrt/nuttx-config/scripts/allyes-script.ld b/boards/px4/fmu-v6xrt/nuttx-config/scripts/allyes-script.ld index 2d4167f1381..e46aa196546 100644 --- a/boards/px4/fmu-v6xrt/nuttx-config/scripts/allyes-script.ld +++ b/boards/px4/fmu-v6xrt/nuttx-config/scripts/allyes-script.ld @@ -46,7 +46,6 @@ EXTERN(g_flash_config) EXTERN(g_image_vector_table) EXTERN(g_boot_data) EXTERN(board_get_manifest) -EXTERN(_bootdelay_signature) EXTERN(imxrt_flexspi_initialize) ENTRY(__start) @@ -101,12 +100,6 @@ SECTIONS _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/px4/fmu-v6xrt/nuttx-config/scripts/bootloader_script.ld b/boards/px4/fmu-v6xrt/nuttx-config/scripts/bootloader_script.ld index af8cf731076..c3912e09adb 100644 --- a/boards/px4/fmu-v6xrt/nuttx-config/scripts/bootloader_script.ld +++ b/boards/px4/fmu-v6xrt/nuttx-config/scripts/bootloader_script.ld @@ -46,8 +46,6 @@ EXTERN(g_flash_config) EXTERN(g_image_vector_table) EXTERN(g_boot_data) EXTERN(board_get_manifest) -EXTERN(_bootdelay_signature) - ENTRY(__start) SECTIONS @@ -99,12 +97,6 @@ SECTIONS _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/px4/fmu-v6xrt/nuttx-config/scripts/script.ld b/boards/px4/fmu-v6xrt/nuttx-config/scripts/script.ld index f9eb6915d07..8858570e3a6 100644 --- a/boards/px4/fmu-v6xrt/nuttx-config/scripts/script.ld +++ b/boards/px4/fmu-v6xrt/nuttx-config/scripts/script.ld @@ -46,7 +46,6 @@ EXTERN(g_flash_config) EXTERN(g_image_vector_table) EXTERN(g_boot_data) EXTERN(board_get_manifest) -EXTERN(_bootdelay_signature) EXTERN(imxrt_flexspi_initialize) ENTRY(__start) @@ -97,12 +96,6 @@ SECTIONS _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/px4/fmu-v6xrt/src/hw_config.h b/boards/px4/fmu-v6xrt/src/hw_config.h index 19611e379cb..a5e8734fdde 100644 --- a/boards/px4/fmu-v6xrt/src/hw_config.h +++ b/boards/px4/fmu-v6xrt/src/hw_config.h @@ -28,8 +28,6 @@ * INTERFACE_USART 1 - (Optional) Scan and use the Serial interface for bootloading * USBDEVICESTRING "PX4 BL FMU v2.x" - USB id string * USBPRODUCTID 0x0011 - PID Should match defconfig - * BOOT_DELAY_ADDRESS 0x000001a0 - (Optional) From the linker script from Linker Script to get a custom - * delay provided by an APP FW * BOARD_TYPE 9 - Must match .prototype boad_id * _FLASH_KBYTES (*(uint16_t *)0x1fff7a22) - Run time flash size detection * BOARD_FLASH_SECTORS ((_FLASH_KBYTES == 0x400) ? 11 : 23) - Run time determine the physical last sector @@ -70,7 +68,6 @@ //#define USE_VBUS_PULL_DOWN #define INTERFACE_USART 1 #define INTERFACE_USART_CONFIG "/dev/ttyS0,1500000" -#define BOOT_DELAY_ADDRESS 0x3003b540 #define BOARD_TYPE 35 // The board has a 64 Mb part with 16384, 4K secors, but we artificialy limit it to 4 Mb // as 1024, 4K sectors diff --git a/boards/radiolink/PIX6/nuttx-config/scripts/kernel-space.ld b/boards/radiolink/PIX6/nuttx-config/scripts/kernel-space.ld index 8ad6e7bf44a..8214a990ab9 100644 --- a/boards/radiolink/PIX6/nuttx-config/scripts/kernel-space.ld +++ b/boards/radiolink/PIX6/nuttx-config/scripts/kernel-space.ld @@ -46,7 +46,6 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) /* * TODO: Fill in the signature location into TOC from user-space elf EXTERN(_main_toc) @@ -58,12 +57,6 @@ SECTIONS _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; /* *(.main_toc) */ diff --git a/boards/radiolink/PIX6/nuttx-config/scripts/script.ld b/boards/radiolink/PIX6/nuttx-config/scripts/script.ld index db0f740cf00..b9a2dce0cc5 100644 --- a/boards/radiolink/PIX6/nuttx-config/scripts/script.ld +++ b/boards/radiolink/PIX6/nuttx-config/scripts/script.ld @@ -89,20 +89,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/saam/saampixv1_1/nuttx-config/scripts/script.ld b/boards/saam/saampixv1_1/nuttx-config/scripts/script.ld index 6d92733df88..cf3e2bcd203 100644 --- a/boards/saam/saampixv1_1/nuttx-config/scripts/script.ld +++ b/boards/saam/saampixv1_1/nuttx-config/scripts/script.ld @@ -65,20 +65,12 @@ EXTERN(_vectors) /* force the vectors to be included in the output */ * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/siyi/n7/nuttx-config/scripts/bootloader_script.ld b/boards/siyi/n7/nuttx-config/scripts/bootloader_script.ld index 43d36e7dc90..61d0c172d88 100644 --- a/boards/siyi/n7/nuttx-config/scripts/bootloader_script.ld +++ b/boards/siyi/n7/nuttx-config/scripts/bootloader_script.ld @@ -132,20 +132,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/siyi/n7/nuttx-config/scripts/script.ld b/boards/siyi/n7/nuttx-config/scripts/script.ld index d6019c0d13f..b918d433794 100644 --- a/boards/siyi/n7/nuttx-config/scripts/script.ld +++ b/boards/siyi/n7/nuttx-config/scripts/script.ld @@ -131,7 +131,6 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) EXTERN(board_get_manifest) SECTIONS @@ -140,12 +139,6 @@ SECTIONS _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/siyi/n7/src/hw_config.h b/boards/siyi/n7/src/hw_config.h index a6b71126e03..2967330579f 100644 --- a/boards/siyi/n7/src/hw_config.h +++ b/boards/siyi/n7/src/hw_config.h @@ -28,8 +28,6 @@ * INTERFACE_USART 1 - (Optional) Scan and use the Serial interface for bootloading * USBDEVICESTRING "PX4 BL FMU v2.x" - USB id string * USBPRODUCTID 0x0011 - PID Should match defconfig - * BOOT_DELAY_ADDRESS 0x000001a0 - (Optional) From the linker script from Linker Script to get a custom - * delay provided by an APP FW * BOARD_TYPE 9 - Must match .prototype boad_id * _FLASH_KBYTES (*(uint16_t *)0x1fff7a22) - Run time flash size detection * BOARD_FLASH_SECTORS ((_FLASH_KBYTES == 0x400) ? 11 : 23) - Run time determine the physical last sector @@ -70,7 +68,6 @@ //#define USE_VBUS_PULL_DOWN #define INTERFACE_USART 1 #define INTERFACE_USART_CONFIG "/dev/ttyS0,115200" -#define BOOT_DELAY_ADDRESS 0x000001a0 #define BOARD_TYPE 1123 #define _FLASH_KBYTES (*(uint32_t *)0x1FF1E880) #define BOARD_FLASH_SECTORS (15) diff --git a/boards/sky-drones/smartap-airlink/nuttx-config/scripts/script.ld b/boards/sky-drones/smartap-airlink/nuttx-config/scripts/script.ld index 8d5a78da6bf..0ed6652fac5 100644 --- a/boards/sky-drones/smartap-airlink/nuttx-config/scripts/script.ld +++ b/boards/sky-drones/smartap-airlink/nuttx-config/scripts/script.ld @@ -89,7 +89,6 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) EXTERN(board_get_manifest) SECTIONS @@ -98,12 +97,6 @@ SECTIONS _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/spracing/h7extreme/nuttx-config/scripts/script.ld b/boards/spracing/h7extreme/nuttx-config/scripts/script.ld index 1076c3ab224..33a39b13f1f 100644 --- a/boards/spracing/h7extreme/nuttx-config/scripts/script.ld +++ b/boards/spracing/h7extreme/nuttx-config/scripts/script.ld @@ -131,8 +131,6 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { @@ -184,12 +182,6 @@ SECTIONS _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.rodata .rodata.*) *(.fixup) diff --git a/boards/svehicle/e2/nuttx-config/scripts/bootloader_script.ld b/boards/svehicle/e2/nuttx-config/scripts/bootloader_script.ld index 2e6eba3607b..293b6cccece 100644 --- a/boards/svehicle/e2/nuttx-config/scripts/bootloader_script.ld +++ b/boards/svehicle/e2/nuttx-config/scripts/bootloader_script.ld @@ -132,20 +132,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/svehicle/e2/nuttx-config/scripts/script.ld b/boards/svehicle/e2/nuttx-config/scripts/script.ld index b6b341d4e84..32d7cf662ab 100644 --- a/boards/svehicle/e2/nuttx-config/scripts/script.ld +++ b/boards/svehicle/e2/nuttx-config/scripts/script.ld @@ -131,7 +131,6 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) EXTERN(board_get_manifest) SECTIONS @@ -140,12 +139,6 @@ SECTIONS _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/svehicle/e2/src/hw_config.h b/boards/svehicle/e2/src/hw_config.h index 73d4ec88df2..69cf2946738 100644 --- a/boards/svehicle/e2/src/hw_config.h +++ b/boards/svehicle/e2/src/hw_config.h @@ -28,8 +28,6 @@ * INTERFACE_USART 1 - (Optional) Scan and use the Serial interface for bootloading * USBDEVICESTRING "PX4 BL FMU v2.x" - USB id string * USBPRODUCTID 0x0011 - PID Should match defconfig - * BOOT_DELAY_ADDRESS 0x000001a0 - (Optional) From the linker script from Linker Script to get a custom - * delay provided by an APP FW * BOARD_TYPE 9 - Must match .prototype boad_id * _FLASH_KBYTES (*(uint16_t *)0x1fff7a22) - Run time flash size detection * BOARD_FLASH_SECTORS ((_FLASH_KBYTES == 0x400) ? 11 : 23) - Run time determine the physical last sector @@ -70,7 +68,6 @@ //#define USE_VBUS_PULL_DOWN #define INTERFACE_USART 1 #define INTERFACE_USART_CONFIG "/dev/ttyS0,1500000" -#define BOOT_DELAY_ADDRESS 0x000001a0 #define BOARD_TYPE 6110 #define _FLASH_KBYTES (*(uint32_t *)0x1FF1E880) #define BOARD_FLASH_SECTORS (15) diff --git a/boards/thepeach/k1/nuttx-config/scripts/script.ld b/boards/thepeach/k1/nuttx-config/scripts/script.ld index 6d92733df88..cf3e2bcd203 100644 --- a/boards/thepeach/k1/nuttx-config/scripts/script.ld +++ b/boards/thepeach/k1/nuttx-config/scripts/script.ld @@ -65,20 +65,12 @@ EXTERN(_vectors) /* force the vectors to be included in the output */ * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/thepeach/r1/nuttx-config/scripts/script.ld b/boards/thepeach/r1/nuttx-config/scripts/script.ld index 6d92733df88..cf3e2bcd203 100644 --- a/boards/thepeach/r1/nuttx-config/scripts/script.ld +++ b/boards/thepeach/r1/nuttx-config/scripts/script.ld @@ -65,20 +65,12 @@ EXTERN(_vectors) /* force the vectors to be included in the output */ * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/uvify/core/nuttx-config/scripts/script.ld b/boards/uvify/core/nuttx-config/scripts/script.ld index 6d92733df88..cf3e2bcd203 100644 --- a/boards/uvify/core/nuttx-config/scripts/script.ld +++ b/boards/uvify/core/nuttx-config/scripts/script.ld @@ -65,20 +65,12 @@ EXTERN(_vectors) /* force the vectors to be included in the output */ * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/x-mav/ap-h743r1/nuttx-config/scripts/bootloader_script.ld b/boards/x-mav/ap-h743r1/nuttx-config/scripts/bootloader_script.ld index abd27222b93..9888db610e0 100644 --- a/boards/x-mav/ap-h743r1/nuttx-config/scripts/bootloader_script.ld +++ b/boards/x-mav/ap-h743r1/nuttx-config/scripts/bootloader_script.ld @@ -130,20 +130,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/x-mav/ap-h743r1/nuttx-config/scripts/script.ld b/boards/x-mav/ap-h743r1/nuttx-config/scripts/script.ld index ace39a1bd74..562a106f801 100644 --- a/boards/x-mav/ap-h743r1/nuttx-config/scripts/script.ld +++ b/boards/x-mav/ap-h743r1/nuttx-config/scripts/script.ld @@ -131,20 +131,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/x-mav/ap-h743r1/src/hw_config.h b/boards/x-mav/ap-h743r1/src/hw_config.h index faffbab7010..32b32260285 100644 --- a/boards/x-mav/ap-h743r1/src/hw_config.h +++ b/boards/x-mav/ap-h743r1/src/hw_config.h @@ -53,8 +53,6 @@ * INTERFACE_USART 1 - (Optional) Scan and use the Serial interface for bootloading * USBDEVICESTRING "PX4 BL FMU v2.x" - USB id string * USBPRODUCTID 0x0011 - PID Should match defconfig - * BOOT_DELAY_ADDRESS 0x000001a0 - (Optional) From the linker script from Linker Script to get a custom - * delay provided by an APP FW * BOARD_TYPE 9 - Must match .prototype boad_id * _FLASH_KBYTES (*(uint16_t *)0x1fff7a22) - Run time flash size detection * BOARD_FLASH_SECTORS ((_FLASH_KBYTES == 0x400) ? 11 : 23) - Run time determine the physical last sector @@ -95,7 +93,6 @@ //#define USE_VBUS_PULL_DOWN // #define INTERFACE_USART 6 #define INTERFACE_USART_CONFIG "/dev/ttyS5,57600" -#define BOOT_DELAY_ADDRESS 0x000001a0 #define BOARD_TYPE 1203 #define _FLASH_KBYTES (*(uint32_t *)0x1FF1E880) #define BOARD_FLASH_SECTORS (15) diff --git a/boards/x-mav/ap-h743v2/nuttx-config/scripts/bootloader_script.ld b/boards/x-mav/ap-h743v2/nuttx-config/scripts/bootloader_script.ld index fb877cc443f..fcf84a4c60e 100644 --- a/boards/x-mav/ap-h743v2/nuttx-config/scripts/bootloader_script.ld +++ b/boards/x-mav/ap-h743v2/nuttx-config/scripts/bootloader_script.ld @@ -130,20 +130,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/x-mav/ap-h743v2/nuttx-config/scripts/script.ld b/boards/x-mav/ap-h743v2/nuttx-config/scripts/script.ld index 1dc1a0ef97e..3686e2d66ec 100644 --- a/boards/x-mav/ap-h743v2/nuttx-config/scripts/script.ld +++ b/boards/x-mav/ap-h743v2/nuttx-config/scripts/script.ld @@ -131,20 +131,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/x-mav/ap-h743v2/src/hw_config.h b/boards/x-mav/ap-h743v2/src/hw_config.h index 5ded44ad093..4955bd65eef 100644 --- a/boards/x-mav/ap-h743v2/src/hw_config.h +++ b/boards/x-mav/ap-h743v2/src/hw_config.h @@ -53,8 +53,6 @@ * INTERFACE_USART 1 - (Optional) Scan and use the Serial interface for bootloading * USBDEVICESTRING "PX4 BL FMU v2.x" - USB id string * USBPRODUCTID 0x0011 - PID Should match defconfig - * BOOT_DELAY_ADDRESS 0x000001a0 - (Optional) From the linker script from Linker Script to get a custom - * delay provided by an APP FW * BOARD_TYPE 9 - Must match .prototype boad_id * _FLASH_KBYTES (*(uint16_t *)0x1fff7a22) - Run time flash size detection * BOARD_FLASH_SECTORS ((_FLASH_KBYTES == 0x400) ? 11 : 23) - Run time determine the physical last sector @@ -95,7 +93,6 @@ //#define USE_VBUS_PULL_DOWN #define INTERFACE_USART 6 #define INTERFACE_USART_CONFIG "/dev/ttyS5,57600" -#define BOOT_DELAY_ADDRESS 0x000001a0 #define BOARD_TYPE 1200 #define BOARD_FLASH_SECTORS (14) #define BOARD_FLASH_SIZE (16 * 128 * 1024) diff --git a/boards/zeroone/x6/nuttx-config/scripts/bootloader_script.ld b/boards/zeroone/x6/nuttx-config/scripts/bootloader_script.ld index 2e6eba3607b..293b6cccece 100644 --- a/boards/zeroone/x6/nuttx-config/scripts/bootloader_script.ld +++ b/boards/zeroone/x6/nuttx-config/scripts/bootloader_script.ld @@ -132,20 +132,12 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) - SECTIONS { .text : { _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/zeroone/x6/nuttx-config/scripts/script.ld b/boards/zeroone/x6/nuttx-config/scripts/script.ld index b6b341d4e84..32d7cf662ab 100644 --- a/boards/zeroone/x6/nuttx-config/scripts/script.ld +++ b/boards/zeroone/x6/nuttx-config/scripts/script.ld @@ -131,7 +131,6 @@ ENTRY(_stext) * code pulled in by libgcc.a requires it (and that code cannot be easily avoided). */ EXTERN(abort) -EXTERN(_bootdelay_signature) EXTERN(board_get_manifest) SECTIONS @@ -140,12 +139,6 @@ SECTIONS _stext = ABSOLUTE(.); *(.vectors) . = ALIGN(32); - /* - This signature provides the bootloader with a way to delay booting - */ - _bootdelay_signature = ABSOLUTE(.); - FILL(0xffecc2925d7d05c5) - . += 8; *(.text .text.*) *(.fixup) *(.gnu.warning) diff --git a/boards/zeroone/x6/src/hw_config.h b/boards/zeroone/x6/src/hw_config.h index 1873df6dc13..fd0b45627ca 100644 --- a/boards/zeroone/x6/src/hw_config.h +++ b/boards/zeroone/x6/src/hw_config.h @@ -28,8 +28,6 @@ * INTERFACE_USART 1 - (Optional) Scan and use the Serial interface for bootloading * USBDEVICESTRING "PX4 BL FMU v2.x" - USB id string * USBPRODUCTID 0x0011 - PID Should match defconfig - * BOOT_DELAY_ADDRESS 0x000001a0 - (Optional) From the linker script from Linker Script to get a custom - * delay provided by an APP FW * BOARD_TYPE 9 - Must match .prototype boad_id * _FLASH_KBYTES (*(uint16_t *)0x1fff7a22) - Run time flash size detection * BOARD_FLASH_SECTORS ((_FLASH_KBYTES == 0x400) ? 11 : 23) - Run time determine the physical last sector @@ -70,7 +68,6 @@ //#define USE_VBUS_PULL_DOWN #define INTERFACE_USART 1 #define INTERFACE_USART_CONFIG "/dev/ttyS0,1500000" -#define BOOT_DELAY_ADDRESS 0x000001a0 #define BOARD_TYPE 5600 #define _FLASH_KBYTES (*(uint32_t *)0x1FF1E880) #define BOARD_FLASH_SECTORS (15) diff --git a/platforms/nuttx/src/bootloader/common/bl.c b/platforms/nuttx/src/bootloader/common/bl.c index 7690fe062aa..a36db7756ee 100644 --- a/platforms/nuttx/src/bootloader/common/bl.c +++ b/platforms/nuttx/src/bootloader/common/bl.c @@ -104,7 +104,7 @@ #define PROTO_GET_OTP 0x2a // read a byte from OTP at the given address #define PROTO_GET_SN 0x2b // read a word from UDID area ( Serial) at the given address #define PROTO_GET_CHIP 0x2c // read chip version (MCU IDCODE) -#define PROTO_SET_DELAY 0x2d // set minimum boot delay +#define PROTO_SET_DELAY 0x2d // set boot delay (deprecated; always NACKed) #define PROTO_GET_CHIP_DES 0x2e // read chip version In ASCII #define PROTO_GET_VERSION 0x2f // read version #define PROTO_BOOT 0x30 // boot the application @@ -1021,49 +1021,19 @@ bootloader(unsigned timeout) } break; -#ifdef BOOT_DELAY_ADDRESS - - case PROTO_SET_DELAY: { - /* - Allow for the bootloader to setup a - boot delay signature which tells the - board to delay for at least a - specified number of seconds on boot. - */ - int v = cin_wait(100); - - if (v < 0) { - goto cmd_bad; - } - - uint8_t boot_delay = v & 0xFF; - - if (boot_delay > BOOT_DELAY_MAX) { - goto cmd_bad; - } - - // expect EOC - if (!wait_for_eoc(2)) { - goto cmd_bad; - } - - uint32_t sig1 = flash_func_read_word(BOOT_DELAY_ADDRESS); - uint32_t sig2 = flash_func_read_word(BOOT_DELAY_ADDRESS + 4); - - if (sig1 != BOOT_DELAY_SIGNATURE1 || - sig2 != BOOT_DELAY_SIGNATURE2) { - goto cmd_bad; - } - - uint32_t value = (BOOT_DELAY_SIGNATURE1 & 0xFFFFFF00) | boot_delay; - flash_func_write_word(BOOT_DELAY_ADDRESS, value); - - if (flash_func_read_word(BOOT_DELAY_ADDRESS) != value) { - goto cmd_fail; - } - } - break; -#endif + case PROTO_SET_DELAY: + /* + * Boot delay used to let the bootloader pause before + * starting the app by writing a signature next to the + * vector table. It never worked correctly on modern + * FMUs (signature was placed past where the bootloader + * looked, H7 flash granularity prevented single-word + * writes, and the flash cache never flushed the write), + * so it has been removed. NACK so a client that still + * sends it gets a clear rejection instead of silent + * fake success. + */ + goto cmd_bad; // finalise programming and boot the system // diff --git a/platforms/nuttx/src/bootloader/common/bl.h b/platforms/nuttx/src/bootloader/common/bl.h index 080bc47e0f3..7fc4386f3b1 100644 --- a/platforms/nuttx/src/bootloader/common/bl.h +++ b/platforms/nuttx/src/bootloader/common/bl.h @@ -89,12 +89,6 @@ extern int buf_get(void); #define LED_ACTIVITY 1 #define LED_BOOTLOADER 2 -#ifdef BOOT_DELAY_ADDRESS -# define BOOT_DELAY_SIGNATURE1 0x92c2ecff -# define BOOT_DELAY_SIGNATURE2 0xc5057d5d -# define BOOT_DELAY_MAX 30 -#endif - #define MAX_DES_LENGTH 20 #define MAX_VERSION_LENGTH 32 diff --git a/platforms/nuttx/src/bootloader/common/image_toc.c b/platforms/nuttx/src/bootloader/common/image_toc.c index 3d8494f6daf..ffb3c1d0579 100644 --- a/platforms/nuttx/src/bootloader/common/image_toc.c +++ b/platforms/nuttx/src/bootloader/common/image_toc.c @@ -41,6 +41,13 @@ #include "image_toc.h" #include "bl.h" +#include "crypto.h" + +#ifdef BOOTLOADER_USE_TOC + +#ifndef BOARD_IMAGE_TOC_OFFSET +# error "BOARD_IMAGE_TOC_OFFSET must be defined when BOOTLOADER_USE_TOC is enabled" +#endif /* Helper macros to define flash start and end addresses, based on info from * hw_config.h @@ -50,7 +57,7 @@ bool find_toc(const image_toc_entry_t **toc_entries, uint8_t *len) { - const uintptr_t toc_start_u32 = APP_LOAD_ADDRESS + BOOT_DELAY_ADDRESS + 8; + const uintptr_t toc_start_u32 = APP_LOAD_ADDRESS + BOARD_IMAGE_TOC_OFFSET; const image_toc_start_t *toc_start = (const image_toc_start_t *)toc_start_u32; const image_toc_entry_t *entry = (const image_toc_entry_t *)(toc_start_u32 + sizeof(image_toc_start_t)); @@ -105,3 +112,14 @@ bool find_toc(const image_toc_entry_t **toc_entries, uint8_t *len) *len = 0; return false; } + +#else // BOOTLOADER_USE_TOC + +bool find_toc(const image_toc_entry_t **toc_entries, uint8_t *len) +{ + (void)toc_entries; + (void)len; + return false; +} + +#endif // BOOTLOADER_USE_TOC diff --git a/platforms/nuttx/src/bootloader/nxp/imxrt_common/main.c b/platforms/nuttx/src/bootloader/nxp/imxrt_common/main.c index a137c8477bc..98e6aa92aa6 100644 --- a/platforms/nuttx/src/bootloader/nxp/imxrt_common/main.c +++ b/platforms/nuttx/src/bootloader/nxp/imxrt_common/main.c @@ -744,33 +744,6 @@ bootloader_main(void) board_set_rtc_signature(0); } -#ifdef BOOT_DELAY_ADDRESS - { - /* - if a boot delay signature is present then delay the boot - by at least that amount of time in seconds. This allows - for an opportunity for a companion computer to load a - new firmware, while still booting fast by sending a BOOT - command - */ - uint32_t sig1 = flash_func_read_word(BOOT_DELAY_ADDRESS); - uint32_t sig2 = flash_func_read_word(BOOT_DELAY_ADDRESS + 4); - - if (sig2 == BOOT_DELAY_SIGNATURE2 && - (sig1 & 0xFFFFFF00) == (BOOT_DELAY_SIGNATURE1 & 0xFFFFFF00)) { - unsigned boot_delay = sig1 & 0xFF; - - if (boot_delay <= BOOT_DELAY_MAX) { - try_boot = false; - - if (timeout < boot_delay * 1000) { - timeout = boot_delay * 1000; - } - } - } - } -#endif - /* * Check if the force-bootloader pins are strapped; if strapped, * don't try booting. diff --git a/platforms/nuttx/src/bootloader/stm/stm32_common/main.c b/platforms/nuttx/src/bootloader/stm/stm32_common/main.c index 9b3bab50222..4713660703d 100644 --- a/platforms/nuttx/src/bootloader/stm/stm32_common/main.c +++ b/platforms/nuttx/src/bootloader/stm/stm32_common/main.c @@ -687,33 +687,6 @@ bootloader_main(void) board_set_rtc_signature(0); } -#ifdef BOOT_DELAY_ADDRESS - { - /* - if a boot delay signature is present then delay the boot - by at least that amount of time in seconds. This allows - for an opportunity for a companion computer to load a - new firmware, while still booting fast by sending a BOOT - command - */ - uint32_t sig1 = flash_func_read_word(BOOT_DELAY_ADDRESS); - uint32_t sig2 = flash_func_read_word(BOOT_DELAY_ADDRESS + 4); - - if (sig2 == BOOT_DELAY_SIGNATURE2 && - (sig1 & 0xFFFFFF00) == (BOOT_DELAY_SIGNATURE1 & 0xFFFFFF00)) { - unsigned boot_delay = sig1 & 0xFF; - - if (boot_delay <= BOOT_DELAY_MAX) { - try_boot = false; - - if (timeout < boot_delay * 1000) { - timeout = boot_delay * 1000; - } - } - } - } -#endif - /* * Check if the force-bootloader pins are strapped; if strapped, * don't try booting.