jaseg/safety-reset
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Build working

Browse source
This commit is contained in:
jaseg 2020-02-27 15:58:23 +01:00
parent 621f66ff6e
commit 43ff9fdac0
3 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -13,3 +13,6 @@
[submodule "controller/fw/tinyaes"]
path = controller/fw/tinyaes
url = https://github.com/kokke/tiny-AES-c
[submodule "controller/fw/musl"]
path = controller/fw/musl
url = git://git.musl-libc.org/musl

24
controller/fw/Makefile
View file

@ -12,11 +12,12 @@ C_SOURCES += $(CMSIS_DIR)/CMSIS/DSP/Source/TransformFunctions/arm_rfft_f32.c
C_SOURCES += $(CMSIS_DIR)/CMSIS/DSP/Source/TransformFunctions/arm_bitreversal.c
C_SOURCES += $(CMSIS_DIR)/CMSIS/DSP/Source/TransformFunctions/arm_cfft_radix4_f32.c
C_SOURCES += $(MUSL_DIR)/src/math/tanhf.c $(MUSL_DIR)/src/math/atanhf.c
C_SOURCES += $(MUSL_DIR)/src/math/expm1f.c $(MUSL_DIR)/src/math/log1pf.c
CXX_SOURCES += src/ldpc_wrapper.cpp
BUILDDIR ?= build
BINARY := safetyreset
BINARY := safetyreset.elf
LDSCRIPT := stm32f407.ld
OPENCM3_LIB := opencm3_stm32f4
@ -41,38 +42,37 @@ MUSL_DIR_ABS := $(abspath $(MUSL_DIR))
CFLAGS += -I$(OPENCM3_DIR_ABS)/include -Imspdebug/util -Imspdebug/drivers
CFLAGS += -I$(CMSIS_DIR_ABS)/CMSIS/DSP/Include -I$(CMSIS_DIR_ABS)/CMSIS/Core/Include
CFLAGS += -I$(abspath musl_include_shims)
CFLAGS += -Os -std=gnu11 -g -DSTM32F4
# Note: libopencm3 requires some standard libc definitions from stdint.h and stdbool.h, so we don't pass -nostdinc here.
CFLAGS += -nostdlib -ffreestanding
CFLAGS += -mthumb -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16
CFLAGS += -fno-common -ffunction-sections -fdata-sections
CFLAGS += -I$(MUSL_DIR_ABS)/src/internal -I$(MUSL_DIR_ABS)/include -I$(BUILDDIR)/musl/obj/include -I$(MUSL_DIR_ABS)/arch/arm -I$(MUSL_DIR_ABS)/arch/generic
INT_CFLAGS += -Wextra -Wshadow -Wimplicit-function-declaration -Wundef
INT_CFLAGS += -Wall -Wextra -Wshadow -Wimplicit-function-declaration -Wundef
INT_CFLAGS += -Wredundant-decls -Wmissing-prototypes -Wstrict-prototypes
CXXFLAGS += -Os -g
CXXFLAGS += -nostdlib -ffreestanding
CXXFLAGS += -mthumb -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16
CXXFLAGS += -fno-common -ffunction-sections -fdata-sections
CXXFLAGS += -Wextra -Wshadow -Wundef -Wredundant-decls
CXXFLAGS += -Wall -Wextra -Wshadow -Wundef -Wredundant-decls
CXXFLAGS += -I.
LDFLAGS += --static -nostartfiles
LDFLAGS += -T$(LDSCRIPT)
LDFLAGS += -mthumb -mcpu=cortex-m4 -mfloat-abi=hard -mfpu=fpv4-sp-d16 -g
LDFLAGS += -Wl,--cre
#LDFLAGS += -Wl,--gc-sections
LDFLAGS += -Wl,--start-group -lc -lgcc -lnosys -Wl,--end-group
LDFLAGS += -L$(OPENCM3_DIR_ABS)/lib -l$(OPENCM3_LIB) $(shell $(CC) -print-libgcc-file-name)
all: $(BUILDDIR)/$(BINARY).elf
all: $(BUILDDIR)/$(BINARY)
OBJS := $(addprefix $(BUILDDIR)/,$(C_SOURCES:.c=.o) $(CXX_SOURCES:.cpp=.o))
$(BUILDDIR)/%.elf: $(OBJS) $(LDSCRIPT) $(OPENCM3_DIR)/lib/lib$(OPENCM3_LIB).a $(BUILDDIR)/libsodium/src/libsodium/.libs/libsodium.a $(BUILDDIR)/tinyaes/aes.o
$(LD) $(OBJS) $(LDFLAGS) -o $@ -Wl,-Map=$(BUILDDIR)/src/$*.map $(BUILDDIR)/libsodium/src/libsodium/.libs/libsodium.a $(BUILDDIR)/tinyaes/aes.o
$(BUILDDIR)/$(BINARY): $(OBJS) $(OPENCM3_DIR)/lib/lib$(OPENCM3_LIB).a $(BUILDDIR)/libsodium/src/libsodium/.libs/libsodium.a $(BUILDDIR)/tinyaes/aes.o
$(LD) -T$(LDSCRIPT) $(LDFLAGS) -o $@ -Wl,-Map=$(BUILDDIR)/src/$*.map $^
$(BUILDDIR)/src/%.o: src/%.c
mkdir -p $(@D)
@ -93,19 +93,13 @@ $(BUILDDIR)/libsodium/src/libsodium/.libs/libsodium.a:
mkdir -p $(BUILDDIR)/libsodium
cd $(BUILDDIR)/libsodium && CFLAGS="$(CFLAGS) -DDEV_MODE=1" $(LIBSODIUM_DIR_ABS)/configure --host=arm-none-eabi && $(MAKE) -j $(shell nproc)
$(BUILDDIR)/musl/obj/include/bits/alltypes.h:
mkdir -p $(BUILDDIR)/musl
cd $(BUILDDIR)/musl && CFLAGS="$(CFLAGS)" CC=$(CC) LD=$(LD) AR=$(AR) $(MUSL_DIR_ABS)/configure && $(MAKE) TARGET=arm-linux-musleabihf GCC_CONFIG="--with-arch=armv7-m --with-fpu=fpv4_sp_d16" -j $(shell nproc) obj/include/bits/alltypes.h
$(BUILDDIR)/$(MUSL_DIR)/src/math/tanhf.o $(BUILDDIR)/$(MUSL_DIR)/src/math/atanhf.o: $(BUILDDIR)/musl/obj/include/bits/alltypes.h
$(BUILDDIR)/tinyaes/aes.o:
mkdir -p $(@D)
make -C $(@D) -f $(TINYAES_DIR_ABS)/Makefile VPATH=$(TINYAES_DIR_ABS) CFLAGS="$(CFLAGS) -c" CC=$(CC) LD=$(LD) AR=$(AR) aes.o
clean:
-rm -r $(BUILDDIR)/src
-rm $(BUILDDIR)/$(BINARY).elf
-rm $(BUILDDIR)/$(BINARY)
mrproper: clean
-rm -r build

1
controller/fw/musl Submodule

@ -0,0 +1 @@
Subproject commit 040c1d16b468c50c04fc94edff521f1637708328