From c87607fe04bea458307e55dc7daf046694060c44 Mon Sep 17 00:00:00 2001 From: Enrico Pozzobon Date: Mon, 23 Mar 2020 18:18:24 +0100 Subject: [PATCH] small fix to F7 template --- compile_all.py | 8 ++++++-- templates/f7/Makefile | 3 ++- templates/f7/configure | 5 ----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/compile_all.py b/compile_all.py index e67f56f..5d8cbca 100755 --- a/compile_all.py +++ b/compile_all.py @@ -25,11 +25,14 @@ def build(algo_dir, template_dir, build_dir): # find all c and h files, since they will be added to the makefile hfiles = [] cfiles = [] + sfiles = [] for r, d, f in os.walk(build_dir): for file in f: - if file.endswith(".c"): + if file.lower().endswith(".c"): cfiles.append(file) - elif file.endswith(".h"): + elif file.lower().endswith(".s"): + sfiles.append(file) + elif file.lower().endswith(".h"): hfiles.append(file) # copy all the files from the template directory into the build directory @@ -46,6 +49,7 @@ def build(algo_dir, template_dir, build_dir): # prepare the environmental variables for the makefile env = os.environ env['SRC_FILES'] = ' '.join(cfiles) + env['ASM_FILES'] = ' '.join(sfiles) env['HDR_FILES'] = ' '.join(hfiles) # enter the directory and execute the makefile diff --git a/templates/f7/Makefile b/templates/f7/Makefile index a6d8fc9..ba341f6 100644 --- a/templates/f7/Makefile +++ b/templates/f7/Makefile @@ -52,7 +52,8 @@ $(SRC_FILES) # ASM sources ASM_SOURCES = \ -startup_stm32f746xx.s +startup_stm32f746xx.s \ +$(ASM_FILES) ####################################### diff --git a/templates/f7/configure b/templates/f7/configure index 740a114..c27a276 100755 --- a/templates/f7/configure +++ b/templates/f7/configure @@ -1,10 +1,5 @@ #!/bin/bash -# Rename all *.s to *.S -for f in *.s; do - mv -- "$f" "${f%.s}.S" -done - mv -n *.dat *.inc *.h Inc/ sed -i src/encrypt.c -e "s/\(\s\)init(/\1_init(/g" mkdir -p /tmp/f7/Drivers -- libgit2 0.26.0