switch: adjust build_id and stats sections

9833e980 · Tristan Gingold · 093b49fd · 9833e980 · 9833e980 · 9833e980
Commit 9833e980 authored Jun 15, 2023 by Tristan Gingold
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 5 deletions

crt0.S arch/lm32/crt0.S +4 -1

ram-wrs.ld arch/lm32/ram-wrs.ld +1 -0

revision.c revision.c +4 -4

No files found.
--- a/arch/lm32/crt0.S
+++ b/arch/lm32/crt0.S
@@ -122,9 +122,12 @@ _true_reset:
 .org PPG_STATIC_PADDR
 	.word ppg_static
 #endif
+#ifdef CONFIG_TARGET_WR_SWITCH
 .org STATS_PADDR
 	.word stats
+#endif
 .org UPTIME_SEC_ADDR
 .global uptime_sec
 uptime_sec:

--- a/arch/lm32/ram-wrs.ld
+++ b/arch/lm32/ram-wrs.ld
@@ -70,6 +70,7 @@ SECTIONS
 	 */
 	.stats : {
 		*(.stats)
+		*(.build_id)
 	} > stats
 	/*

--- a/revision.c
+++ b/revision.c
@@ -15,19 +15,19 @@
 * Thus, we place this structure at a known address in the linker script
 */
 #ifdef CONFIG_TARGET_WR_SWITCH
-#define STATS_SECTION __attribute__((section(".stats")))
+#define STATS_SECTION(NAME) __attribute__((section(NAME)))
 #else
-#define STATS_SECTION
+#define STATS_SECTION(NAME)
 #endif
 #ifdef CONFIG_TARGET_WR_SWITCH
-struct spll_stats stats STATS_SECTION = {
+struct spll_stats stats STATS_SECTION(".stats") = {
 	.magic = 0x5b1157a7,
 	.ver = SPLL_STATS_VER
 };
 #endif
-const struct spll_build_id build_id STATS_SECTION = {
+const struct spll_build_id build_id STATS_SECTION(".build_id") = {
 #ifdef CONFIG_DETERMINISTIC_BINARY
 	.build_date = "",
 	.build_time = "",