Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-13 03:20:00 +03:00
Code Issues Wiki Activity

Removing Custom Defaults (#12425)

Browse source
This commit is contained in:
J Blackman 2023-03-03 05:39:44 +11:00 • committed by GitHub
parent 68136910d0
commit ee77239db1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
48 changed files with 155 additions and 552 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Makefile
View file

@ -214,11 +214,6 @@ TARGET_DIR_SRC = $(notdir $(wildcard $(TARGET_DIR)/*.c))
.DEFAULT_GOAL := hex .DEFAULT_GOAL := hex
ifeq ($(CUSTOM_DEFAULTS_EXTENDED),yes)
TARGET_FLAGS += -DUSE_CUSTOM_DEFAULTS=
EXTRA_LD_FLAGS += -Wl,--defsym=USE_CUSTOM_DEFAULTS_EXTENDED=1
endif
INCLUDE_DIRS := $(INCLUDE_DIRS) \ INCLUDE_DIRS := $(INCLUDE_DIRS) \
$(ROOT)/lib/main/MAVLink $(ROOT)/lib/main/MAVLink

13
src/link/at32_flash_f43xM.ld
View file

@ -18,21 +18,16 @@
***************************************************************************** *****************************************************************************
*/ */
/* /*
FLASH : 0x0800 0000 -- 0x083E FFFF FLASH : 0x0800 0000 -- 0x083E FFFF
MEM : 0x2000 0000 -- 0x2007 FFFF MEM : 0x2000 0000 -- 0x2007 FFFF
*/ */
MEMORY MEMORY
{ {
FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 10K FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 16K
FLASH_CDEF (r) : ORIGIN = 0x08002800, LENGTH = 6K
FLASH_CONFIG (r) : ORIGIN = 0x08004000, LENGTH = 16K FLASH_CONFIG (r) : ORIGIN = 0x08004000, LENGTH = 16K
FLASH1 (rx) : ORIGIN = 0x08008000, LENGTH = DEFINED(USE_CUSTOM_DEFAULTS_EXTENDED) ? 3984K: 4000K FLASH1 (rx) : ORIGIN = 0x08008000, LENGTH = 4000K
FLASH_CDEF_EXT (r) : ORIGIN = DEFINED(USE_CUSTOM_DEFAULTS_EXTENDED) ? 0x083EC000 : 0x083F0000, LENGTH = DEFINED(USE_CUSTOM_DEFAULTS_EXTENDED) ? 16K : 0K
SYSTEM_MEMORY (rx) : ORIGIN = 0x1FFF0000, LENGTH = 16K SYSTEM_MEMORY (rx) : ORIGIN = 0x1FFF0000, LENGTH = 16K
RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 192K RAM (xrw) : ORIGIN = 0x20000000, LENGTH = 192K
MEMORY_B1 (rx) : ORIGIN = 0x60000000, LENGTH = 0K /* external ram */ MEMORY_B1 (rx) : ORIGIN = 0x60000000, LENGTH = 0K /* external ram */

21
src/link/at32_flash_f4_split.ld
View file

@ -73,7 +73,7 @@ SECTIONS
. = ALIGN(4); . = ALIGN(4);
_etext = .; /* define a global symbols at end of code */ _etext = .; /* define a global symbols at end of code */
} >FLASH1 } >FLASH1
/* /*
Critical program code goes into RAM Critical program code goes into RAM
*/ */
@ -81,14 +81,13 @@ SECTIONS
.tcm_code : .tcm_code :
{ {
. = ALIGN(4); . = ALIGN(4);
tcm_code_start = .; tcm_code_start = .;
*(.tcm_code) *(.tcm_code)
*(.tcm_code*) *(.tcm_code*)
. = ALIGN(4); . = ALIGN(4);
tcm_code_end = .; tcm_code_end = .;
} >RAM AT >FLASH1 } >RAM AT >FLASH1
.ARM.extab : { *(.ARM.extab* .gnu.linkonce.armextab.*) } >FLASH .ARM.extab : { *(.ARM.extab* .gnu.linkonce.armextab.*) } >FLASH
.ARM : { .ARM : {
__exidx_start = .; __exidx_start = .;
@ -130,22 +129,6 @@ SECTIONS
PROVIDE_HIDDEN (__pg_resetdata_end = .); PROVIDE_HIDDEN (__pg_resetdata_end = .);
} >FLASH1 } >FLASH1
/* Storage for the address for the configuration section so we can grab it out of the hex file */
.custom_defaults :
{
. = ALIGN(4);
KEEP (*(.custom_defaults_start_address))
. = ALIGN(4);
KEEP (*(.custom_defaults_end_address))
. = ALIGN(4);
__custom_defaults_internal_start = .;
KEEP (*(.custom_defaults))
. = ALIGN(4);
} >FLASH_CDEF
PROVIDE_HIDDEN (__custom_defaults_start = DEFINED(USE_CUSTOM_DEFAULTS_EXTENDED) ? ORIGIN(FLASH_CDEF_EXT) : __custom_defaults_internal_start);
PROVIDE_HIDDEN (__custom_defaults_end = DEFINED(USE_CUSTOM_DEFAULTS_EXTENDED) ? ORIGIN(FLASH_CDEF_EXT) + LENGTH(FLASH_CDEF_EXT) : ORIGIN(FLASH_CDEF) + LENGTH(FLASH_CDEF));
/* used by the startup to initialize data */ /* used by the startup to initialize data */
_sidata = LOADADDR(.data); _sidata = LOADADDR(.data);

11
src/link/stm32_flash.ld
View file

@ -54,19 +54,18 @@ SECTIONS
} >FLASH } >FLASH
/* Critical program code goes into CCM RAM */ /* Critical program code goes into CCM RAM */
/* Copy specific fast-executing code to CCM RAM */ /* Copy specific fast-executing code to CCM RAM */
ccm_code = LOADADDR(.ccm_code); ccm_code = LOADADDR(.ccm_code);
.ccm_code : .ccm_code :
{ {
. = ALIGN(4); . = ALIGN(4);
ccm_code_start = .; ccm_code_start = .;
*(.ccm_code) *(.ccm_code)
*(.ccm_code*) *(.ccm_code*)
. = ALIGN(4); . = ALIGN(4);
ccm_code_end = .; ccm_code_end = .;
} >CCM AT >FLASH } >CCM AT >FLASH
.ARM.extab : { *(.ARM.extab* .gnu.linkonce.armextab.*) } >FLASH .ARM.extab : { *(.ARM.extab* .gnu.linkonce.armextab.*) } >FLASH
.ARM : { .ARM : {
__exidx_start = .; __exidx_start = .;
@ -138,7 +137,7 @@ SECTIONS
_ebss = .; /* define a global symbol at bss end */ _ebss = .; /* define a global symbol at bss end */
__bss_end__ = _ebss; __bss_end__ = _ebss;
} >RAM } >RAM
.fastram_bss (NOLOAD) : .fastram_bss (NOLOAD) :
{ {
__fastram_bss_start__ = .; __fastram_bss_start__ = .;

6
src/link/stm32_flash_f405.ld
View file

@ -19,11 +19,9 @@
/* Specify the memory areas */ /* Specify the memory areas */
MEMORY MEMORY
{ {
FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 10K FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 16K
FLASH_CUSTOM_DEFAULTS (r) : ORIGIN = 0x08002800, LENGTH = 6K
FLASH_CONFIG (r) : ORIGIN = 0x08004000, LENGTH = 16K FLASH_CONFIG (r) : ORIGIN = 0x08004000, LENGTH = 16K
FLASH1 (rx) : ORIGIN = 0x08008000, LENGTH = DEFINED(USE_CUSTOM_DEFAULTS_EXTENDED) ? 976K : 992K FLASH1 (rx) : ORIGIN = 0x08008000, LENGTH = 992K
FLASH_CUSTOM_DEFAULTS_EXTENDED (r): ORIGIN = DEFINED(USE_CUSTOM_DEFAULTS_EXTENDED) ? 0x080FC000 : 0x08100000, LENGTH = DEFINED(USE_CUSTOM_DEFAULTS_EXTENDED) ? 16K : 0K
SYSTEM_MEMORY (rx): ORIGIN = 0x1FFF0000, LENGTH = 29K SYSTEM_MEMORY (rx): ORIGIN = 0x1FFF0000, LENGTH = 29K

6
src/link/stm32_flash_f411.ld
View file

@ -20,11 +20,9 @@
/* Specify the memory areas */ /* Specify the memory areas */
MEMORY MEMORY
{ {
FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 10K FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 16K
FLASH_CUSTOM_DEFAULTS (r) : ORIGIN = 0x08002800, LENGTH = 6K
FLASH_CONFIG (r) : ORIGIN = 0x08004000, LENGTH = 16K FLASH_CONFIG (r) : ORIGIN = 0x08004000, LENGTH = 16K
FLASH1 (rx) : ORIGIN = 0x08008000, LENGTH = DEFINED(USE_CUSTOM_DEFAULTS_EXTENDED) ? 464K : 480K FLASH1 (rx) : ORIGIN = 0x08008000, LENGTH = 480K
FLASH_CUSTOM_DEFAULTS_EXTENDED (r): ORIGIN = DEFINED(USE_CUSTOM_DEFAULTS_EXTENDED) ? 0x0807C000 : 0x08080000, LENGTH = DEFINED(USE_CUSTOM_DEFAULTS_EXTENDED) ? 16K : 0K
SYSTEM_MEMORY (rx): ORIGIN = 0x1FFF0000, LENGTH = 29K SYSTEM_MEMORY (rx): ORIGIN = 0x1FFF0000, LENGTH = 29K

16
src/link/stm32_flash_f4_split.ld
View file

@ -116,22 +116,6 @@ SECTIONS
PROVIDE_HIDDEN (__pg_resetdata_end = .); PROVIDE_HIDDEN (__pg_resetdata_end = .);
} >FLASH1 } >FLASH1
/* Storage for the address for the configuration section so we can grab it out of the hex file */
.custom_defaults :
{
. = ALIGN(4);
KEEP (*(.custom_defaults_start_address))
. = ALIGN(4);
KEEP (*(.custom_defaults_end_address))
. = ALIGN(4);
__custom_defaults_internal_start = .;
KEEP (*(.custom_defaults))
. = ALIGN(4);
} >FLASH_CUSTOM_DEFAULTS
PROVIDE_HIDDEN (__custom_defaults_start = DEFINED(USE_CUSTOM_DEFAULTS_EXTENDED) ? ORIGIN(FLASH_CUSTOM_DEFAULTS_EXTENDED) : __custom_defaults_internal_start);
PROVIDE_HIDDEN (__custom_defaults_end = DEFINED(USE_CUSTOM_DEFAULTS_EXTENDED) ? ORIGIN(FLASH_CUSTOM_DEFAULTS_EXTENDED) + LENGTH(FLASH_CUSTOM_DEFAULTS_EXTENDED) : ORIGIN(FLASH_CUSTOM_DEFAULTS) + LENGTH(FLASH_CUSTOM_DEFAULTS));
/* used by the startup to initialize data */ /* used by the startup to initialize data */
_sidata = LOADADDR(.data); _sidata = LOADADDR(.data);

8
src/link/stm32_flash_f722.ld
View file

@ -26,12 +26,10 @@ MEMORY
ITCM_FLASH_CONFIG (r) : ORIGIN = 0x00204000, LENGTH = 16K ITCM_FLASH_CONFIG (r) : ORIGIN = 0x00204000, LENGTH = 16K
ITCM_FLASH1 (rx) : ORIGIN = 0x00208000, LENGTH = 480K ITCM_FLASH1 (rx) : ORIGIN = 0x00208000, LENGTH = 480K
AXIM_FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 10K AXIM_FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 16K
AXIM_FLASH_CUSTOM_DEFAULTS (r) : ORIGIN = 0x08002800, LENGTH = 6K
/* config occupies the entire flash sector 1 for the ease of erasure, 16K on F72x */ /* config occupies the entire flash sector 1 for the ease of erasure, 16K on F72x */
AXIM_FLASH_CONFIG (r) : ORIGIN = 0x08004000, LENGTH = 16K AXIM_FLASH_CONFIG (r) : ORIGIN = 0x08004000, LENGTH = 16K
AXIM_FLASH1 (rx) : ORIGIN = 0x08008000, LENGTH = DEFINED(USE_CUSTOM_DEFAULTS_EXTENDED) ? 464K : 480K AXIM_FLASH1 (rx) : ORIGIN = 0x08008000, LENGTH = 480K
AXIM_FLASH_CUSTOM_DEFAULTS_EXTENDED (r) : ORIGIN = DEFINED(USE_CUSTOM_DEFAULTS_EXTENDED) ? 0x0807C000 : 0x08080000, LENGTH = DEFINED(USE_CUSTOM_DEFAULTS_EXTENDED) ? 16K : 0K
DTCM_RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 64K DTCM_RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 64K
SRAM1 (rwx) : ORIGIN = 0x20010000, LENGTH = 176K SRAM1 (rwx) : ORIGIN = 0x20010000, LENGTH = 176K
@ -41,11 +39,9 @@ MEMORY
REGION_ALIAS("FLASH", AXIM_FLASH) REGION_ALIAS("FLASH", AXIM_FLASH)
REGION_ALIAS("WRITABLE_FLASH", AXIM_FLASH) REGION_ALIAS("WRITABLE_FLASH", AXIM_FLASH)
REGION_ALIAS("FLASH_CUSTOM_DEFAULTS", AXIM_FLASH_CUSTOM_DEFAULTS)
REGION_ALIAS("FLASH_CONFIG", AXIM_FLASH_CONFIG) REGION_ALIAS("FLASH_CONFIG", AXIM_FLASH_CONFIG)
REGION_ALIAS("FLASH1", AXIM_FLASH1) REGION_ALIAS("FLASH1", AXIM_FLASH1)
REGION_ALIAS("WRITABLE_FLASH1", AXIM_FLASH1) REGION_ALIAS("WRITABLE_FLASH1", AXIM_FLASH1)
REGION_ALIAS("FLASH_CUSTOM_DEFAULTS_EXTENDED", AXIM_FLASH_CUSTOM_DEFAULTS_EXTENDED)
REGION_ALIAS("STACKRAM", DTCM_RAM) REGION_ALIAS("STACKRAM", DTCM_RAM)
REGION_ALIAS("FASTRAM", DTCM_RAM) REGION_ALIAS("FASTRAM", DTCM_RAM)

27
src/link/stm32_flash_f74x.ld
View file

@ -21,34 +21,29 @@
/* Specify the memory areas */ /* Specify the memory areas */
MEMORY MEMORY
{ {
ITCM_RAM (rx) : ORIGIN = 0x00000000, LENGTH = 16K ITCM_RAM (rx) : ORIGIN = 0x00000000, LENGTH = 16K
/* Alternate access to the same flash storage as AXIM flash, but not writable by the boot loader. */ /* Alternate access to the same flash storage as AXIM flash, but not writable by the boot loader. */
ITCM_FLASH (rx) : ORIGIN = 0x00200000, LENGTH = 32K ITCM_FLASH (rx) : ORIGIN = 0x00200000, LENGTH = 32K
ITCM_FLASH_CONFIG (r) : ORIGIN = 0x00208000, LENGTH = 32K ITCM_FLASH_CONFIG (r) : ORIGIN = 0x00208000, LENGTH = 32K
ITCM_FLASH1 (rx) : ORIGIN = 0x00210000, LENGTH = 960K ITCM_FLASH1 (rx) : ORIGIN = 0x00210000, LENGTH = 960K
AXIM_FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 10K AXIM_FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 32K
AXIM_FLASH_CUSTOM_DEFAULTS (r) : ORIGIN = 0x08002800, LENGTH = 10K
AXIM_FLASH_UNUSED (r) : ORIGIN = 0x08005000, LENGTH = 12K
/* config occupies the entire flash sector 1 for the ease of erasure, 32K on F74x */ /* config occupies the entire flash sector 1 for the ease of erasure, 32K on F74x */
AXIM_FLASH_CONFIG (r) : ORIGIN = 0x08008000, LENGTH = 32K AXIM_FLASH_CONFIG (r) : ORIGIN = 0x08008000, LENGTH = 32K
AXIM_FLASH1 (rx) : ORIGIN = 0x08010000, LENGTH = DEFINED(USE_CUSTOM_DEFAULTS_EXTENDED) ? 928K : 960K AXIM_FLASH1 (rx) : ORIGIN = 0x08010000, LENGTH = 960K
AXIM_FLASH_CUSTOM_DEFAULTS_EXTENDED (r) : ORIGIN = DEFINED(USE_CUSTOM_DEFAULTS_EXTENDED) ? 0x080F8000 : 0x08100000, LENGTH = DEFINED(USE_CUSTOM_DEFAULTS_EXTENDED) ? 32K : 0K
DTCM_RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 64K DTCM_RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 64K
SRAM1 (rwx) : ORIGIN = 0x20010000, LENGTH = 240K SRAM1 (rwx) : ORIGIN = 0x20010000, LENGTH = 240K
SRAM2 (rwx) : ORIGIN = 0x2004C000, LENGTH = 16K SRAM2 (rwx) : ORIGIN = 0x2004C000, LENGTH = 16K
MEMORY_B1 (rx) : ORIGIN = 0x60000000, LENGTH = 0K MEMORY_B1 (rx) : ORIGIN = 0x60000000, LENGTH = 0K
} }
REGION_ALIAS("FLASH", ITCM_FLASH) REGION_ALIAS("FLASH", ITCM_FLASH)
REGION_ALIAS("WRITABLE_FLASH", AXIM_FLASH) REGION_ALIAS("WRITABLE_FLASH", AXIM_FLASH)
REGION_ALIAS("FLASH_CUSTOM_DEFAULTS", AXIM_FLASH_CUSTOM_DEFAULTS)
REGION_ALIAS("FLASH_CONFIG", AXIM_FLASH_CONFIG) REGION_ALIAS("FLASH_CONFIG", AXIM_FLASH_CONFIG)
REGION_ALIAS("FLASH1", ITCM_FLASH1) REGION_ALIAS("FLASH1", ITCM_FLASH1)
REGION_ALIAS("WRITABLE_FLASH1", AXIM_FLASH1) REGION_ALIAS("WRITABLE_FLASH1", AXIM_FLASH1)
REGION_ALIAS("FLASH_CUSTOM_DEFAULTS_EXTENDED", AXIM_FLASH_CUSTOM_DEFAULTS_EXTENDED)
REGION_ALIAS("STACKRAM", DTCM_RAM) REGION_ALIAS("STACKRAM", DTCM_RAM)
REGION_ALIAS("FASTRAM", DTCM_RAM) REGION_ALIAS("FASTRAM", DTCM_RAM)

4
src/link/stm32_flash_f765.ld
View file

@ -28,9 +28,7 @@ MEMORY
ITCM_FLASH_CONFIG (r) : ORIGIN = 0x00208000, LENGTH = 32K ITCM_FLASH_CONFIG (r) : ORIGIN = 0x00208000, LENGTH = 32K
ITCM_FLASH1 (rx) : ORIGIN = 0x00210000, LENGTH = 1984K ITCM_FLASH1 (rx) : ORIGIN = 0x00210000, LENGTH = 1984K
AXIM_FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 10K AXIM_FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 32K
AXIM_FLASH_CUSTOM_DEFAULTS (r) : ORIGIN = 0x08002800, LENGTH = 10K
AXIM_FLASH_UNUSED (r) : ORIGIN = 0x08005000, LENGTH = 12K
AXIM_FLASH_CONFIG (r) : ORIGIN = 0x08008000, LENGTH = 32K AXIM_FLASH_CONFIG (r) : ORIGIN = 0x08008000, LENGTH = 32K
AXIM_FLASH1 (rx) : ORIGIN = 0x08010000, LENGTH = 1984K AXIM_FLASH1 (rx) : ORIGIN = 0x08010000, LENGTH = 1984K

36
src/link/stm32_flash_f7_split.ld
View file

@ -54,24 +54,24 @@ SECTIONS
} >FLASH1 AT >WRITABLE_FLASH1 } >FLASH1 AT >WRITABLE_FLASH1
/* Critical program code goes into ITCM RAM */ /* Critical program code goes into ITCM RAM */
/* Copy specific fast-executing code to ITCM RAM */ /* Copy specific fast-executing code to ITCM RAM */
tcm_code = LOADADDR(.tcm_code); tcm_code = LOADADDR(.tcm_code);
.tcm_code : .tcm_code :
{ {
. = ALIGN(4); . = ALIGN(4);
tcm_code_start = .; tcm_code_start = .;
*(.tcm_code) *(.tcm_code)
*(.tcm_code*) *(.tcm_code*)
. = ALIGN(4); . = ALIGN(4);
tcm_code_end = .; tcm_code_end = .;
} >ITCM_RAM AT >WRITABLE_FLASH1 } >ITCM_RAM AT >WRITABLE_FLASH1
.ARM.extab : .ARM.extab :
{ {
*(.ARM.extab* .gnu.linkonce.armextab.*) *(.ARM.extab* .gnu.linkonce.armextab.*)
} >MOVABLE_FLASH } >MOVABLE_FLASH
.ARM : .ARM :
{ {
__exidx_start = .; __exidx_start = .;
*(.ARM.exidx*) __exidx_end = .; *(.ARM.exidx*) __exidx_end = .;
@ -84,7 +84,7 @@ SECTIONS
KEEP (*(SORT(.pg_registry.*))) KEEP (*(SORT(.pg_registry.*)))
PROVIDE_HIDDEN (__pg_registry_end = .); PROVIDE_HIDDEN (__pg_registry_end = .);
} >MOVABLE_FLASH } >MOVABLE_FLASH
.pg_resetdata : .pg_resetdata :
{ {
PROVIDE_HIDDEN (__pg_resetdata_start = .); PROVIDE_HIDDEN (__pg_resetdata_start = .);
@ -92,22 +92,6 @@ SECTIONS
PROVIDE_HIDDEN (__pg_resetdata_end = .); PROVIDE_HIDDEN (__pg_resetdata_end = .);
} >WRITABLE_FLASH1 } >WRITABLE_FLASH1
/* Storage for the address for the configuration section so we can grab it out of the hex file */
.custom_defaults :
{
. = ALIGN(4);
KEEP (*(.custom_defaults_start_address))
. = ALIGN(4);
KEEP (*(.custom_defaults_end_address))
. = ALIGN(4);
__custom_defaults_internal_start = .;
KEEP (*(.custom_defaults))
. = ALIGN(4);
} >FLASH_CUSTOM_DEFAULTS
PROVIDE_HIDDEN (__custom_defaults_start = DEFINED(USE_CUSTOM_DEFAULTS_EXTENDED) ? ORIGIN(FLASH_CUSTOM_DEFAULTS_EXTENDED) : __custom_defaults_internal_start);
PROVIDE_HIDDEN (__custom_defaults_end = DEFINED(USE_CUSTOM_DEFAULTS_EXTENDED) ? ORIGIN(FLASH_CUSTOM_DEFAULTS_EXTENDED) + LENGTH(FLASH_CUSTOM_DEFAULTS_EXTENDED) : ORIGIN(FLASH_CUSTOM_DEFAULTS) + LENGTH(FLASH_CUSTOM_DEFAULTS));
/* used by the startup to initialize data */ /* used by the startup to initialize data */
_sidata = LOADADDR(.data); _sidata = LOADADDR(.data);

5
src/link/stm32_flash_g474.ld
View file

@ -13,11 +13,8 @@
MEMORY MEMORY
{ {
FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 10K FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 10K
FLASH_CUSTOM_DEFAULTS (r) : ORIGIN = 0x08002800, LENGTH = 6K
FLASH_CONFIG (r) : ORIGIN = 0x08004000, LENGTH = 8K FLASH_CONFIG (r) : ORIGIN = 0x08004000, LENGTH = 8K
FLASH1 (rx) : ORIGIN = 0x08006000, LENGTH = DEFINED(USE_CUSTOM_DEFAULTS_EXTENDED) ? 480K : 488K FLASH1 (rx) : ORIGIN = 0x08006000, LENGTH = 496K
FLASH_CUSTOM_DEFAULTS_EXTENDED (r): ORIGIN = DEFINED(USE_CUSTOM_DEFAULTS_EXTENDED) ? 0x0807E000 : 0x08080000, LENGTH = DEFINED(USE_CUSTOM_DEFAULTS_EXTENDED) ? 8K : 0K
SYSTEM_MEMORY (r) : ORIGIN = 0x1FFF0000, LENGTH = 64K SYSTEM_MEMORY (r) : ORIGIN = 0x1FFF0000, LENGTH = 64K
/* Below are the true lengths for normal and close coupled RAM /* Below are the true lengths for normal and close coupled RAM

16
src/link/stm32_flash_g4_split.ld
View file

@ -119,22 +119,6 @@ SECTIONS
PROVIDE_HIDDEN (__pg_resetdata_end = .); PROVIDE_HIDDEN (__pg_resetdata_end = .);
} >FLASH1 } >FLASH1
/* Storage for the address for the configuration section so we can grab it out of the hex file */
.custom_defaults :
{
. = ALIGN(4);
KEEP (*(.custom_defaults_start_address))
. = ALIGN(4);
KEEP (*(.custom_defaults_end_address))
. = ALIGN(4);
__custom_defaults_internal_start = .;
KEEP (*(.custom_defaults))
. = ALIGN(4);
} >FLASH_CUSTOM_DEFAULTS
PROVIDE_HIDDEN (__custom_defaults_start = DEFINED(USE_CUSTOM_DEFAULTS_EXTENDED) ? ORIGIN(FLASH_CUSTOM_DEFAULTS_EXTENDED) : __custom_defaults_internal_start);
PROVIDE_HIDDEN (__custom_defaults_end = DEFINED(USE_CUSTOM_DEFAULTS_EXTENDED) ? ORIGIN(FLASH_CUSTOM_DEFAULTS_EXTENDED) + LENGTH(FLASH_CUSTOM_DEFAULTS_EXTENDED) : ORIGIN(FLASH_CUSTOM_DEFAULTS) + LENGTH(FLASH_CUSTOM_DEFAULTS));
/* used by the startup to initialize data */ /* used by the startup to initialize data */
_sidata = LOADADDR(.data); _sidata = LOADADDR(.data);

43
src/link/stm32_flash_h723_1m.ld
View file

@ -36,13 +36,9 @@ ENTRY(Reset_Handler)
/* Specify the memory areas */ /* Specify the memory areas */
MEMORY MEMORY
{ {
FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 10K FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 128K
FLASH_CUSTOM_DEFAULTS (r) : ORIGIN = 0x08002800, LENGTH = 10K
FLASH_UNUSED (r) : ORIGIN = 0x08005000, LENGTH = 108K
FLASH_CONFIG (r) : ORIGIN = 0x08020000, LENGTH = 128K FLASH_CONFIG (r) : ORIGIN = 0x08020000, LENGTH = 128K
FLASH1 (rx) : ORIGIN = 0x08040000, LENGTH = DEFINED(USE_CUSTOM_DEFAULTS_EXTENDED) ? 640K : 768K FLASH1 (rx) : ORIGIN = 0x08040000, LENGTH = 768K
FLASH_CUSTOM_DEFAULTS_EXTENDED (r): ORIGIN = DEFINED(USE_CUSTOM_DEFAULTS_EXTENDED) ? 0x081E0000 : 0x08200000, LENGTH = DEFINED(USE_CUSTOM_DEFAULTS_EXTENDED) ? 128K : 0K
ITCM_RAM (rwx) : ORIGIN = 0x00000000, LENGTH = 64K ITCM_RAM (rwx) : ORIGIN = 0x00000000, LENGTH = 64K
DTCM_RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 128K DTCM_RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 128K
@ -101,24 +97,24 @@ SECTIONS
} >FLASH1 } >FLASH1
/* Critical program code goes into ITCM RAM */ /* Critical program code goes into ITCM RAM */
/* Copy specific fast-executing code to ITCM RAM */ /* Copy specific fast-executing code to ITCM RAM */
tcm_code = LOADADDR(.tcm_code); tcm_code = LOADADDR(.tcm_code);
.tcm_code : .tcm_code :
{ {
. = ALIGN(4); . = ALIGN(4);
tcm_code_start = .; tcm_code_start = .;
*(.tcm_code) *(.tcm_code)
*(.tcm_code*) *(.tcm_code*)
. = ALIGN(4); . = ALIGN(4);
tcm_code_end = .; tcm_code_end = .;
} >ITCM_RAM AT >FLASH1 } >ITCM_RAM AT >FLASH1
.ARM.extab : .ARM.extab :
{ {
*(.ARM.extab* .gnu.linkonce.armextab.*) *(.ARM.extab* .gnu.linkonce.armextab.*)
} >FLASH1 } >FLASH1
.ARM : .ARM :
{ {
__exidx_start = .; __exidx_start = .;
*(.ARM.exidx*) __exidx_end = .; *(.ARM.exidx*) __exidx_end = .;
@ -131,7 +127,7 @@ SECTIONS
KEEP (*(SORT(.pg_registry.*))) KEEP (*(SORT(.pg_registry.*)))
PROVIDE_HIDDEN (__pg_registry_end = .); PROVIDE_HIDDEN (__pg_registry_end = .);
} >FLASH1 } >FLASH1
.pg_resetdata : .pg_resetdata :
{ {
PROVIDE_HIDDEN (__pg_resetdata_start = .); PROVIDE_HIDDEN (__pg_resetdata_start = .);
@ -139,21 +135,6 @@ SECTIONS
PROVIDE_HIDDEN (__pg_resetdata_end = .); PROVIDE_HIDDEN (__pg_resetdata_end = .);
} >FLASH1 } >FLASH1
/* Storage for the address for the configuration section so we can grab it out of the hex file */
.custom_defaults :
{
. = ALIGN(4);
KEEP (*(.custom_defaults_start_address))
. = ALIGN(4);
KEEP (*(.custom_defaults_end_address))
. = ALIGN(4);
__custom_defaults_internal_start = .;
*(.custom_defaults);
} >FLASH_CUSTOM_DEFAULTS
PROVIDE_HIDDEN (__custom_defaults_start = DEFINED(USE_CUSTOM_DEFAULTS_EXTENDED) ? ORIGIN(FLASH_CUSTOM_DEFAULTS_EXTENDED) : __custom_defaults_internal_start);
PROVIDE_HIDDEN (__custom_defaults_end = DEFINED(USE_CUSTOM_DEFAULTS_EXTENDED) ? ORIGIN(FLASH_CUSTOM_DEFAULTS_EXTENDED) + LENGTH(FLASH_CUSTOM_DEFAULTS_EXTENDED) : ORIGIN(FLASH_CUSTOM_DEFAULTS) + LENGTH(FLASH_CUSTOM_DEFAULTS));
/* used by the startup to initialize data */ /* used by the startup to initialize data */
_sidata = LOADADDR(.data); _sidata = LOADADDR(.data);

43
src/link/stm32_flash_h743_2m.ld
View file

@ -37,13 +37,9 @@ ENTRY(Reset_Handler)
/* Specify the memory areas */ /* Specify the memory areas */
MEMORY MEMORY
{ {
FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 10K FLASH (rx) : ORIGIN = 0x08000000, LENGTH = 128K
FLASH_CUSTOM_DEFAULTS (r) : ORIGIN = 0x08002800, LENGTH = 10K
FLASH_UNUSED (r) : ORIGIN = 0x08005000, LENGTH = 108K
FLASH_CONFIG (r) : ORIGIN = 0x08020000, LENGTH = 128K FLASH_CONFIG (r) : ORIGIN = 0x08020000, LENGTH = 128K
FLASH1 (rx) : ORIGIN = 0x08040000, LENGTH = DEFINED(USE_CUSTOM_DEFAULTS_EXTENDED) ? 1664K : 1792K FLASH1 (rx) : ORIGIN = 0x08040000, LENGTH = 1792K
FLASH_CUSTOM_DEFAULTS_EXTENDED (r): ORIGIN = DEFINED(USE_CUSTOM_DEFAULTS_EXTENDED) ? 0x081E0000 : 0x08200000, LENGTH = DEFINED(USE_CUSTOM_DEFAULTS_EXTENDED) ? 128K : 0K
ITCM_RAM (rwx) : ORIGIN = 0x00000000, LENGTH = 64K ITCM_RAM (rwx) : ORIGIN = 0x00000000, LENGTH = 64K
DTCM_RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 128K DTCM_RAM (rwx) : ORIGIN = 0x20000000, LENGTH = 128K
@ -103,24 +99,24 @@ SECTIONS
} >FLASH1 } >FLASH1
/* Critical program code goes into ITCM RAM */ /* Critical program code goes into ITCM RAM */
/* Copy specific fast-executing code to ITCM RAM */ /* Copy specific fast-executing code to ITCM RAM */
tcm_code = LOADADDR(.tcm_code); tcm_code = LOADADDR(.tcm_code);
.tcm_code : .tcm_code :
{ {
. = ALIGN(4); . = ALIGN(4);
tcm_code_start = .; tcm_code_start = .;
*(.tcm_code) *(.tcm_code)
*(.tcm_code*) *(.tcm_code*)
. = ALIGN(4); . = ALIGN(4);
tcm_code_end = .; tcm_code_end = .;
} >ITCM_RAM AT >FLASH1 } >ITCM_RAM AT >FLASH1
.ARM.extab : .ARM.extab :
{ {
*(.ARM.extab* .gnu.linkonce.armextab.*) *(.ARM.extab* .gnu.linkonce.armextab.*)
} >FLASH1 } >FLASH1
.ARM : .ARM :
{ {
__exidx_start = .; __exidx_start = .;
*(.ARM.exidx*) __exidx_end = .; *(.ARM.exidx*) __exidx_end = .;
@ -133,7 +129,7 @@ SECTIONS
KEEP (*(SORT(.pg_registry.*))) KEEP (*(SORT(.pg_registry.*)))
PROVIDE_HIDDEN (__pg_registry_end = .); PROVIDE_HIDDEN (__pg_registry_end = .);
} >FLASH1 } >FLASH1
.pg_resetdata : .pg_resetdata :
{ {
PROVIDE_HIDDEN (__pg_resetdata_start = .); PROVIDE_HIDDEN (__pg_resetdata_start = .);
@ -141,21 +137,6 @@ SECTIONS
PROVIDE_HIDDEN (__pg_resetdata_end = .); PROVIDE_HIDDEN (__pg_resetdata_end = .);
} >FLASH1 } >FLASH1
/* Storage for the address for the configuration section so we can grab it out of the hex file */
.custom_defaults :
{
. = ALIGN(4);
KEEP (*(.custom_defaults_start_address))
. = ALIGN(4);
KEEP (*(.custom_defaults_end_address))
. = ALIGN(4);
__custom_defaults_internal_start = .;
*(.custom_defaults);
} >FLASH_CUSTOM_DEFAULTS
PROVIDE_HIDDEN (__custom_defaults_start = DEFINED(USE_CUSTOM_DEFAULTS_EXTENDED) ? ORIGIN(FLASH_CUSTOM_DEFAULTS_EXTENDED) : __custom_defaults_internal_start);
PROVIDE_HIDDEN (__custom_defaults_end = DEFINED(USE_CUSTOM_DEFAULTS_EXTENDED) ? ORIGIN(FLASH_CUSTOM_DEFAULTS_EXTENDED) + LENGTH(FLASH_CUSTOM_DEFAULTS_EXTENDED) : ORIGIN(FLASH_CUSTOM_DEFAULTS) + LENGTH(FLASH_CUSTOM_DEFAULTS));
/* used by the startup to initialize data */ /* used by the startup to initialize data */
_sidata = LOADADDR(.data); _sidata = LOADADDR(.data);

2
src/link/stm32_flash_h750_128k.ld
View file

@ -43,7 +43,7 @@ MEMORY
D2_RAM (rwx) : ORIGIN = 0x30000000, LENGTH = 256K /* SRAM1 + SRAM2 */ D2_RAM (rwx) : ORIGIN = 0x30000000, LENGTH = 256K /* SRAM1 + SRAM2 */
MEMORY_B1 (rx) : ORIGIN = 0x60000000, LENGTH = 0K MEMORY_B1 (rx) : ORIGIN = 0x60000000, LENGTH = 0K
QUADSPI (rx) : ORIGIN = 0x90000000, LENGTH = 0K QUADSPI (rx) : ORIGIN = 0x90000000, LENGTH = 0K
} }
REGION_ALIAS("STACKRAM", DTCM_RAM) REGION_ALIAS("STACKRAM", DTCM_RAM)

2
src/link/stm32_flash_h750_1m.ld
View file

@ -43,7 +43,7 @@ MEMORY
D2_RAM (rwx) : ORIGIN = 0x30000000, LENGTH = 256K /* SRAM1 + SRAM2 */ D2_RAM (rwx) : ORIGIN = 0x30000000, LENGTH = 256K /* SRAM1 + SRAM2 */
MEMORY_B1 (rx) : ORIGIN = 0x60000000, LENGTH = 0K MEMORY_B1 (rx) : ORIGIN = 0x60000000, LENGTH = 0K
QUADSPI (rx) : ORIGIN = 0x90000000, LENGTH = 0K QUADSPI (rx) : ORIGIN = 0x90000000, LENGTH = 0K
} }
REGION_ALIAS("STACKRAM", DTCM_RAM) REGION_ALIAS("STACKRAM", DTCM_RAM)

30
src/link/stm32_h723_common.ld
View file

@ -36,7 +36,7 @@ SECTIONS
. = ALIGN(512); /* Vector table offset must be multiple of 0x200 */ . = ALIGN(512); /* Vector table offset must be multiple of 0x200 */
PROVIDE (ram_isr_vector_table_base = .); PROVIDE (ram_isr_vector_table_base = .);
. += (isr_vector_table_end - isr_vector_table_base); . += (isr_vector_table_end - isr_vector_table_base);
. = ALIGN(4); . = ALIGN(4);
PROVIDE (ram_isr_vector_table_end = .); PROVIDE (ram_isr_vector_table_end = .);
} >DTCM_RAM } >DTCM_RAM
@ -60,24 +60,24 @@ SECTIONS
} >MAIN } >MAIN
/* Critical program code goes into ITCM RAM */ /* Critical program code goes into ITCM RAM */
/* Copy specific fast-executing code to ITCM RAM */ /* Copy specific fast-executing code to ITCM RAM */
tcm_code = LOADADDR(.tcm_code); tcm_code = LOADADDR(.tcm_code);
.tcm_code : .tcm_code :
{ {
. = ALIGN(4); . = ALIGN(4);
tcm_code_start = .; tcm_code_start = .;
*(.tcm_code) *(.tcm_code)
*(.tcm_code*) *(.tcm_code*)
. = ALIGN(4); . = ALIGN(4);
tcm_code_end = .; tcm_code_end = .;
} >ITCM_RAM AT >MAIN } >ITCM_RAM AT >MAIN
.ARM.extab : .ARM.extab :
{ {
*(.ARM.extab* .gnu.linkonce.armextab.*) *(.ARM.extab* .gnu.linkonce.armextab.*)
} >MAIN } >MAIN
.ARM : .ARM :
{ {
__exidx_start = .; __exidx_start = .;
*(.ARM.exidx*) __exidx_end = .; *(.ARM.exidx*) __exidx_end = .;
@ -90,7 +90,7 @@ SECTIONS
KEEP (*(SORT(.pg_registry.*))) KEEP (*(SORT(.pg_registry.*)))
PROVIDE_HIDDEN (__pg_registry_end = .); PROVIDE_HIDDEN (__pg_registry_end = .);
} >MAIN } >MAIN
.pg_resetdata : .pg_resetdata :
{ {
PROVIDE_HIDDEN (__pg_resetdata_start = .); PROVIDE_HIDDEN (__pg_resetdata_start = .);
@ -114,16 +114,16 @@ SECTIONS
} >DTCM_RAM AT >MAIN } >DTCM_RAM AT >MAIN
/* Non-critical program code goes into RAM */ /* Non-critical program code goes into RAM */
/* Copy specific slow-executing code to RAM */ /* Copy specific slow-executing code to RAM */
ram_code = LOADADDR(.ram_code); ram_code = LOADADDR(.ram_code);
.ram_code : .ram_code :
{ {
. = ALIGN(4); . = ALIGN(4);
ram_code_start = .; ram_code_start = .;
*(.ram_code) *(.ram_code)
*(.ram_code*) *(.ram_code*)
. = ALIGN(4); . = ALIGN(4);
ram_code_end = .; ram_code_end = .;
} >RAM AT >MAIN } >RAM AT >MAIN
/* Uninitialized data section */ /* Uninitialized data section */

