From d07ebe7717ef396de12f509fce804e2b05ca5421 Mon Sep 17 00:00:00 2001 From: philmoz Date: Fri, 27 Mar 2026 22:00:17 +1100 Subject: [PATCH] fix(firmware): fix build when using ALL_LANGUAGES option (#7212) --- .../linker/stm32h750_sdram/bootloader/layout.ld | 2 +- .../boards/generic_stm32/linker/stm32h750_sdram/layout.ld | 2 +- .../linker/stm32h7rs_sdram/bootloader/layout.ld | 2 +- .../boards/generic_stm32/linker/stm32h7rs_sdram/layout.ld | 2 +- radio/src/translations/sim/lang_cn.cpp | 6 +++--- radio/src/translations/sim/lang_cz.cpp | 6 +++--- radio/src/translations/sim/lang_da.cpp | 6 +++--- radio/src/translations/sim/lang_de.cpp | 6 +++--- radio/src/translations/sim/lang_en.cpp | 6 +++--- radio/src/translations/sim/lang_es.cpp | 6 +++--- radio/src/translations/sim/lang_fi.cpp | 6 +++--- radio/src/translations/sim/lang_fr.cpp | 6 +++--- radio/src/translations/sim/lang_he.cpp | 6 +++--- radio/src/translations/sim/lang_it.cpp | 6 +++--- radio/src/translations/sim/lang_jp.cpp | 6 +++--- radio/src/translations/sim/lang_ko.cpp | 6 +++--- radio/src/translations/sim/lang_nl.cpp | 6 +++--- radio/src/translations/sim/lang_pl.cpp | 6 +++--- radio/src/translations/sim/lang_pt.cpp | 6 +++--- radio/src/translations/sim/lang_ru.cpp | 6 +++--- radio/src/translations/sim/lang_se.cpp | 6 +++--- radio/src/translations/sim/lang_tw.cpp | 6 +++--- radio/src/translations/sim/lang_ua.cpp | 6 +++--- 23 files changed, 61 insertions(+), 61 deletions(-) diff --git a/radio/src/boards/generic_stm32/linker/stm32h750_sdram/bootloader/layout.ld b/radio/src/boards/generic_stm32/linker/stm32h750_sdram/bootloader/layout.ld index c7a47f1cd..ff8f63d8a 100644 --- a/radio/src/boards/generic_stm32/linker/stm32h750_sdram/bootloader/layout.ld +++ b/radio/src/boards/generic_stm32/linker/stm32h750_sdram/bootloader/layout.ld @@ -18,7 +18,7 @@ BOOTLOADER_SIZE = 0x10000; MAIN_STACK_SIZE = 8192; /* Generate a link error if heap and stack don't fit into RAM */ -MIN_HEAP_SIZE = 4096k; /* required amount of heap */ +MIN_HEAP_SIZE = 1024k; /* minimum size of heap - all unused SDRAM will be used regardless of this setting */ /* Specify the memory areas */ MEMORY diff --git a/radio/src/boards/generic_stm32/linker/stm32h750_sdram/layout.ld b/radio/src/boards/generic_stm32/linker/stm32h750_sdram/layout.ld index 86b95bbfb..1ce2dbb74 100644 --- a/radio/src/boards/generic_stm32/linker/stm32h750_sdram/layout.ld +++ b/radio/src/boards/generic_stm32/linker/stm32h750_sdram/layout.ld @@ -18,7 +18,7 @@ BOOTLOADER_SIZE = 0x10000; MAIN_STACK_SIZE = 8192; /* Generate a link error if heap and stack don't fit into RAM */ -MIN_HEAP_SIZE = 4096k; /* required amount of heap */ +MIN_HEAP_SIZE = 1024k; /* minimum size of heap - all unused SDRAM will be used regardless of this setting */ /* Specify the memory areas */ MEMORY diff --git a/radio/src/boards/generic_stm32/linker/stm32h7rs_sdram/bootloader/layout.ld b/radio/src/boards/generic_stm32/linker/stm32h7rs_sdram/bootloader/layout.ld index c00cd747e..c8e792bdb 100644 --- a/radio/src/boards/generic_stm32/linker/stm32h7rs_sdram/bootloader/layout.ld +++ b/radio/src/boards/generic_stm32/linker/stm32h7rs_sdram/bootloader/layout.ld @@ -18,7 +18,7 @@ BOOTLOADER_SIZE = 0x10000; MAIN_STACK_SIZE = 8192; /* Generate a link error if heap and stack don't fit into RAM */ -MIN_HEAP_SIZE = 4096k; /* required amount of heap */ +MIN_HEAP_SIZE = 1024k; /* minimum size of heap - all unused SDRAM will be used regardless of this setting */ /* Specify the memory areas */ MEMORY diff --git a/radio/src/boards/generic_stm32/linker/stm32h7rs_sdram/layout.ld b/radio/src/boards/generic_stm32/linker/stm32h7rs_sdram/layout.ld index 4f18f42d4..cd0582a2d 100644 --- a/radio/src/boards/generic_stm32/linker/stm32h7rs_sdram/layout.ld +++ b/radio/src/boards/generic_stm32/linker/stm32h7rs_sdram/layout.ld @@ -18,7 +18,7 @@ BOOTLOADER_SIZE = 0x10000; MAIN_STACK_SIZE = 8192; /* Generate a link error if heap and stack don't fit into RAM */ -MIN_HEAP_SIZE = 4096k; /* required amount of heap */ +MIN_HEAP_SIZE = 1024k; /* minimum size of heap - all unused SDRAM will be used regardless of this setting */ /* Specify the memory areas */ MEMORY diff --git a/radio/src/translations/sim/lang_cn.cpp b/radio/src/translations/sim/lang_cn.cpp index 3c91948af..d5c9bb279 100644 --- a/radio/src/translations/sim/lang_cn.cpp +++ b/radio/src/translations/sim/lang_cn.cpp @@ -26,9 +26,9 @@ #include "translations/i18n/cn.h" // Static string -#define STR(x) static const char LNG_STR_##x[] = TR_##x; +#define STR(x) static const char LNG_STR_##x[] __FLASH = TR_##x; // Static string array -#define STRARRAY(x) static const char* const LNG_STR_##x[] = { TR_##x }; +#define STRARRAY(x) static const char* const LNG_STR_##x[] __FLASH = { TR_##x }; #include "translations/string_list.h" @@ -40,6 +40,6 @@ // Static string array #define STRARRAY(x) LNG_STR_##x, -const LangStrings cnLangStrings = { +const LangStrings cnLangStrings __FLASH = { #include "translations/string_list.h" }; diff --git a/radio/src/translations/sim/lang_cz.cpp b/radio/src/translations/sim/lang_cz.cpp index 3fc4f1ba2..cbe882a74 100644 --- a/radio/src/translations/sim/lang_cz.cpp +++ b/radio/src/translations/sim/lang_cz.cpp @@ -26,9 +26,9 @@ #include "translations/i18n/cz.h" // Static string -#define STR(x) static const char LNG_STR_##x[] = TR_##x; +#define STR(x) static const char LNG_STR_##x[] __FLASH = TR_##x; // Static string array -#define STRARRAY(x) static const char* const LNG_STR_##x[] = { TR_##x }; +#define STRARRAY(x) static const char* const LNG_STR_##x[] __FLASH = { TR_##x }; #include "translations/string_list.h" @@ -40,6 +40,6 @@ // Static string array #define STRARRAY(x) LNG_STR_##x, -const LangStrings czLangStrings = { +const LangStrings czLangStrings __FLASH = { #include "translations/string_list.h" }; diff --git a/radio/src/translations/sim/lang_da.cpp b/radio/src/translations/sim/lang_da.cpp index eb725f012..d6fc8cdfa 100644 --- a/radio/src/translations/sim/lang_da.cpp +++ b/radio/src/translations/sim/lang_da.cpp @@ -26,9 +26,9 @@ #include "translations/i18n/da.h" // Static string -#define STR(x) static const char LNG_STR_##x[] = TR_##x; +#define STR(x) static const char LNG_STR_##x[] __FLASH = TR_##x; // Static string array -#define STRARRAY(x) static const char* const LNG_STR_##x[] = { TR_##x }; +#define STRARRAY(x) static const char* const LNG_STR_##x[] __FLASH = { TR_##x }; #include "translations/string_list.h" @@ -40,6 +40,6 @@ // Static string array #define STRARRAY(x) LNG_STR_##x, -const LangStrings daLangStrings = { +const LangStrings daLangStrings __FLASH = { #include "translations/string_list.h" }; diff --git a/radio/src/translations/sim/lang_de.cpp b/radio/src/translations/sim/lang_de.cpp index 39682f488..bfd3954df 100644 --- a/radio/src/translations/sim/lang_de.cpp +++ b/radio/src/translations/sim/lang_de.cpp @@ -26,9 +26,9 @@ #include "translations/i18n/de.h" // Static string -#define STR(x) static const char LNG_STR_##x[] = TR_##x; +#define STR(x) static const char LNG_STR_##x[] __FLASH = TR_##x; // Static string array -#define STRARRAY(x) static const char* const LNG_STR_##x[] = { TR_##x }; +#define STRARRAY(x) static const char* const LNG_STR_##x[] __FLASH = { TR_##x }; #include "translations/string_list.h" @@ -40,6 +40,6 @@ // Static string array #define STRARRAY(x) LNG_STR_##x, -const LangStrings deLangStrings = { +const LangStrings deLangStrings __FLASH = { #include "translations/string_list.h" }; diff --git a/radio/src/translations/sim/lang_en.cpp b/radio/src/translations/sim/lang_en.cpp index 5f39dc598..beb02010c 100644 --- a/radio/src/translations/sim/lang_en.cpp +++ b/radio/src/translations/sim/lang_en.cpp @@ -26,9 +26,9 @@ #include "translations/i18n/en.h" // Static string -#define STR(x) static const char EN_STR_##x[] = TR_##x; +#define STR(x) static const char EN_STR_##x[] __FLASH = TR_##x; // Static string array -#define STRARRAY(x) static const char* const EN_STR_##x[] = { TR_##x }; +#define STRARRAY(x) static const char* const EN_STR_##x[] __FLASH = { TR_##x }; #include "translations/string_list.h" @@ -40,6 +40,6 @@ // Static string array #define STRARRAY(x) EN_STR_##x, -const LangStrings enLangStrings = { +const LangStrings enLangStrings __FLASH = { #include "translations/string_list.h" }; diff --git a/radio/src/translations/sim/lang_es.cpp b/radio/src/translations/sim/lang_es.cpp index 0da537510..196ceee36 100644 --- a/radio/src/translations/sim/lang_es.cpp +++ b/radio/src/translations/sim/lang_es.cpp @@ -26,9 +26,9 @@ #include "translations/i18n/es.h" // Static string -#define STR(x) static const char LNG_STR_##x[] = TR_##x; +#define STR(x) static const char LNG_STR_##x[] __FLASH = TR_##x; // Static string array -#define STRARRAY(x) static const char* const LNG_STR_##x[] = { TR_##x }; +#define STRARRAY(x) static const char* const LNG_STR_##x[] __FLASH = { TR_##x }; #include "translations/string_list.h" @@ -40,6 +40,6 @@ // Static string array #define STRARRAY(x) LNG_STR_##x, -const LangStrings esLangStrings = { +const LangStrings esLangStrings __FLASH = { #include "translations/string_list.h" }; diff --git a/radio/src/translations/sim/lang_fi.cpp b/radio/src/translations/sim/lang_fi.cpp index e34c1c985..216063d8f 100644 --- a/radio/src/translations/sim/lang_fi.cpp +++ b/radio/src/translations/sim/lang_fi.cpp @@ -26,9 +26,9 @@ #include "translations/i18n/fi.h" // Static string -#define STR(x) static const char LNG_STR_##x[] = TR_##x; +#define STR(x) static const char LNG_STR_##x[] __FLASH = TR_##x; // Static string array -#define STRARRAY(x) static const char* const LNG_STR_##x[] = { TR_##x }; +#define STRARRAY(x) static const char* const LNG_STR_##x[] __FLASH = { TR_##x }; #include "translations/string_list.h" @@ -40,6 +40,6 @@ // Static string array #define STRARRAY(x) LNG_STR_##x, -const LangStrings fiLangStrings = { +const LangStrings fiLangStrings __FLASH = { #include "translations/string_list.h" }; diff --git a/radio/src/translations/sim/lang_fr.cpp b/radio/src/translations/sim/lang_fr.cpp index 339dae102..b82907a7c 100644 --- a/radio/src/translations/sim/lang_fr.cpp +++ b/radio/src/translations/sim/lang_fr.cpp @@ -26,9 +26,9 @@ #include "translations/i18n/fr.h" // Static string -#define STR(x) static const char LNG_STR_##x[] = TR_##x; +#define STR(x) static const char LNG_STR_##x[] __FLASH = TR_##x; // Static string array -#define STRARRAY(x) static const char* const LNG_STR_##x[] = { TR_##x }; +#define STRARRAY(x) static const char* const LNG_STR_##x[] __FLASH = { TR_##x }; #include "translations/string_list.h" @@ -40,6 +40,6 @@ // Static string array #define STRARRAY(x) LNG_STR_##x, -const LangStrings frLangStrings = { +const LangStrings frLangStrings __FLASH = { #include "translations/string_list.h" }; diff --git a/radio/src/translations/sim/lang_he.cpp b/radio/src/translations/sim/lang_he.cpp index 55ca21e4f..cfe40467d 100644 --- a/radio/src/translations/sim/lang_he.cpp +++ b/radio/src/translations/sim/lang_he.cpp @@ -26,9 +26,9 @@ #include "translations/i18n/he.h" // Static string -#define STR(x) static const char LNG_STR_##x[] = TR_##x; +#define STR(x) static const char LNG_STR_##x[] __FLASH = TR_##x; // Static string array -#define STRARRAY(x) static const char* const LNG_STR_##x[] = { TR_##x }; +#define STRARRAY(x) static const char* const LNG_STR_##x[] __FLASH = { TR_##x }; #include "translations/string_list.h" @@ -40,6 +40,6 @@ // Static string array #define STRARRAY(x) LNG_STR_##x, -const LangStrings heLangStrings = { +const LangStrings heLangStrings __FLASH = { #include "translations/string_list.h" }; diff --git a/radio/src/translations/sim/lang_it.cpp b/radio/src/translations/sim/lang_it.cpp index b66899574..22ac5db90 100644 --- a/radio/src/translations/sim/lang_it.cpp +++ b/radio/src/translations/sim/lang_it.cpp @@ -26,9 +26,9 @@ #include "translations/i18n/it.h" // Static string -#define STR(x) static const char LNG_STR_##x[] = TR_##x; +#define STR(x) static const char LNG_STR_##x[] __FLASH = TR_##x; // Static string array -#define STRARRAY(x) static const char* const LNG_STR_##x[] = { TR_##x }; +#define STRARRAY(x) static const char* const LNG_STR_##x[] __FLASH = { TR_##x }; #include "translations/string_list.h" @@ -40,6 +40,6 @@ // Static string array #define STRARRAY(x) LNG_STR_##x, -const LangStrings itLangStrings = { +const LangStrings itLangStrings __FLASH = { #include "translations/string_list.h" }; diff --git a/radio/src/translations/sim/lang_jp.cpp b/radio/src/translations/sim/lang_jp.cpp index 5c17995c8..54e36ad2b 100644 --- a/radio/src/translations/sim/lang_jp.cpp +++ b/radio/src/translations/sim/lang_jp.cpp @@ -26,9 +26,9 @@ #include "translations/i18n/jp.h" // Static string -#define STR(x) static const char LNG_STR_##x[] = TR_##x; +#define STR(x) static const char LNG_STR_##x[] __FLASH = TR_##x; // Static string array -#define STRARRAY(x) static const char* const LNG_STR_##x[] = { TR_##x }; +#define STRARRAY(x) static const char* const LNG_STR_##x[] __FLASH = { TR_##x }; #include "translations/string_list.h" @@ -40,6 +40,6 @@ // Static string array #define STRARRAY(x) LNG_STR_##x, -const LangStrings jpLangStrings = { +const LangStrings jpLangStrings __FLASH = { #include "translations/string_list.h" }; diff --git a/radio/src/translations/sim/lang_ko.cpp b/radio/src/translations/sim/lang_ko.cpp index 049404289..4cfbc2b2c 100644 --- a/radio/src/translations/sim/lang_ko.cpp +++ b/radio/src/translations/sim/lang_ko.cpp @@ -26,9 +26,9 @@ #include "translations/i18n/ko.h" // Static string -#define STR(x) static const char LNG_STR_##x[] = TR_##x; +#define STR(x) static const char LNG_STR_##x[] __FLASH = TR_##x; // Static string array -#define STRARRAY(x) static const char* const LNG_STR_##x[] = { TR_##x }; +#define STRARRAY(x) static const char* const LNG_STR_##x[] __FLASH = { TR_##x }; #include "translations/string_list.h" @@ -40,6 +40,6 @@ // Static string array #define STRARRAY(x) LNG_STR_##x, -const LangStrings koLangStrings = { +const LangStrings koLangStrings __FLASH = { #include "translations/string_list.h" }; diff --git a/radio/src/translations/sim/lang_nl.cpp b/radio/src/translations/sim/lang_nl.cpp index 4cad813f6..5b53cf976 100644 --- a/radio/src/translations/sim/lang_nl.cpp +++ b/radio/src/translations/sim/lang_nl.cpp @@ -26,9 +26,9 @@ #include "translations/i18n/nl.h" // Static string -#define STR(x) static const char LNG_STR_##x[] = TR_##x; +#define STR(x) static const char LNG_STR_##x[] __FLASH = TR_##x; // Static string array -#define STRARRAY(x) static const char* const LNG_STR_##x[] = { TR_##x }; +#define STRARRAY(x) static const char* const LNG_STR_##x[] __FLASH = { TR_##x }; #include "translations/string_list.h" @@ -40,6 +40,6 @@ // Static string array #define STRARRAY(x) LNG_STR_##x, -const LangStrings nlLangStrings = { +const LangStrings nlLangStrings __FLASH = { #include "translations/string_list.h" }; diff --git a/radio/src/translations/sim/lang_pl.cpp b/radio/src/translations/sim/lang_pl.cpp index b7bad293a..94d1124db 100644 --- a/radio/src/translations/sim/lang_pl.cpp +++ b/radio/src/translations/sim/lang_pl.cpp @@ -26,9 +26,9 @@ #include "translations/i18n/pl.h" // Static string -#define STR(x) static const char LNG_STR_##x[] = TR_##x; +#define STR(x) static const char LNG_STR_##x[] __FLASH = TR_##x; // Static string array -#define STRARRAY(x) static const char* const LNG_STR_##x[] = { TR_##x }; +#define STRARRAY(x) static const char* const LNG_STR_##x[] __FLASH = { TR_##x }; #include "translations/string_list.h" @@ -40,6 +40,6 @@ // Static string array #define STRARRAY(x) LNG_STR_##x, -const LangStrings plLangStrings = { +const LangStrings plLangStrings __FLASH = { #include "translations/string_list.h" }; diff --git a/radio/src/translations/sim/lang_pt.cpp b/radio/src/translations/sim/lang_pt.cpp index d3c166bcc..c5c18577d 100644 --- a/radio/src/translations/sim/lang_pt.cpp +++ b/radio/src/translations/sim/lang_pt.cpp @@ -26,9 +26,9 @@ #include "translations/i18n/pt.h" // Static string -#define STR(x) static const char LNG_STR_##x[] = TR_##x; +#define STR(x) static const char LNG_STR_##x[] __FLASH = TR_##x; // Static string array -#define STRARRAY(x) static const char* const LNG_STR_##x[] = { TR_##x }; +#define STRARRAY(x) static const char* const LNG_STR_##x[] __FLASH = { TR_##x }; #include "translations/string_list.h" @@ -40,6 +40,6 @@ // Static string array #define STRARRAY(x) LNG_STR_##x, -const LangStrings ptLangStrings = { +const LangStrings ptLangStrings __FLASH = { #include "translations/string_list.h" }; diff --git a/radio/src/translations/sim/lang_ru.cpp b/radio/src/translations/sim/lang_ru.cpp index 208e26950..48703d467 100644 --- a/radio/src/translations/sim/lang_ru.cpp +++ b/radio/src/translations/sim/lang_ru.cpp @@ -26,9 +26,9 @@ #include "translations/i18n/ru.h" // Static string -#define STR(x) static const char LNG_STR_##x[] = TR_##x; +#define STR(x) static const char LNG_STR_##x[] __FLASH = TR_##x; // Static string array -#define STRARRAY(x) static const char* const LNG_STR_##x[] = { TR_##x }; +#define STRARRAY(x) static const char* const LNG_STR_##x[] __FLASH = { TR_##x }; #include "translations/string_list.h" @@ -40,6 +40,6 @@ // Static string array #define STRARRAY(x) LNG_STR_##x, -const LangStrings ruLangStrings = { +const LangStrings ruLangStrings __FLASH = { #include "translations/string_list.h" }; diff --git a/radio/src/translations/sim/lang_se.cpp b/radio/src/translations/sim/lang_se.cpp index f6bcd1d72..8b15e4c93 100644 --- a/radio/src/translations/sim/lang_se.cpp +++ b/radio/src/translations/sim/lang_se.cpp @@ -26,9 +26,9 @@ #include "translations/i18n/se.h" // Static string -#define STR(x) static const char LNG_STR_##x[] = TR_##x; +#define STR(x) static const char LNG_STR_##x[] __FLASH = TR_##x; // Static string array -#define STRARRAY(x) static const char* const LNG_STR_##x[] = { TR_##x }; +#define STRARRAY(x) static const char* const LNG_STR_##x[] __FLASH = { TR_##x }; #include "translations/string_list.h" @@ -40,6 +40,6 @@ // Static string array #define STRARRAY(x) LNG_STR_##x, -const LangStrings seLangStrings = { +const LangStrings seLangStrings __FLASH = { #include "translations/string_list.h" }; diff --git a/radio/src/translations/sim/lang_tw.cpp b/radio/src/translations/sim/lang_tw.cpp index 6681b09d6..c6e2876a6 100644 --- a/radio/src/translations/sim/lang_tw.cpp +++ b/radio/src/translations/sim/lang_tw.cpp @@ -26,9 +26,9 @@ #include "translations/i18n/tw.h" // Static string -#define STR(x) static const char LNG_STR_##x[] = TR_##x; +#define STR(x) static const char LNG_STR_##x[] __FLASH = TR_##x; // Static string array -#define STRARRAY(x) static const char* const LNG_STR_##x[] = { TR_##x }; +#define STRARRAY(x) static const char* const LNG_STR_##x[] __FLASH = { TR_##x }; #include "translations/string_list.h" @@ -40,6 +40,6 @@ // Static string array #define STRARRAY(x) LNG_STR_##x, -const LangStrings twLangStrings = { +const LangStrings twLangStrings __FLASH = { #include "translations/string_list.h" }; diff --git a/radio/src/translations/sim/lang_ua.cpp b/radio/src/translations/sim/lang_ua.cpp index d85e8e586..24ff06a8d 100644 --- a/radio/src/translations/sim/lang_ua.cpp +++ b/radio/src/translations/sim/lang_ua.cpp @@ -26,9 +26,9 @@ #include "translations/i18n/ua.h" // Static string -#define STR(x) static const char LNG_STR_##x[] = TR_##x; +#define STR(x) static const char LNG_STR_##x[] __FLASH = TR_##x; // Static string array -#define STRARRAY(x) static const char* const LNG_STR_##x[] = { TR_##x }; +#define STRARRAY(x) static const char* const LNG_STR_##x[] __FLASH = { TR_##x }; #include "translations/string_list.h" @@ -40,6 +40,6 @@ // Static string array #define STRARRAY(x) LNG_STR_##x, -const LangStrings uaLangStrings = { +const LangStrings uaLangStrings __FLASH = { #include "translations/string_list.h" };