From 0aa05355e751f97b01741df55907b216daeca30c Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 28 Nov 2024 08:27:03 +1100 Subject: [PATCH] remove all references to firmware_version and FLASH_VERSION this was for the old Makefile build, and is not used at all --- Mcu/e230/GD32E230K8_FLASH.ld | 8 -------- Mcu/f031/STM32F031C6TX_FLASH.ld | 13 +------------ Mcu/f051/STM32F051K6TX_FLASH.ld | 11 +---------- Mcu/f415/ldscript.ld | 9 --------- Mcu/f421/AT32F421x6_FLASH.ld | 8 -------- Mcu/g071/STM32G071GBUX_FLASH.ld | 11 +---------- Mcu/g431/STM32G431_FLASH.ld | 13 ++----------- Mcu/l431/ldscript.ld | 8 -------- STM32F051K6TX_FLASH.ld | 10 +--------- 9 files changed, 6 insertions(+), 85 deletions(-) diff --git a/Mcu/e230/GD32E230K8_FLASH.ld b/Mcu/e230/GD32E230K8_FLASH.ld index dbc25809..6cbf4973 100644 --- a/Mcu/e230/GD32E230K8_FLASH.ld +++ b/Mcu/e230/GD32E230K8_FLASH.ld @@ -12,7 +12,6 @@ _Min_Stack_Size = 0x400; /* required amount of stack */ MEMORY { FLASH (rx) : ORIGIN = 0x08001000, LENGTH = 27K -FLASH_VERSION (rx) : ORIGIN = 0x08007C00 - 48, LENGTH = 16 FILE_NAME (rx) : ORIGIN = 0x08007C00 - 32, LENGTH = 32 EEPROM (rx) : ORIGIN = 0x08007C00, LENGTH = 1K RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 16K @@ -84,13 +83,6 @@ SECTIONS PROVIDE_HIDDEN (__fini_array_end = .); } >FLASH - .firmware_version : - { - . = ALIGN(4); - KEEP (*(.firmware_info)) - . = ALIGN(4); - } >FLASH_VERSION - /* The file name */ .file_name : { diff --git a/Mcu/f031/STM32F031C6TX_FLASH.ld b/Mcu/f031/STM32F031C6TX_FLASH.ld index 340cc447..66e0d58b 100644 --- a/Mcu/f031/STM32F031C6TX_FLASH.ld +++ b/Mcu/f031/STM32F031C6TX_FLASH.ld @@ -39,8 +39,7 @@ MEMORY SRAM (xrw) : ORIGIN = 0x20000000, LENGTH = 192 RAM (xrw) : ORIGIN = 0x200000C0, LENGTH = 4K - 192 FLASH_VECTAB (rx) : ORIGIN = 0x08001000, LENGTH = 192 - FLASH_VERSION (rx) : ORIGIN = 0x080010C0, LENGTH = 16 - FLASH (rx) : ORIGIN = ORIGIN(FLASH_VERSION) + LENGTH(FLASH_VERSION), LENGTH = 27K - 32 -(LENGTH(FLASH_VECTAB) + LENGTH(FLASH_VERSION)) + FLASH (rx) : ORIGIN = ORIGIN(FLASH_VECTAB) + LENGTH(FLASH_VECTAB), LENGTH = 27K - 32 - LENGTH(FLASH_VECTAB) FILE_NAME (rx) : ORIGIN = 0x08007C00 - 32, LENGTH = 32 EEPROM (rx) : ORIGIN = 0x080007C00, LENGTH = 1K @@ -56,16 +55,6 @@ SECTIONS KEEP(*(.isr_vector)) /* Startup code */ . = ALIGN(4); } >FLASH_VECTAB - - /* The firmware version and name - at a fixed address to make it possible to read it from firmware files. */ - .firmware_version : - { - . = ALIGN(4); - KEEP (*(.firmware_info)) - . = ALIGN(4); - } >FLASH_VERSION - - /* The program code and other data into "FLASH" Rom type memory */ .text : diff --git a/Mcu/f051/STM32F051K6TX_FLASH.ld b/Mcu/f051/STM32F051K6TX_FLASH.ld index fb4daf34..c2415d0a 100644 --- a/Mcu/f051/STM32F051K6TX_FLASH.ld +++ b/Mcu/f051/STM32F051K6TX_FLASH.ld @@ -40,8 +40,7 @@ MEMORY SRAM (xrw) : ORIGIN = 0x20000000, LENGTH = 192 RAM (xrw) : ORIGIN = 0x200000C0, LENGTH = 8K - 192 FLASH_VECTAB (rx) : ORIGIN = 0x08001000, LENGTH = 192 - FLASH_VERSION (rx) : ORIGIN = 0x080010C0, LENGTH = 16 - FLASH (rx) : ORIGIN = ORIGIN(FLASH_VERSION) + LENGTH(FLASH_VERSION), LENGTH = 27K - 32 - (LENGTH(FLASH_VECTAB) + LENGTH(FLASH_VERSION)) + FLASH (rx) : ORIGIN = ORIGIN(FLASH_VECTAB) + LENGTH(FLASH_VECTAB), LENGTH = 27K - 32 - LENGTH(FLASH_VECTAB) FILE_NAME (rx) : ORIGIN = 0x08007C00 - 32, LENGTH = 32 EEPROM (rx) : ORIGIN = 0x08007C00, LENGTH = 1K } @@ -57,14 +56,6 @@ SECTIONS . = ALIGN(4); } >FLASH_VECTAB - /* The firmware version and name - at a fixed address to make it possible to read it from firmware files. */ - .firmware_version : - { - . = ALIGN(4); - KEEP (*(.firmware_info)) - . = ALIGN(4); - } >FLASH_VERSION - /* The program code and other data into "FLASH" Rom type memory */ .text : { diff --git a/Mcu/f415/ldscript.ld b/Mcu/f415/ldscript.ld index 5727cb8d..bf03bae9 100644 --- a/Mcu/f415/ldscript.ld +++ b/Mcu/f415/ldscript.ld @@ -34,7 +34,6 @@ MEMORY RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 16K FLASH (rx) : ORIGIN = 0x08001000, LENGTH = 57K EEPROM (rx) : ORIGIN = 0x0800f800, LENGTH = 2K - FLASH_VERSION (rx) : ORIGIN = ORIGIN(EEPROM) - 48, LENGTH = 16 FILE_NAME (rx) : ORIGIN = ORIGIN(EEPROM) - 32, LENGTH = 32 } @@ -103,14 +102,6 @@ SECTIONS PROVIDE_HIDDEN (__fini_array_end = .); } >FLASH - .firmware_version : - { - . = ALIGN(4); - KEEP (*(.firmware_info)) - . = ALIGN(4); - } >FLASH_VERSION - - /* The file name */ .file_name : { diff --git a/Mcu/f421/AT32F421x6_FLASH.ld b/Mcu/f421/AT32F421x6_FLASH.ld index 90fa21fd..b6a1e336 100644 --- a/Mcu/f421/AT32F421x6_FLASH.ld +++ b/Mcu/f421/AT32F421x6_FLASH.ld @@ -39,7 +39,6 @@ _Min_Stack_Size = 0x400; /* required amount of stack */ MEMORY { FLASH (rx) : ORIGIN = 0x08001000, LENGTH = 27K -FLASH_VERSION (rx) : ORIGIN = 0x08007C00 - 48, LENGTH = 16 FILE_NAME (rx) : ORIGIN = 0x08007C00 - 32, LENGTH = 32 EEPROM (rx) : ORIGIN = 0x08007C00, LENGTH = 1K RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 15K @@ -111,13 +110,6 @@ SECTIONS PROVIDE_HIDDEN (__fini_array_end = .); } >FLASH - .firmware_version : - { - . = ALIGN(4); - KEEP (*(.firmware_info)) - . = ALIGN(4); - } >FLASH_VERSION - /* The file name */ .file_name : { diff --git a/Mcu/g071/STM32G071GBUX_FLASH.ld b/Mcu/g071/STM32G071GBUX_FLASH.ld index e4ab7737..6d363ad4 100644 --- a/Mcu/g071/STM32G071GBUX_FLASH.ld +++ b/Mcu/g071/STM32G071GBUX_FLASH.ld @@ -41,8 +41,7 @@ MEMORY { RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 36K FLASH_VECTAB (rx) : ORIGIN = 0x08001000, LENGTH = 192 - FLASH_VERSION (rx) : ORIGIN = 0x080010C0, LENGTH = 16 - FLASH (rx) : ORIGIN = ORIGIN(FLASH_VERSION) + LENGTH(FLASH_VERSION), LENGTH = 62K - 32 - (LENGTH(FLASH_VECTAB) + LENGTH(FLASH_VERSION)) + FLASH (rx) : ORIGIN = ORIGIN(FLASH_VECTAB) + LENGTH(FLASH_VECTAB), LENGTH = 62K - 32 - LENGTH(FLASH_VECTAB) FILE_NAME (rx) : ORIGIN = 0x0800F800 - 32, LENGTH = 32 EEPROM (rx) : ORIGIN = 0x0800F800, LENGTH = 2K } @@ -58,14 +57,6 @@ SECTIONS . = ALIGN(4); } >FLASH_VECTAB - /* The firmware version and name - at a fixed address to make it possible to read it from firmware files. */ - .firmware_version : - { - . = ALIGN(4); - KEEP (*(.firmware_info)) - . = ALIGN(4); - } >FLASH_VERSION - /* The program code and other data into "FLASH" Rom type memory */ .text : { diff --git a/Mcu/g431/STM32G431_FLASH.ld b/Mcu/g431/STM32G431_FLASH.ld index 43dc157e..73e644a0 100644 --- a/Mcu/g431/STM32G431_FLASH.ld +++ b/Mcu/g431/STM32G431_FLASH.ld @@ -14,9 +14,8 @@ _Min_Stack_Size = 0x400 ; /* required amount of stack */ MEMORY { RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 32K - FLASH_VECTAB (rx) : ORIGIN = 0x08001000, LENGTH = 192 - FLASH_VERSION (rx) : ORIGIN = 0x080010C0, LENGTH = 16 - FLASH (rx) : ORIGIN = ORIGIN(FLASH_VERSION) + LENGTH(FLASH_VERSION), LENGTH = 62K - 32 - (LENGTH(FLASH_VECTAB) + LENGTH(FLASH_VERSION)) + FLASH_VECTAB (rx) : ORIGIN = 0x08001000, LENGTH = 512 + FLASH (rx) : ORIGIN = ORIGIN(FLASH_VECTAB) + LENGTH(FLASH_VECTAB), LENGTH = 62K - 32 - LENGTH(FLASH_VECTAB) FILE_NAME (rx) : ORIGIN = 0x0800F800 - 32, LENGTH = 32 EEPROM (rx) : ORIGIN = 0x0800F800, LENGTH = 2K } @@ -32,14 +31,6 @@ SECTIONS . = ALIGN(4); } >FLASH_VECTAB - /* The firmware version and name - at a fixed address to make it possible to read it from firmware files. */ - .firmware_version : - { - . = ALIGN(4); - KEEP (*(.firmware_info)) - . = ALIGN(4); - } >FLASH_VERSION - /* The program code and other data into "FLASH" Rom type memory */ .text : { diff --git a/Mcu/l431/ldscript.ld b/Mcu/l431/ldscript.ld index f61a3fca..5647e1d2 100644 --- a/Mcu/l431/ldscript.ld +++ b/Mcu/l431/ldscript.ld @@ -48,7 +48,6 @@ MEMORY RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 64K FLASH (rx) : ORIGIN = 0x08001000, LENGTH = 57K EEPROM (rx) : ORIGIN = 0x0800f800, LENGTH = 2K - FLASH_VERSION (rx) : ORIGIN = ORIGIN(EEPROM) - 48, LENGTH = 16 FILE_NAME (rx) : ORIGIN = ORIGIN(EEPROM) - 32, LENGTH = 32 } @@ -132,13 +131,6 @@ SECTIONS . = ALIGN(4); } >FLASH - .firmware_version : - { - . = ALIGN(4); - KEEP (*(.firmware_info)) - . = ALIGN(4); - } >FLASH_VERSION - /* The file name */ .file_name : { diff --git a/STM32F051K6TX_FLASH.ld b/STM32F051K6TX_FLASH.ld index 15d654b0..380dd035 100644 --- a/STM32F051K6TX_FLASH.ld +++ b/STM32F051K6TX_FLASH.ld @@ -40,8 +40,7 @@ MEMORY SRAM (xrw) : ORIGIN = 0x20000000, LENGTH = 192 RAM (xrw) : ORIGIN = 0x200000C0, LENGTH = 8K - 192 FLASH_VECTAB (rx) : ORIGIN = 0x08001000, LENGTH = 192 - FLASH_VERSION (rx) : ORIGIN = 0x080010C0, LENGTH = 14 - FLASH (rx) : ORIGIN = ORIGIN(FLASH_VERSION) + LENGTH(FLASH_VERSION), LENGTH = 27K - (LENGTH(FLASH_VECTAB) + LENGTH(FLASH_VERSION)) + FLASH (rx) : ORIGIN = ORIGIN(FLASH_VECTAB) + LENGTH(FLASH_VECTAB), LENGTH = 27K - LENGTH(FLASH_VECTAB) EEPROM (rx) : ORIGIN = 0x080007C00, LENGTH = 1K } @@ -56,13 +55,6 @@ SECTIONS . = ALIGN(4); } >FLASH_VECTAB - /* The firmware version and name - at a fixed address to make it possible to read it from firmware files. */ - .firmware_version : - { - . = ALIGN(4); - KEEP (*(.firmware_info)) - } >FLASH_VERSION - /* The program code and other data into "FLASH" Rom type memory */ .text : {