2
src/link/stm32_h723_common_post.ld
View file

@ -31,7 +31,7 @@ SECTIONS
*(.mb1rodata) /* read-only data (constants) */ *(.mb1rodata) /* read-only data (constants) */
*(.mb1rodata*) *(.mb1rodata*)
} >MEMORY_B1 } >MEMORY_B1
/* Remove information from the standard libraries */ /* Remove information from the standard libraries */
/DISCARD/ : /DISCARD/ :
{ {

16
src/link/stm32_h730_common.ld
View file

@ -36,7 +36,7 @@ SECTIONS
. = ALIGN(512); /* Vector table offset must be multiple of 0x200 */ . = ALIGN(512); /* Vector table offset must be multiple of 0x200 */
PROVIDE (ram_isr_vector_table_base = .); PROVIDE (ram_isr_vector_table_base = .);
. += (isr_vector_table_end - isr_vector_table_base); . += (isr_vector_table_end - isr_vector_table_base);
. = ALIGN(4); . = ALIGN(4);
PROVIDE (ram_isr_vector_table_end = .); PROVIDE (ram_isr_vector_table_end = .);
} >DTCM_RAM } >DTCM_RAM
@ -76,8 +76,8 @@ SECTIONS
{ {
*(.ARM.extab* .gnu.linkonce.armextab.*) *(.ARM.extab* .gnu.linkonce.armextab.*)
} >MAIN } >MAIN
.ARM : .ARM :
{ {
__exidx_start = .; __exidx_start = .;
*(.ARM.exidx*) __exidx_end = .; *(.ARM.exidx*) __exidx_end = .;
@ -90,7 +90,7 @@ SECTIONS
KEEP (*(SORT(.pg_registry.*))) KEEP (*(SORT(.pg_registry.*)))
PROVIDE_HIDDEN (__pg_registry_end = .); PROVIDE_HIDDEN (__pg_registry_end = .);
} >MAIN } >MAIN
.pg_resetdata : .pg_resetdata :
{ {
PROVIDE_HIDDEN (__pg_resetdata_start = .); PROVIDE_HIDDEN (__pg_resetdata_start = .);
@ -114,16 +114,16 @@ SECTIONS
} >DTCM_RAM AT >MAIN } >DTCM_RAM AT >MAIN
/* Non-critical program code goes into RAM */ /* Non-critical program code goes into RAM */
/* Copy specific slow-executing code to RAM */ /* Copy specific slow-executing code to RAM */
ram_code = LOADADDR(.ram_code); ram_code = LOADADDR(.ram_code);
.ram_code : .ram_code :
{ {
. = ALIGN(4); . = ALIGN(4);
ram_code_start = .; ram_code_start = .;
*(.ram_code) *(.ram_code)
*(.ram_code*) *(.ram_code*)
. = ALIGN(4); . = ALIGN(4);
ram_code_end = .; ram_code_end = .;
} >RAM AT >MAIN } >RAM AT >MAIN
/* Uninitialized data section */ /* Uninitialized data section */

