Изменен файл ld
This commit is contained in:
parent
3ff912900d
commit
1cc7894b71
|
|
@ -85,6 +85,66 @@ SECTIONS
|
||||||
{
|
{
|
||||||
/* LONG(_FirmwareSize - 4) ;*/ /* word with firmware_size */
|
/* LONG(_FirmwareSize - 4) ;*/ /* word with firmware_size */
|
||||||
|
|
||||||
|
KEEP(*(.meta2_fw_name_size))
|
||||||
|
KEEP(*(.meta2_fw_name))
|
||||||
|
|
||||||
|
KEEP(*(.meta2_internal_hw_year))
|
||||||
|
KEEP(*(.meta2_internal_hw_month))
|
||||||
|
KEEP(*(.meta2_internal_hw_day))
|
||||||
|
KEEP(*(.meta2_internal_hw_rev))
|
||||||
|
|
||||||
|
KEEP(*(.meta2_internal_sw_year))
|
||||||
|
KEEP(*(.meta2_internal_sw_month))
|
||||||
|
KEEP(*(.meta2_internal_sw_day))
|
||||||
|
KEEP(*(.meta2_internal_sw_rev))
|
||||||
|
|
||||||
|
KEEP(*(.meta2_internal_mdb_year))
|
||||||
|
KEEP(*(.meta2_internal_mdb_month))
|
||||||
|
KEEP(*(.meta2_internal_mdb_day))
|
||||||
|
KEEP(*(.meta2_internal_mdb_rev))
|
||||||
|
|
||||||
|
KEEP(*(.meta2_finger_module))
|
||||||
|
KEEP(*(.meta2_finger_tester_serial))
|
||||||
|
KEEP(*(.meta2_finger_year))
|
||||||
|
KEEP(*(.meta2_finger_month))
|
||||||
|
KEEP(*(.meta2_finger_day))
|
||||||
|
|
||||||
|
. = ALIGN(256);
|
||||||
|
} > PFLASH_MAIN_META
|
||||||
|
|
||||||
|
_CalSlotSize = 32K;
|
||||||
|
|
||||||
|
.caltext : SUBALIGN(4)
|
||||||
|
{
|
||||||
|
__caltext_start = .;
|
||||||
|
|
||||||
|
__caltext0_start = .;
|
||||||
|
KEEP(*(.caltext0))
|
||||||
|
. = __caltext0_start + _CalSlotSize;
|
||||||
|
|
||||||
|
__caltext1_start = .;
|
||||||
|
KEEP(*(.caltext1))
|
||||||
|
. = __caltext1_start + _CalSlotSize;
|
||||||
|
|
||||||
|
__caltext2_start = .;
|
||||||
|
KEEP(*(.caltext2))
|
||||||
|
. = __caltext2_start + _CalSlotSize;
|
||||||
|
|
||||||
|
__caltext3_start = .;
|
||||||
|
KEEP(*(.caltext3))
|
||||||
|
. = __caltext3_start + _CalSlotSize;
|
||||||
|
|
||||||
|
__caltext4_start = .;
|
||||||
|
KEEP(*(.caltext4))
|
||||||
|
. = __caltext4_start + _CalSlotSize;
|
||||||
|
|
||||||
|
__caltext_end = .;
|
||||||
|
} > PFLASH_CALIB
|
||||||
|
|
||||||
|
.meta_main : SUBALIGN(3)
|
||||||
|
{
|
||||||
|
/*LONG(0) ;*/ /* word with firmware_size */
|
||||||
|
|
||||||
KEEP(*(.meta_fw_name_size))
|
KEEP(*(.meta_fw_name_size))
|
||||||
KEEP(*(.meta_fw_name))
|
KEEP(*(.meta_fw_name))
|
||||||
|
|
||||||
|
|
@ -109,22 +169,6 @@ SECTIONS
|
||||||
KEEP(*(.meta_finger_month))
|
KEEP(*(.meta_finger_month))
|
||||||
KEEP(*(.meta_finger_day))
|
KEEP(*(.meta_finger_day))
|
||||||
|
|
||||||
. = ALIGN(256);
|
|
||||||
} > PFLASH_MAIN_META
|
|
||||||
|
|
||||||
|
|
||||||
.caltext : SUBALIGN(2)
|
|
||||||
{
|
|
||||||
__caltext_start = .;
|
|
||||||
KEEP(*(.caltext))
|
|
||||||
__caltext_end = .;
|
|
||||||
. = ALIGN(4);
|
|
||||||
} > PFLASH_CALIB
|
|
||||||
|
|
||||||
.meta_main : SUBALIGN(3)
|
|
||||||
{
|
|
||||||
LONG(0) ; /* word with firmware_size */
|
|
||||||
|
|
||||||
. = ALIGN(256);
|
. = ALIGN(256);
|
||||||
} > PFLASH_CALIB_META
|
} > PFLASH_CALIB_META
|
||||||
|
|
||||||
|
|
@ -189,12 +233,12 @@ SECTIONS
|
||||||
KEEP(*(.caldata))
|
KEEP(*(.caldata))
|
||||||
. = ALIGN(4);
|
. = ALIGN(4);
|
||||||
|
|
||||||
/* Проверяем и резервируем 20K */
|
/* Проверяем и резервируем 32K */
|
||||||
__caldata_actual_size = . - __caldata_start;
|
__caldata_actual_size = . - __caldata_start;
|
||||||
ASSERT(__caldata_actual_size <= 20K, "Ошибка: .caldata превышает 20K!");
|
ASSERT(__caldata_actual_size <= 32K, "Ошибка: .caldata превышает 32K!");
|
||||||
|
|
||||||
/* Если данные меньше 20K, резервируем оставшееся пространство */
|
/* Если данные меньше 32K, резервируем оставшееся пространство */
|
||||||
. = __caldata_start + 20K;
|
. = __caldata_start + 32K;
|
||||||
|
|
||||||
KEEP(*(.nvmdata))
|
KEEP(*(.nvmdata))
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -9,14 +9,18 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#define SECT_SRAM_CAL __attribute__((section (".caldata")))
|
#define SECT_SRAM_CAL __attribute__((section (".caldata")))
|
||||||
#define SECT_FLASH_CAL __attribute__((section (".caltext")))
|
#define SECT_FLASH_CAL0 __attribute__((section (".caltext0")))
|
||||||
|
#define SECT_FLASH_CAL1 __attribute__((section (".caltext1")))
|
||||||
|
#define SECT_FLASH_CAL2 __attribute__((section (".caltext2")))
|
||||||
|
#define SECT_FLASH_CAL3 __attribute__((section (".caltext3")))
|
||||||
|
#define SECT_FLASH_CAL4 __attribute__((section (".caltext4")))
|
||||||
#define SECT_SRAM_NVM __attribute__((section (".nvmdata")))
|
#define SECT_SRAM_NVM __attribute__((section (".nvmdata")))
|
||||||
|
|
||||||
#define SECT_VEH_CAL_0 SECT_FLASH_CAL
|
#define SECT_VEH_CAL_0 SECT_FLASH_CAL0
|
||||||
#define SECT_VEH_CAL_1 SECT_FLASH_CAL
|
#define SECT_VEH_CAL_1 SECT_FLASH_CAL1
|
||||||
#define SECT_VEH_CAL_2 SECT_FLASH_CAL
|
#define SECT_VEH_CAL_2 SECT_FLASH_CAL2
|
||||||
#define SECT_VEH_CAL_3 SECT_FLASH_CAL
|
#define SECT_VEH_CAL_3 SECT_FLASH_CAL3
|
||||||
#define SECT_VEH_CAL_4 SECT_FLASH_CAL
|
#define SECT_VEH_CAL_4 SECT_FLASH_CAL4
|
||||||
|
|
||||||
#define tU08 uint8_t
|
#define tU08 uint8_t
|
||||||
#define tU16 uint16_t
|
#define tU16 uint16_t
|
||||||
|
|
|
||||||
|
|
@ -1022,6 +1022,7 @@ static _Noreturn void ModelTask_Thread(tModelTask *env) {
|
||||||
memcpy(&env->ccu_candb_dbg_tx.dbg_Sen_Demist, &rtY.dbg_Sen_Demist_model_out, sizeof(env->ccu_candb_dbg_tx.dbg_Sen_Demist));
|
memcpy(&env->ccu_candb_dbg_tx.dbg_Sen_Demist, &rtY.dbg_Sen_Demist_model_out, sizeof(env->ccu_candb_dbg_tx.dbg_Sen_Demist));
|
||||||
memcpy(&env->ccu_candb_dbg_tx.dbg_PID_tune, &rtY.dbg_PID_valve_model_out, sizeof(env->ccu_candb_dbg_tx.dbg_PID_tune));
|
memcpy(&env->ccu_candb_dbg_tx.dbg_PID_tune, &rtY.dbg_PID_valve_model_out, sizeof(env->ccu_candb_dbg_tx.dbg_PID_tune));
|
||||||
|
|
||||||
|
|
||||||
//конец--------------------------------------------------ВЫХОД МОДЕЛИ ДЛЯ CAN-------------------------------------------
|
//конец--------------------------------------------------ВЫХОД МОДЕЛИ ДЛЯ CAN-------------------------------------------
|
||||||
|
|
||||||
//начало--------------------------------------------------ВЫХОД МОДЕЛИ ДЛЯ Lin4-----------------------------------------
|
//начало--------------------------------------------------ВЫХОД МОДЕЛИ ДЛЯ Lin4-----------------------------------------
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue