From 364ea279de9943a70e043d047c184882d6fa800b Mon Sep 17 00:00:00 2001 From: cfif Date: Mon, 25 May 2026 15:42:16 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- APP/FC7240_flash.ld | 22 +++------------------- APP/main.c | 4 ++-- 2 files changed, 5 insertions(+), 21 deletions(-) diff --git a/APP/FC7240_flash.ld b/APP/FC7240_flash.ld index 34580a2..4edee5a 100644 --- a/APP/FC7240_flash.ld +++ b/APP/FC7240_flash.ld @@ -6,10 +6,10 @@ M_VECTOR_RAM_SIZE = 0x0400; _MetadataSize = 256; -_BootloaderSize = 256K; +_BootloaderSize = 128K; _BootloaderBegin = 0x01000000; /* BANK1 */ -_FirmwareSize = 768K; +_FirmwareSize = 704K + 192K; _FirmwareMainBegin = _BootloaderBegin + _BootloaderSize; _FirmwareRecoveryBegin = 0x01100000; /* BANK2 */ @@ -25,8 +25,7 @@ MEMORY PFLASH_BOOT (RW) : ORIGIN = _BootloaderBegin, LENGTH = _BootloaderSize /* 256K */ PFLASH_BOOT_META (RW) : ORIGIN = _BootloaderBegin + _BootloaderSize - _MetadataSize, LENGTH = _MetadataSize - PFLASH_MAIN (RW) : ORIGIN = _FirmwareMainBegin, LENGTH = _FirmwareSize /* 768K */ - PFLASH_RECOVERY (RW) : ORIGIN = _FirmwareRecoveryBegin, LENGTH = _FirmwareSize /* 512K */ + DFLASH (RW) : ORIGIN = 0x04000000, LENGTH = 0x00020000 /* 128KB */ @@ -174,21 +173,6 @@ SECTIONS - - .xcp_data(NOLOAD) : - { - __xcp_start = .; - KEEP(*(.xcpdata)) - __xcp_end = .; - . = ALIGN(4); - } > SRAM0 - - .cals_text : - { - KEEP(*(.caltext)) - . = ALIGN(4); - } > DFLASH - .bss(NOLOAD) : { . = ALIGN(4); diff --git a/APP/main.c b/APP/main.c index 4dda84d..6a9681f 100644 --- a/APP/main.c +++ b/APP/main.c @@ -13,8 +13,8 @@ #include "BootJump.h" #include "FirmwareLoader.h" -#define BOOT_AREA_LENGTH (256 * 1024) // Размер загрузчика -#define FIRMWARE_MAIN_AREA_LENGTH (768 * 1024) // Размер основной программы +#define BOOT_AREA_LENGTH (128 * 1024) // Размер загрузчика +#define FIRMWARE_MAIN_AREA_LENGTH ((704 + 192) * 1024) // Размер основной программы + калибровки #define FIRMWARE_MAIN_ADDR (0x01000000 + BOOT_AREA_LENGTH) // Адрес основной программы #define FIRMWARE_MAIN_UPDATE_ADDR 0x01100000 // Адрес основной программы (обновление)