[Cryptech-Commits] [user/ln5/stm32-avalanche-noise] 01/02: Add version and application info to ELF file

[git at cryptech.is]

This is an automated email from the git hooks/post-receive script.

linus at nordberg.se pushed a commit to branch ln/devel
in repository user/ln5/stm32-avalanche-noise.

commit 49d39287252bf0bd2b3fd75e86d07616b56c7fd2
Author: Linus Nordberg <linus at nordberg.se>
AuthorDate: Thu Dec 19 12:51:30 2019 +0100

    Add version and application info to ELF file
---
 src/cc20rng/Makefile | 18 +++++++++++++++++-
 src/entropy/Makefile | 18 +++++++++++++++++-
 2 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/src/cc20rng/Makefile b/src/cc20rng/Makefile
index b3627b6..c52bc52 100644
--- a/src/cc20rng/Makefile
+++ b/src/cc20rng/Makefile
@@ -1,3 +1,19 @@
+# Application number and version info are included in the ELF file
+# symbol table through two global, asbolute symbols. Use nm(1) on an
+# ELF file to figure things out. Example:
+#   nm cc20rng.elf | awk '/VERSION/{print $1}'
+
+# Application number:
+# - cc20rng: 01
+# - entropy: 02
+APPLICATION = 0x00000001
+
+# Version info is four octects, from most significant to least:
+# - Major version, two bytes: 00..FFFF
+# - Minor version, one byte: 00..FF
+# - Patch level, one byte: 00..FF
+VERSION = 0x00010000
+
 # put your *.o targets here, make should handle the rest!
 SRCS = main.c stm_init.c system_stm32f4xx.c stm32f4xx_it.c stm32f4xx_hal_msp.c cc20_prng.c
 
@@ -23,7 +39,7 @@ lib:
 proj: 	$(PROJ_NAME).elf
 
 $(PROJ_NAME).elf: $(SRCS)
-	$(CC) $(CFLAGS) $^ -o $@ -L$(STD_PERIPH_LIB) -lstmf4 -L$(LDSCRIPT_INC) -T$(MCU_LINKSCRIPT) -g
+	$(CC) $(CFLAGS) $^ -o $@ -L$(STD_PERIPH_LIB) -lstmf4 -L$(LDSCRIPT_INC) -T$(MCU_LINKSCRIPT) -g -Wl,--defsym=APPLICATION=$(APPLICATION) -Wl,--defsym=VERSION=$(VERSION)
 	$(OBJCOPY) -O ihex $(PROJ_NAME).elf $(PROJ_NAME).hex
 	$(OBJCOPY) -O binary $(PROJ_NAME).elf $(PROJ_NAME).bin
 	$(OBJDUMP) -St $(PROJ_NAME).elf >$(PROJ_NAME).lst
diff --git a/src/entropy/Makefile b/src/entropy/Makefile
index 68723b8..0285460 100644
--- a/src/entropy/Makefile
+++ b/src/entropy/Makefile
@@ -1,3 +1,19 @@
+# Application number and version info are included in the ELF file
+# symbol table through two global, asbolute symbols. Use nm(1) on an
+# ELF file to figure things out. Example:
+#   nm entropy.elf | awk '/VERSION/{print $1}'
+
+# Application number:
+# - cc20rng: 01
+# - entropy: 02
+APPLICATION = 0x00000002
+
+# Version info is four octects, from most significant to least:
+# - Major version, two bytes: 00..FFFF
+# - Minor version, one byte: 00..FF
+# - Patch level, one byte: 00..FF
+VERSION = 0x00010000
+
 # put your *.o targets here, make should handle the rest!
 SRCS = main.c stm_init.c system_stm32f4xx.c stm32f4xx_it.c stm32f4xx_hal_msp.c
 
@@ -23,7 +39,7 @@ lib:
 proj: 	$(PROJ_NAME).elf
 
 $(PROJ_NAME).elf: $(SRCS)
-	$(CC) $(CFLAGS) $^ -o $@ -L$(STD_PERIPH_LIB) -lstmf4 -L$(LDSCRIPT_INC) -T$(MCU_LINKSCRIPT) -g
+	$(CC) $(CFLAGS) $^ -o $@ -L$(STD_PERIPH_LIB) -lstmf4 -L$(LDSCRIPT_INC) -T$(MCU_LINKSCRIPT) -g -Wl,--defsym=APPLICATION=$(APPLICATION) -Wl,--defsym=VERSION=$(VERSION)
 	$(OBJCOPY) -O ihex $(PROJ_NAME).elf $(PROJ_NAME).hex
 	$(OBJCOPY) -O binary $(PROJ_NAME).elf $(PROJ_NAME).bin
 	$(OBJDUMP) -St $(PROJ_NAME).elf >$(PROJ_NAME).lst