2
src/link/stm32_h730_common_post.ld
View file

@ -31,7 +31,7 @@ SECTIONS
*(.mb1rodata) /* read-only data (constants) */ *(.mb1rodata) /* read-only data (constants) */
*(.mb1rodata*) *(.mb1rodata*)
} >MEMORY_B1 } >MEMORY_B1
/* Remove information from the standard libraries */ /* Remove information from the standard libraries */
/DISCARD/ : /DISCARD/ :
{ {

20
src/link/stm32_h750_common.ld
View file

@ -44,24 +44,24 @@ SECTIONS
} >MAIN } >MAIN
/* Critical program code goes into ITCM RAM */ /* Critical program code goes into ITCM RAM */
/* Copy specific fast-executing code to ITCM RAM */ /* Copy specific fast-executing code to ITCM RAM */
tcm_code = LOADADDR(.tcm_code); tcm_code = LOADADDR(.tcm_code);
.tcm_code : .tcm_code :
{ {
. = ALIGN(4); . = ALIGN(4);
tcm_code_start = .; tcm_code_start = .;
*(.tcm_code) *(.tcm_code)
*(.tcm_code*) *(.tcm_code*)
. = ALIGN(4); . = ALIGN(4);
tcm_code_end = .; tcm_code_end = .;
} >ITCM_RAM AT >MAIN } >ITCM_RAM AT >MAIN
.ARM.extab : .ARM.extab :
{ {
*(.ARM.extab* .gnu.linkonce.armextab.*) *(.ARM.extab* .gnu.linkonce.armextab.*)
} >MAIN } >MAIN
.ARM : .ARM :
{ {
__exidx_start = .; __exidx_start = .;
*(.ARM.exidx*) __exidx_end = .; *(.ARM.exidx*) __exidx_end = .;
@ -74,7 +74,7 @@ SECTIONS
KEEP (*(SORT(.pg_registry.*))) KEEP (*(SORT(.pg_registry.*)))
PROVIDE_HIDDEN (__pg_registry_end = .); PROVIDE_HIDDEN (__pg_registry_end = .);
} >MAIN } >MAIN
.pg_resetdata : .pg_resetdata :
{ {
PROVIDE_HIDDEN (__pg_resetdata_start = .); PROVIDE_HIDDEN (__pg_resetdata_start = .);

2
src/link/stm32_h750_common_post.ld
View file

@ -31,7 +31,7 @@ SECTIONS
*(.mb1rodata) /* read-only data (constants) */ *(.mb1rodata) /* read-only data (constants) */
*(.mb1rodata*) *(.mb1rodata*)
} >MEMORY_B1 } >MEMORY_B1
/* Remove information from the standard libraries */ /* Remove information from the standard libraries */
/DISCARD/ : /DISCARD/ :
{ {

7
src/link/stm32_ram_h723_exst.ld
View file

@ -30,7 +30,7 @@ ENTRY(Reset_Handler)
0x08000000 to 0x0801FFFF 128K isr vector, startup code, firmware, no config! // FLASH_Sector_0 0x08000000 to 0x0801FFFF 128K isr vector, startup code, firmware, no config! // FLASH_Sector_0
*/ */
/* /*
For H7 EXFL (External Flash) targets a binary is built that is placed on an external device. For H7 EXFL (External Flash) targets a binary is built that is placed on an external device.
The bootloader will enable the memory mapped mode on the CPU which allows code to run directly from The bootloader will enable the memory mapped mode on the CPU which allows code to run directly from
@ -61,7 +61,7 @@ MEMORY
MEMORY_B1 (rx) : ORIGIN = 0x60000000, LENGTH = 0K MEMORY_B1 (rx) : ORIGIN = 0x60000000, LENGTH = 0K
OCTOSPI2 (rx) : ORIGIN = 0x70000000, LENGTH = 256M OCTOSPI2 (rx) : ORIGIN = 0x70000000, LENGTH = 256M
OCTOSPI1 (rx) : ORIGIN = 0x90000000, LENGTH = 256M OCTOSPI1 (rx) : ORIGIN = 0x90000000, LENGTH = 256M
OCTOSPI1_CODE (rx): ORIGIN = ORIGIN(OCTOSPI1) + 1M, LENGTH = 1M - _exst_hash_size /* hard coded start address, as required by SPRACINGH7 boot loader, don't change! */ OCTOSPI1_CODE (rx): ORIGIN = ORIGIN(OCTOSPI1) + 1M, LENGTH = 1M - _exst_hash_size /* hard coded start address, as required by SPRACINGH7 boot loader, don't change! */
EXST_HASH (rx) : ORIGIN = ORIGIN(OCTOSPI1_CODE) + LENGTH(OCTOSPI1_CODE), LENGTH = _exst_hash_size EXST_HASH (rx) : ORIGIN = ORIGIN(OCTOSPI1_CODE) + LENGTH(OCTOSPI1_CODE), LENGTH = _exst_hash_size
} }
@ -112,7 +112,7 @@ SECTIONS
_edmaram = .; _edmaram = .;
_dmaram_end__ = _edmaram; _dmaram_end__ = _edmaram;
} >RAM } >RAM
.DMA_RW_D2 (NOLOAD) : .DMA_RW_D2 (NOLOAD) :
{ {
. = ALIGN(32); . = ALIGN(32);
@ -140,4 +140,3 @@ SECTIONS
INCLUDE "stm32_h723_common_post.ld" INCLUDE "stm32_h723_common_post.ld"
INCLUDE "stm32_ram_h723_exst_post.ld" INCLUDE "stm32_ram_h723_exst_post.ld"

6
src/link/stm32_ram_h723_exst_post.ld
View file

@ -11,12 +11,12 @@ SECTIONS
BYTE(0x00); /* Checksum method, 0x00 = MD5 hash */ BYTE(0x00); /* Checksum method, 0x00 = MD5 hash */
BYTE(0x00); /* Reserved */ BYTE(0x00); /* Reserved */
BYTE(0x00); /* Reserved */ BYTE(0x00); /* Reserved */
/* Fill the last 60 bytes with data, including an empty hash aligned */ /* Fill the last 60 bytes with data, including an empty hash aligned */
/* to the last 16 bytes. */ /* to the last 16 bytes. */
FILL(0x00000000); /* Reserved */ FILL(0x00000000); /* Reserved */
. = ORIGIN(EXST_HASH) + LENGTH(EXST_HASH) - 16; . = ORIGIN(EXST_HASH) + LENGTH(EXST_HASH) - 16;
__md5_hash_address__ = .; __md5_hash_address__ = .;
LONG(0x00000000); LONG(0x00000000);

7
src/link/stm32_ram_h730_exst.ld
View file

@ -30,7 +30,7 @@ ENTRY(Reset_Handler)
0x08000000 to 0x0801FFFF 128K isr vector, startup code, firmware, no config! // FLASH_Sector_0 0x08000000 to 0x0801FFFF 128K isr vector, startup code, firmware, no config! // FLASH_Sector_0
*/ */
/* /*
For H7 EXFL (External Flash) targets a binary is built that is placed on an external device. For H7 EXFL (External Flash) targets a binary is built that is placed on an external device.
The bootloader will enable the memory mapped mode on the CPU which allows code to run directly from The bootloader will enable the memory mapped mode on the CPU which allows code to run directly from
@ -61,7 +61,7 @@ MEMORY
MEMORY_B1 (rx) : ORIGIN = 0x60000000, LENGTH = 0K MEMORY_B1 (rx) : ORIGIN = 0x60000000, LENGTH = 0K
OCTOSPI2 (rx) : ORIGIN = 0x70000000, LENGTH = 256M OCTOSPI2 (rx) : ORIGIN = 0x70000000, LENGTH = 256M
OCTOSPI1 (rx) : ORIGIN = 0x90000000, LENGTH = 256M OCTOSPI1 (rx) : ORIGIN = 0x90000000, LENGTH = 256M
OCTOSPI1_CODE (rx): ORIGIN = ORIGIN(OCTOSPI1) + 1M, LENGTH = 1M - _exst_hash_size /* hard coded start address, as required by SPRACINGH7 boot loader, don't change! */ OCTOSPI1_CODE (rx): ORIGIN = ORIGIN(OCTOSPI1) + 1M, LENGTH = 1M - _exst_hash_size /* hard coded start address, as required by SPRACINGH7 boot loader, don't change! */
EXST_HASH (rx) : ORIGIN = ORIGIN(OCTOSPI1_CODE) + LENGTH(OCTOSPI1_CODE), LENGTH = _exst_hash_size EXST_HASH (rx) : ORIGIN = ORIGIN(OCTOSPI1_CODE) + LENGTH(OCTOSPI1_CODE), LENGTH = _exst_hash_size
} }
@ -112,7 +112,7 @@ SECTIONS
_edmaram = .; _edmaram = .;
_dmaram_end__ = _edmaram; _dmaram_end__ = _edmaram;
} >RAM } >RAM
.DMA_RW_D2 (NOLOAD) : .DMA_RW_D2 (NOLOAD) :
{ {
. = ALIGN(32); . = ALIGN(32);
@ -140,4 +140,3 @@ SECTIONS
INCLUDE "stm32_h730_common_post.ld" INCLUDE "stm32_h730_common_post.ld"
INCLUDE "stm32_ram_h730_exst_post.ld" INCLUDE "stm32_ram_h730_exst_post.ld"

6
src/link/stm32_ram_h730_exst_post.ld
View file

@ -11,12 +11,12 @@ SECTIONS
BYTE(0x00); /* Checksum method, 0x00 = MD5 hash */ BYTE(0x00); /* Checksum method, 0x00 = MD5 hash */
BYTE(0x00); /* Reserved */ BYTE(0x00); /* Reserved */
BYTE(0x00); /* Reserved */ BYTE(0x00); /* Reserved */
/* Fill the last 60 bytes with data, including an empty hash aligned */ /* Fill the last 60 bytes with data, including an empty hash aligned */
/* to the last 16 bytes. */ /* to the last 16 bytes. */
FILL(0x00000000); /* Reserved */ FILL(0x00000000); /* Reserved */
. = ORIGIN(EXST_HASH) + LENGTH(EXST_HASH) - 16; . = ORIGIN(EXST_HASH) + LENGTH(EXST_HASH) - 16;
__md5_hash_address__ = .; __md5_hash_address__ = .;
LONG(0x00000000); LONG(0x00000000);

20
src/link/stm32_ram_h743.ld
View file

@ -102,24 +102,24 @@ SECTIONS
} >RAM } >RAM
/* Critical program code goes into ITCM RAM */ /* Critical program code goes into ITCM RAM */
/* Copy specific fast-executing code to ITCM RAM */ /* Copy specific fast-executing code to ITCM RAM */
tcm_code = LOADADDR(.tcm_code); tcm_code = LOADADDR(.tcm_code);
.tcm_code : .tcm_code :
{ {
. = ALIGN(4); . = ALIGN(4);
tcm_code_start = .; tcm_code_start = .;
*(.tcm_code) *(.tcm_code)
*(.tcm_code*) *(.tcm_code*)
. = ALIGN(4); . = ALIGN(4);
tcm_code_end = .; tcm_code_end = .;
} >ITCM_RAM } >ITCM_RAM
.ARM.extab : .ARM.extab :
{ {
*(.ARM.extab* .gnu.linkonce.armextab.*) *(.ARM.extab* .gnu.linkonce.armextab.*)
} >RAM } >RAM
.ARM : .ARM :
{ {
__exidx_start = .; __exidx_start = .;
*(.ARM.exidx*) __exidx_end = .; *(.ARM.exidx*) __exidx_end = .;
@ -132,7 +132,7 @@ SECTIONS
KEEP (*(SORT(.pg_registry.*))) KEEP (*(SORT(.pg_registry.*)))
PROVIDE_HIDDEN (__pg_registry_end = .); PROVIDE_HIDDEN (__pg_registry_end = .);
} >RAM } >RAM
.pg_resetdata : .pg_resetdata :
{ {
PROVIDE_HIDDEN (__pg_resetdata_start = .); PROVIDE_HIDDEN (__pg_resetdata_start = .);

9
src/link/stm32_ram_h750_exst.ld
View file

@ -31,7 +31,7 @@ ENTRY(Reset_Handler)
0x08000000 to 0x0801FFFF 128K isr vector, startup code, firmware, no config! // FLASH_Sector_0 0x08000000 to 0x0801FFFF 128K isr vector, startup code, firmware, no config! // FLASH_Sector_0
*/ */
/* /*
For H7 EXST (External Storage) targets a binary is built that is placed on an external device. For H7 EXST (External Storage) targets a binary is built that is placed on an external device.
The bootloader will then copy this entire binary to RAM, at the CODE_RAM address. The bootloader The bootloader will then copy this entire binary to RAM, at the CODE_RAM address. The bootloader
@ -46,7 +46,7 @@ to ram and one section for the main code. e.g. one file for .tcm_code, one file
one for the main code/data, then load each to the appropriate address and adjust the usual startup one for the main code/data, then load each to the appropriate address and adjust the usual startup
code which will no-longer need to duplicate code/data sections from RAM to ITCM/DTCM RAM. code which will no-longer need to duplicate code/data sections from RAM to ITCM/DTCM RAM.
The initial CODE_RAM is sized at 448K to enable all firmware features and to as much RAM free as The initial CODE_RAM is sized at 448K to enable all firmware features and to as much RAM free as
possible. possible.
*/ */
@ -66,7 +66,7 @@ MEMORY
D2_RAM (rwx) : ORIGIN = 0x30000000, LENGTH = 256K /* SRAM1 + SRAM2 */ D2_RAM (rwx) : ORIGIN = 0x30000000, LENGTH = 256K /* SRAM1 + SRAM2 */
MEMORY_B1 (rx) : ORIGIN = 0x60000000, LENGTH = 0K MEMORY_B1 (rx) : ORIGIN = 0x60000000, LENGTH = 0K
QUADSPI (rx) : ORIGIN = 0x90000000, LENGTH = 0K QUADSPI (rx) : ORIGIN = 0x90000000, LENGTH = 0K
} }
REGION_ALIAS("STACKRAM", DTCM_RAM) REGION_ALIAS("STACKRAM", DTCM_RAM)
@ -113,7 +113,7 @@ SECTIONS
_edmaram = .; _edmaram = .;
_dmaram_end__ = _edmaram; _dmaram_end__ = _edmaram;
} >RAM } >RAM
.DMA_RW_D2 (NOLOAD) : .DMA_RW_D2 (NOLOAD) :
{ {
. = ALIGN(32); . = ALIGN(32);
@ -141,4 +141,3 @@ SECTIONS
INCLUDE "stm32_h750_common_post.ld" INCLUDE "stm32_h750_common_post.ld"
INCLUDE "stm32_ram_h750_exst_post.ld" INCLUDE "stm32_ram_h750_exst_post.ld"

6
src/link/stm32_ram_h750_exst_post.ld
View file

@ -11,12 +11,12 @@ SECTIONS
BYTE(0x00); /* Checksum method, 0x00 = MD5 hash */ BYTE(0x00); /* Checksum method, 0x00 = MD5 hash */
BYTE(0x00); /* Reserved */ BYTE(0x00); /* Reserved */
BYTE(0x00); /* Reserved */ BYTE(0x00); /* Reserved */
/* Fill the last 60 bytes with data, including an empty hash aligned */ /* Fill the last 60 bytes with data, including an empty hash aligned */
/* to the last 16 bytes. */ /* to the last 16 bytes. */
FILL(0x00000000); /* Reserved */ FILL(0x00000000); /* Reserved */
. = ORIGIN(EXST_HASH) + LENGTH(EXST_HASH) - 16; . = ORIGIN(EXST_HASH) + LENGTH(EXST_HASH) - 16;
__md5_hash_address__ = .; __md5_hash_address__ = .;
LONG(0x00000000); LONG(0x00000000);

232
src/main/cli/cli.c
View file

@ -209,33 +209,9 @@ static bool signatureUpdated = false;
static const char* const emptyName = "-"; static const char* const emptyName = "-";
static const char* const emptyString = ""; static const char* const emptyString = "";
#if !defined(USE_CUSTOM_DEFAULTS)
#define CUSTOM_DEFAULTS_START ((char*)0)
#define CUSTOM_DEFAULTS_END ((char *)0)
#else
extern char __custom_defaults_start;
extern char __custom_defaults_end;
#define CUSTOM_DEFAULTS_START (&__custom_defaults_start)
#define CUSTOM_DEFAULTS_END (&__custom_defaults_end)
static bool processingCustomDefaults = false;
static char cliBufferTemp[CLI_IN_BUFFER_SIZE];
#define CUSTOM_DEFAULTS_START_PREFIX ("# " FC_FIRMWARE_NAME)
#define MAX_CHANGESET_ID_LENGTH 8 #define MAX_CHANGESET_ID_LENGTH 8
#define MAX_DATE_LENGTH 20 #define MAX_DATE_LENGTH 20
static bool customDefaultsHeaderParsed = false;
static bool customDefaultsFound = false;
#endif
#if defined(USE_CUSTOM_DEFAULTS_ADDRESS)
static char __attribute__ ((section(".custom_defaults_start_address"))) *customDefaultsStart = CUSTOM_DEFAULTS_START;
static char __attribute__ ((section(".custom_defaults_end_address"))) *customDefaultsEnd = CUSTOM_DEFAULTS_END;
#endif
#define ERROR_INVALID_NAME "INVALID NAME: %s" #define ERROR_INVALID_NAME "INVALID NAME: %s"
#define ERROR_MESSAGE "%s CANNOT BE CHANGED. CURRENT VALUE: '%s'" #define ERROR_MESSAGE "%s CANNOT BE CHANGED. CURRENT VALUE: '%s'"
@ -714,33 +690,14 @@ static bool isReadingConfigFromCopy(void)
static bool isWritingConfigToCopy(void) static bool isWritingConfigToCopy(void)
{ {
return configIsInCopy return configIsInCopy;
#if defined(USE_CUSTOM_DEFAULTS)
&& !processingCustomDefaults
#endif
;
} }
#if defined(USE_CUSTOM_DEFAULTS) static void backupAndResetConfigs(void)
static bool cliProcessCustomDefaults(bool quiet);
#endif
static void backupAndResetConfigs(const bool useCustomDefaults)
{ {
backupConfigs(); backupConfigs();
// reset all configs to defaults to do differencing // reset all configs to defaults to do differencing
resetConfig(); resetConfig();
#if defined(USE_CUSTOM_DEFAULTS)
if (useCustomDefaults) {
if (!cliProcessCustomDefaults(true)) {
cliPrintLine("###WARNING: NO CUSTOM DEFAULTS FOUND###");
}
}
#else
UNUSED(useCustomDefaults);
#endif
} }
static uint8_t getPidProfileIndexToUse(void) static uint8_t getPidProfileIndexToUse(void)
@ -956,14 +913,7 @@ static void cliRepeat(char ch, uint8_t len)
static void cliPrompt(void) static void cliPrompt(void)
{ {
#if defined(USE_CUSTOM_DEFAULTS) && defined(DEBUG_CUSTOM_DEFAULTS) cliPrint("\r\n# ");
if (processingCustomDefaults) {
cliPrint("\r\nd: #");
} else
#endif
{
cliPrint("\r\n# ");
}
} }
static void cliShowParseError(const char *cmdName) static void cliShowParseError(const char *cmdName)
@ -4202,11 +4152,6 @@ static void cliBatch(const char *cmdName, char *cmdline)
static bool prepareSave(void) static bool prepareSave(void)
{ {
#if defined(USE_CUSTOM_DEFAULTS)
if (processingCustomDefaults) {
return true;
}
#endif
#ifdef USE_CLI_BATCH #ifdef USE_CLI_BATCH
if (commandBatchActive && commandBatchError) { if (commandBatchActive && commandBatchError) {
@ -4258,66 +4203,10 @@ static void cliSave(const char *cmdName, char *cmdline)
} }
} }
#if defined(USE_CUSTOM_DEFAULTS)
bool resetConfigToCustomDefaults(void)
{
resetConfig();
#ifdef USE_CLI_BATCH
commandBatchError = false;
#endif
cliProcessCustomDefaults(true);
#if defined(USE_SIMPLIFIED_TUNING)
applySimplifiedTuningAllProfiles();
#endif
return prepareSave();
}
static bool customDefaultsHasNext(const char *customDefaultsPtr)
{
return *customDefaultsPtr && *customDefaultsPtr != 0xFF && customDefaultsPtr < customDefaultsEnd;
}
static void parseCustomDefaultsHeader(void)
{
const char *customDefaultsPtr = customDefaultsStart;
if (strncmp(customDefaultsPtr, CUSTOM_DEFAULTS_START_PREFIX, strlen(CUSTOM_DEFAULTS_START_PREFIX)) == 0) {
customDefaultsFound = true;
customDefaultsPtr = strchr(customDefaultsPtr, '\n');
if (customDefaultsPtr && customDefaultsHasNext(customDefaultsPtr)) {
customDefaultsPtr++;
}
}
customDefaultsHeaderParsed = true;
}
bool hasCustomDefaults(void)
{
if (!customDefaultsHeaderParsed) {
parseCustomDefaultsHeader();
}
return customDefaultsFound;
}
#endif
static void cliDefaults(const char *cmdName, char *cmdline) static void cliDefaults(const char *cmdName, char *cmdline)
{ {
bool saveConfigs = true; bool saveConfigs = true;
uint16_t parameterGroupId = 0; uint16_t parameterGroupId = 0;
#if defined(USE_CUSTOM_DEFAULTS)
bool useCustomDefaults = true;
#elif defined(USE_CUSTOM_DEFAULTS_ADDRESS)
// Required to keep the linker from eliminating these
if (customDefaultsStart != customDefaultsEnd) {
delay(0);
}
#endif
char *saveptr; char *saveptr;
char* tok = strtok_r(cmdline, " ", &saveptr); char* tok = strtok_r(cmdline, " ", &saveptr);
@ -4330,35 +4219,12 @@ static void cliDefaults(const char *cmdName, char *cmdline)
if (!parameterGroupId) { if (!parameterGroupId) {
cliShowParseError(cmdName); cliShowParseError(cmdName);
return; return;
} }
} else if (strcasestr(tok, "group_id")) { } else if (strcasestr(tok, "group_id")) {
expectParameterGroupId = true; expectParameterGroupId = true;
} else if (strcasestr(tok, "nosave")) { } else if (strcasestr(tok, "nosave")) {
saveConfigs = false; saveConfigs = false;
#if defined(USE_CUSTOM_DEFAULTS)
} else if (strcasestr(tok, "bare")) {
useCustomDefaults = false;
} else if (strcasestr(tok, "show")) {
if (index != 0) {
cliShowParseError(cmdName);
} else if (hasCustomDefaults()) {
char *customDefaultsPtr = customDefaultsStart;
while (customDefaultsHasNext(customDefaultsPtr)) {
if (*customDefaultsPtr != '\n') {
cliPrintf("%c", *customDefaultsPtr++);
} else {
cliPrintLinefeed();
customDefaultsPtr++;
}
}
} else {
cliPrintError(cmdName, "NO CUSTOM DEFAULTS FOUND");
}
return;
#endif
} else { } else {
cliShowParseError(cmdName); cliShowParseError(cmdName);
@ -4392,12 +4258,6 @@ static void cliDefaults(const char *cmdName, char *cmdline)
commandBatchError = false; commandBatchError = false;
#endif #endif
#if defined(USE_CUSTOM_DEFAULTS)
if (useCustomDefaults) {
cliProcessCustomDefaults(false);
}
#endif
#if defined(USE_SIMPLIFIED_TUNING) #if defined(USE_SIMPLIFIED_TUNING)
applySimplifiedTuningAllProfiles(); applySimplifiedTuningAllProfiles();
#endif #endif
@ -4436,7 +4296,7 @@ STATIC_UNIT_TESTED void cliGet(const char *cmdName, char *cmdline)
pidProfileIndexToUse = getCurrentPidProfileIndex(); pidProfileIndexToUse = getCurrentPidProfileIndex();
rateProfileIndexToUse = getCurrentControlRateProfileIndex(); rateProfileIndexToUse = getCurrentControlRateProfileIndex();
backupAndResetConfigs(true); backupAndResetConfigs();
for (uint32_t i = 0; i < valueTableEntryCount; i++) { for (uint32_t i = 0; i < valueTableEntryCount; i++) {
if (strcasestr(valueTable[i].name, cmdline)) { if (strcasestr(valueTable[i].name, cmdline)) {
@ -4943,13 +4803,8 @@ static void cliTasks(const char *cmdName, char *cmdline)
} }
} }
static void printVersion(const char *cmdName, bool printBoardInfo) static void printVersion(bool printBoardInfo)
{ {
#if !(defined(USE_CUSTOM_DEFAULTS))
UNUSED(cmdName);
UNUSED(printBoardInfo);
#endif
cliPrintf("# %s / %s (%s) %s %s / %s (%s) MSP API: %s", cliPrintf("# %s / %s (%s) %s %s / %s (%s) MSP API: %s",
FC_FIRMWARE_NAME, FC_FIRMWARE_NAME,
targetName, targetName,
@ -4963,26 +4818,21 @@ static void printVersion(const char *cmdName, bool printBoardInfo)
cliPrintLinefeed(); cliPrintLinefeed();
#if defined(USE_CUSTOM_DEFAULTS)
if (hasCustomDefaults()) {
cliPrintHashLine("config: YES");
} else {
cliPrintError(cmdName, "NO CONFIG FOUND");
}
#endif // USE_CUSTOM_DEFAULTS
#if defined(USE_BOARD_INFO) #if defined(USE_BOARD_INFO)
if (printBoardInfo && strlen(getManufacturerId()) && strlen(getBoardName())) { if (printBoardInfo && strlen(getManufacturerId()) && strlen(getBoardName())) {
cliPrintLinef("# board: manufacturer_id: %s, board_name: %s", getManufacturerId(), getBoardName()); cliPrintLinef("# board: manufacturer_id: %s, board_name: %s", getManufacturerId(), getBoardName());
} }
#else
UNUSED(printBoardInfo);
#endif #endif
} }
static void cliVersion(const char *cmdName, char *cmdline) static void cliVersion(const char *cmdName, char *cmdline)
{ {
UNUSED(cmdName);
UNUSED(cmdline); UNUSED(cmdline);
printVersion(cmdName, true); printVersion(true);
} }
#ifdef USE_RC_SMOOTHING_FILTER #ifdef USE_RC_SMOOTHING_FILTER
@ -6248,14 +6098,14 @@ static void printConfig(const char *cmdName, char *cmdline, bool doDiff)
dumpMask = dumpMask | BARE; // show the diff / dump without extra commands and board specific data dumpMask = dumpMask | BARE; // show the diff / dump without extra commands and board specific data
} }
backupAndResetConfigs((dumpMask & BARE) == 0); backupAndResetConfigs();
#ifdef USE_CLI_BATCH #ifdef USE_CLI_BATCH
bool batchModeEnabled = false; bool batchModeEnabled = false;
#endif #endif
if ((dumpMask & DUMP_MASTER) || (dumpMask & DUMP_ALL)) { if ((dumpMask & DUMP_MASTER) || (dumpMask & DUMP_ALL)) {
cliPrintHashLine("version"); cliPrintHashLine("version");
printVersion(cmdName, false); printVersion(false);
if (!(dumpMask & BARE)) { if (!(dumpMask & BARE)) {
#ifdef USE_CLI_BATCH #ifdef USE_CLI_BATCH
@ -6522,11 +6372,7 @@ const clicmd_t cmdTable[] = {
#ifdef USE_LED_STRIP_STATUS_MODE #ifdef USE_LED_STRIP_STATUS_MODE
CLI_COMMAND_DEF("color", "configure colors", NULL, cliColor), CLI_COMMAND_DEF("color", "configure colors", NULL, cliColor),
#endif #endif
#if defined(USE_CUSTOM_DEFAULTS)
CLI_COMMAND_DEF("defaults", "reset to defaults and reboot", "{show} {nosave} {bare} {group_id <id>}", cliDefaults),
#else
CLI_COMMAND_DEF("defaults", "reset to defaults and reboot", "{nosave}", cliDefaults), CLI_COMMAND_DEF("defaults", "reset to defaults and reboot", "{nosave}", cliDefaults),
#endif
CLI_COMMAND_DEF("diff", "list configuration changes from default", "[master|profile|rates|hardware|all] {defaults|bare}", cliDiff), CLI_COMMAND_DEF("diff", "list configuration changes from default", "[master|profile|rates|hardware|all] {defaults|bare}", cliDiff),
#ifdef USE_RESOURCE_MGMT #ifdef USE_RESOURCE_MGMT
@ -6699,12 +6545,6 @@ static void processCharacter(const char c)
// enter pressed // enter pressed
cliPrintLinefeed(); cliPrintLinefeed();
#if defined(USE_CUSTOM_DEFAULTS) && defined(DEBUG_CUSTOM_DEFAULTS)
if (processingCustomDefaults) {
cliPrint("d: ");
}
#endif
// Strip comment starting with # from line // Strip comment starting with # from line
char *p = cliBuffer; char *p = cliBuffer;
p = strchr(p, '#'); p = strchr(p, '#');
@ -6826,56 +6666,6 @@ void cliProcess(void)
} }
} }
#if defined(USE_CUSTOM_DEFAULTS)
static bool cliProcessCustomDefaults(bool quiet)
{
if (processingCustomDefaults || !hasCustomDefaults()) {
return false;
}
bufWriter_t *cliWriterTemp = NULL;
if (quiet
#if !defined(DEBUG_CUSTOM_DEFAULTS)
|| true
#endif
) {
cliWriterTemp = cliWriter;
cliWriter = NULL;
}
if (quiet) {
cliErrorWriter = NULL;
}
memcpy(cliBufferTemp, cliBuffer, sizeof(cliBuffer));
uint32_t bufferIndexTemp = bufferIndex;
bufferIndex = 0;
processingCustomDefaults = true;
char *customDefaultsPtr = customDefaultsStart;
while (customDefaultsHasNext(customDefaultsPtr)) {
processCharacter(*customDefaultsPtr++);
}
// Process a newline at the very end so that the last command gets executed,
// even when the file did not contain a trailing newline
processCharacter('\r');
processingCustomDefaults = false;
if (cliWriterTemp) {
cliWriter = cliWriterTemp;
cliErrorWriter = cliWriter;
}
memcpy(cliBuffer, cliBufferTemp, sizeof(cliBuffer));
bufferIndex = bufferIndexTemp;
systemConfigMutable()->configurationState = CONFIGURATION_STATE_DEFAULTS_CUSTOM;
return true;
}
#endif
void cliEnter(serialPort_t *serialPort) void cliEnter(serialPort_t *serialPort)
{ {
cliMode = true; cliMode = true;

17
src/main/config/config.c
View file

@ -797,20 +797,9 @@ void writeEEPROM(void)
writeUnmodifiedConfigToEEPROM(); writeUnmodifiedConfigToEEPROM();
} }
bool resetEEPROM(bool useCustomDefaults) bool resetEEPROM(void)
{ {
#if !defined(USE_CUSTOM_DEFAULTS) resetConfig();
UNUSED(useCustomDefaults);
#else
if (useCustomDefaults) {
if (!resetConfigToCustomDefaults()) {
return false;
}
} else
#endif
{
resetConfig();
}
writeUnmodifiedConfigToEEPROM(); writeUnmodifiedConfigToEEPROM();
@ -822,7 +811,7 @@ void ensureEEPROMStructureIsValid(void)
if (isEEPROMStructureValid()) { if (isEEPROMStructureValid()) {
return; return;
} }
resetEEPROM(false); resetEEPROM();
} }
void saveConfigAndNotify(void) void saveConfigAndNotify(void)

2
src/main/config/config.h
View file

@ -60,7 +60,7 @@ struct pidProfile_s;
extern struct pidProfile_s *currentPidProfile; extern struct pidProfile_s *currentPidProfile;
void initEEPROM(void); void initEEPROM(void);
bool resetEEPROM(bool useCustomDefaults); bool resetEEPROM(void);
bool readEEPROM(void); bool readEEPROM(void);
void writeEEPROM(void); void writeEEPROM(void);
void writeUnmodifiedConfigToEEPROM(void); void writeUnmodifiedConfigToEEPROM(void);

1
src/main/drivers/at32/platform_mcu.h
View file

@ -72,7 +72,6 @@ typedef enum {DISABLE = 0, ENABLE = !DISABLE} FunctionalState;
#define USE_TIMER_AF #define USE_TIMER_AF
#define USE_DMA_SPEC #define USE_DMA_SPEC
#define USE_PERSISTENT_OBJECTS #define USE_PERSISTENT_OBJECTS
#define USE_CUSTOM_DEFAULTS_ADDRESS
#define USE_ADC_INTERNAL #define USE_ADC_INTERNAL
#define USE_LATE_TASK_STATISTICS #define USE_LATE_TASK_STATISTICS

2
src/main/drivers/stm32/platform_mcu.h
View file

@ -125,7 +125,6 @@
#define USE_MCO #define USE_MCO
#define USE_DMA_SPEC #define USE_DMA_SPEC
#define USE_PERSISTENT_OBJECTS #define USE_PERSISTENT_OBJECTS
#define USE_CUSTOM_DEFAULTS_ADDRESS
#define USE_LATE_TASK_STATISTICS #define USE_LATE_TASK_STATISTICS
#if defined(STM32F40_41xxx) || defined(STM32F411xE) #if defined(STM32F40_41xxx) || defined(STM32F411xE)
@ -148,7 +147,6 @@
#define USE_MCO #define USE_MCO
#define USE_DMA_SPEC #define USE_DMA_SPEC
#define USE_PERSISTENT_OBJECTS #define USE_PERSISTENT_OBJECTS
#define USE_CUSTOM_DEFAULTS_ADDRESS
#define USE_LATE_TASK_STATISTICS #define USE_LATE_TASK_STATISTICS
#endif // STM32F7 #endif // STM32F7

4
src/main/fc/init.c
View file

@ -408,7 +408,7 @@ void init(void)
#endif #endif
if (!readSuccess || !isEEPROMVersionValid() || strncasecmp(systemConfig()->boardIdentifier, TARGET_BOARD_IDENTIFIER, sizeof(TARGET_BOARD_IDENTIFIER))) { if (!readSuccess || !isEEPROMVersionValid() || strncasecmp(systemConfig()->boardIdentifier, TARGET_BOARD_IDENTIFIER, sizeof(TARGET_BOARD_IDENTIFIER))) {
resetEEPROM(false); resetEEPROM();
} }
systemState |= SYSTEM_STATE_CONFIG_LOADED; systemState |= SYSTEM_STATE_CONFIG_LOADED;
@ -463,7 +463,7 @@ void init(void)
bothButtonsHeld = buttonAPressed() && buttonBPressed(); bothButtonsHeld = buttonAPressed() && buttonBPressed();
if (bothButtonsHeld) { if (bothButtonsHeld) {
if (--secondsRemaining == 0) { if (--secondsRemaining == 0) {
resetEEPROM(false); resetEEPROM();
#ifdef USE_PERSISTENT_OBJECTS #ifdef USE_PERSISTENT_OBJECTS
persistentObjectWrite(PERSISTENT_OBJECT_RESET_REASON, RESET_NONE); persistentObjectWrite(PERSISTENT_OBJECT_RESET_REASON, RESET_NONE);
#endif #endif

20
src/main/msp/msp.c
View file

@ -672,12 +672,7 @@ static bool mspCommonProcessOutCommand(int16_t cmdMSP, sbuf_t *dst, mspPostProce
#if defined(USE_FLASH_BOOT_LOADER) #if defined(USE_FLASH_BOOT_LOADER)
targetCapabilities |= BIT(TARGET_HAS_FLASH_BOOTLOADER); targetCapabilities |= BIT(TARGET_HAS_FLASH_BOOTLOADER);
#endif #endif
#if defined(USE_CUSTOM_DEFAULTS)
targetCapabilities |= BIT(TARGET_SUPPORTS_CUSTOM_DEFAULTS);
if (hasCustomDefaults()) {
targetCapabilities |= BIT(TARGET_HAS_CUSTOM_DEFAULTS);
}
#endif
#if defined(USE_RX_BIND) #if defined(USE_RX_BIND)
if (getRxBindSupported()) { if (getRxBindSupported()) {
targetCapabilities |= BIT(TARGET_SUPPORTS_RX_BIND); targetCapabilities |= BIT(TARGET_SUPPORTS_RX_BIND);
@ -2487,25 +2482,14 @@ static mspResult_e mspFcProcessOutCommandWithArg(mspDescriptor_t srcDesc, int16_
case MSP_RESET_CONF: case MSP_RESET_CONF:
{ {
#if defined(USE_CUSTOM_DEFAULTS)
defaultsType_e defaultsType = DEFAULTS_TYPE_CUSTOM;
#endif
if (sbufBytesRemaining(src) >= 1) { if (sbufBytesRemaining(src) >= 1) {
// Added in MSP API 1.42 // Added in MSP API 1.42
#if defined(USE_CUSTOM_DEFAULTS)
defaultsType = sbufReadU8(src);
#else
sbufReadU8(src); sbufReadU8(src);
#endif
} }
bool success = false; bool success = false;
if (!ARMING_FLAG(ARMED)) { if (!ARMING_FLAG(ARMED)) {
#if defined(USE_CUSTOM_DEFAULTS) success = resetEEPROM();
success = resetEEPROM(defaultsType == DEFAULTS_TYPE_CUSTOM);
#else
success = resetEEPROM(false);
#endif
if (success && mspPostProcessFn) { if (success && mspPostProcessFn) {
rebootMode = MSP_REBOOT_FIRMWARE; rebootMode = MSP_REBOOT_FIRMWARE;

3
src/main/sensors/gyro_init.c
View file

@ -663,9 +663,6 @@ bool gyroInit(void)
detectedSensors[SENSOR_INDEX_GYRO] = gyro.gyroSensor2.gyroDev.gyroHardware; detectedSensors[SENSOR_INDEX_GYRO] = gyro.gyroSensor2.gyroDev.gyroHardware;
} }
#endif #endif
#ifdef USE_CUSTOM_DEFAULTS
eepromWriteRequired = eepromWriteRequired && systemConfig()->configurationState != CONFIGURATION_STATE_DEFAULTS_BARE;
#endif
if (eepromWriteRequired) { if (eepromWriteRequired) {
writeEEPROM(); writeEEPROM();

9
src/main/target/AT32F435/target.h
View file

@ -59,11 +59,10 @@
#define USE_ADC #define USE_ADC
#define USE_CUSTOM_DEFAULTS
#define USE_PWM_OUTPUT #define USE_PWM_OUTPUT
// Remove these undefines as support is added // Remove these undefines as support is added
#undef USE_BEEPER //#undef USE_BEEPER
#undef USE_LED_STRIP #undef USE_LED_STRIP
#undef USE_TRANSPONDER #undef USE_TRANSPONDER
#undef USE_DSHOT #undef USE_DSHOT
@ -73,10 +72,10 @@
#undef USE_RX_SPI #undef USE_RX_SPI
#undef USE_RX_CC2500 #undef USE_RX_CC2500
#undef USE_RX_EXPRESSLRS #undef USE_RX_EXPRESSLRS
#undef USE_CMS //#undef USE_CMS
#undef USE_OSD //#undef USE_OSD
#undef USE_BLACKBOX #undef USE_BLACKBOX
#undef USE_SDCARD //#undef USE_SDCARD
//#undef USE_BARO //#undef USE_BARO
//#undef USE_MAG //#undef USE_MAG
#undef USE_SERIAL_4WAY_BLHELI_BOOTLOADER #undef USE_SERIAL_4WAY_BLHELI_BOOTLOADER

1
src/main/target/STM32F405/target.h
View file

@ -76,7 +76,6 @@
#define USE_ADC #define USE_ADC
#define USE_CUSTOM_DEFAULTS
#define USE_EXTI #define USE_EXTI
#define FLASH_PAGE_SIZE ((uint32_t)0x4000) // 16K sectors #define FLASH_PAGE_SIZE ((uint32_t)0x4000) // 16K sectors

1
src/main/target/STM32F411/target.h
View file

@ -73,7 +73,6 @@
#define USE_ADC #define USE_ADC
#define USE_CUSTOM_DEFAULTS
#define USE_EXTI #define USE_EXTI
#define FLASH_PAGE_SIZE ((uint32_t)0x4000) // 16K sectors #define FLASH_PAGE_SIZE ((uint32_t)0x4000) // 16K sectors

1
src/main/target/STM32F745/target.h
View file

@ -83,7 +83,6 @@
#define USE_ADC #define USE_ADC
#define USE_CUSTOM_DEFAULTS
#define USE_EXTI #define USE_EXTI
#define FLASH_PAGE_SIZE ((uint32_t)0x8000) // 32K sectors #define FLASH_PAGE_SIZE ((uint32_t)0x8000) // 32K sectors

3
src/main/target/STM32F7X2/target.h
View file

@ -74,8 +74,5 @@
#define USE_ESCSERIAL #define USE_ESCSERIAL
#define USE_ADC #define USE_ADC
#define USE_CUSTOM_DEFAULTS
#define USE_EXTI #define USE_EXTI
#define FLASH_PAGE_SIZE ((uint32_t)0x4000) // 16K sectors #define FLASH_PAGE_SIZE ((uint32_t)0x4000) // 16K sectors

2
src/main/target/STM32G47X/target.h
View file

@ -73,8 +73,6 @@
#define USE_ESCSERIAL #define USE_ESCSERIAL
#define USE_ADC #define USE_ADC
#define USE_CUSTOM_DEFAULTS
#define USE_EXTI #define USE_EXTI
#define USE_TIMER_UP_CONFIG #define USE_TIMER_UP_CONFIG

4
src/main/target/STM32H723/target.h
View file

@ -94,10 +94,6 @@
#define USE_ADC #define USE_ADC
#if !defined(USE_EXST)
#define USE_CUSTOM_DEFAULTS
#endif
#define USE_EXTI #define USE_EXTI
#define USE_TIMER_UP_CONFIG #define USE_TIMER_UP_CONFIG

2
src/main/target/STM32H743/target.h
View file

@ -82,8 +82,6 @@
#define USE_ESCSERIAL #define USE_ESCSERIAL
#define USE_ADC #define USE_ADC
#define USE_CUSTOM_DEFAULTS
#define USE_EXTI #define USE_EXTI
#define USE_TIMER_UP_CONFIG #define USE_TIMER_UP_CONFIG

4
src/main/target/common_post.h
View file

@ -548,10 +548,6 @@ extern uint8_t __config_end;
#undef USE_ABSOLUTE_CONTROL #undef USE_ABSOLUTE_CONTROL
#endif #endif
#if defined(USE_CUSTOM_DEFAULTS)
#define USE_CUSTOM_DEFAULTS_ADDRESS
#endif
#if defined(USE_RX_EXPRESSLRS) #if defined(USE_RX_EXPRESSLRS)
// ELRS depends on CRSF telemetry // ELRS depends on CRSF telemetry
#if !defined(USE_TELEMETRY) #if !defined(USE_TELEMETRY)

2
src/test/unit/cli_unittest.cc
View file

@ -272,7 +272,7 @@ void beeperOffSet(uint32_t) {}
void beeperOffClear(uint32_t) {} void beeperOffClear(uint32_t) {}
void beeperOffClearAll(void) {} void beeperOffClearAll(void) {}
bool parseColor(int, const char *) {return false; } bool parseColor(int, const char *) {return false; }
bool resetEEPROM(bool) { return true; } bool resetEEPROM(void) { return true; }
void bufWriterFlush(bufWriter_t *) {} void bufWriterFlush(bufWriter_t *) {}
void mixerResetDisarmedMotors(void) {} void mixerResetDisarmedMotors(void) {}
void gpsEnablePassthrough(struct serialPort_s *) {} void gpsEnablePassthrough(struct serialPort_s *) {}