Make project Cmake ready

stm-firmware/updater/ram-code/CMakeLists.txt

@@ -0,0 +1,46 @@
+project(updater-ram-code)
+set(CMAKE_SYSTEM_NAME Generic)
+set(CMAKE_SYSTEM_PROCESSOR arm)
+set(CMAKE_CROSSCOMPILING 1)
+cmake_minimum_required(VERSION 3.0)
+
+set(CMAKE_TOOLCHAIN_FILE "arm-none-eabi-gcc.cmake")
+
+set(ELFFILE ${PROJECT_NAME}.elf)
+set(LINKER_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/ram-link.ld)
+
+set(ELFFILE "${PROJECT_NAME}.elf")
+aux_source_directory("." SRCS)
+aux_source_directory("fatfs" FATFS_SRCS)
+aux_source_directory("fatfs/shimatta_sdio_driver" SDIO_SRCS)
+
+add_executable(${ELFFILE} ${SRCS} ${FATFS_SRCS} ${SDIO_SRCS})
+
+target_include_directories(${ELFFILE} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/include)
+target_compile_options(${ELFFILE} PRIVATE -Wall -Wextra -Wold-style-declaration -Wuninitialized -Wmaybe-uninitialized -Wunused-parameter)
+target_compile_options(${ELFFILE} PRIVATE -mlittle-endian -mthumb -mcpu=cortex-m4 -mthumb-interwork -mfloat-abi=hard -mfpu=fpv4-sp-d16 -nostartfiles -Wimplicit-fallthrough=3 -Wsign-compare -Os -g3)
+target_compile_definitions(${ELFFILE} PRIVATE -DBASE64_LOOKUP_TABLE_SECTION=\".ccm.bss\" -DSHELLMATTA_HELP_ALIAS=\"?\" -DGIT_VER=${GIT_DESCRIBE} -DHSE_VALUE=8000000UL -DSTM32F407xx -DSTM32F4XX -DARM_MATH_CM4)
+target_link_options(${ELFFILE} PRIVATE -mlittle-endian -mthumb -mcpu=cortex-m4 -mthumb-interwork -mfloat-abi=hard -mfpu=fpv4-sp-d16 --disable-newlib-supplied-syscalls -nostartfiles -T${LINKER_SCRIPT} -Wl,--print-memory-usage)
+set(GEN_HEADER_PATH "${CMAKE_CURRENT_BINARY_DIR}/include/generated")
+set(GEN_HEADER_FILE "${GEN_HEADER_PATH}/${PROJECT_NAME}.bin.h")
+target_include_directories(${ELFFILE} INTERFACE "${CMAKE_CURRENT_BINARY_DIR}/include/")
+
+set(GEN_HEADER_FILE "${CMAKE_CURRENT_BINARY_DIR}/include/generated/${PROJECT_NAME}.bin.h")
+
+add_custom_target(updater-ram-code-header-blob DEPENDS ${GEN_HEADER_FILE})
+
+add_custom_command(DEPENDS
+			${ELFFILE}
+		   OUTPUT
+		   	"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.bin"
+		   COMMAND
+		   	${CMAKE_OBJCOPY} -O binary ${ELFFILE} "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.bin"
+		   )
+		   
+add_custom_command(DEPENDS
+			"${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.bin"
+		   OUTPUT
+		   	${GEN_HEADER_FILE}
+		   COMMAND
+		   	mkdir -p ${GEN_HEADER_PATH} && python "${CMAKE_CURRENT_SOURCE_DIR}/bin2carray.py" "${GEN_HEADER_FILE}" "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.bin"
+		   )

stm-firmware/updater/ram-code/Makefile

@@ -1,82 +0,0 @@
-RAM_CODE_TARGET = updater-ram-code
-target = $(RAM_CODE_TARGET)
-OBJDIR = obj
-CFILES = main.c startup.c hex-parser.c
-CFILES += fatfs/ff.c fatfs/diskio.c fatfs/ffsystem.c fatfs/ffunicode.c fatfs/shimatta_sdio_driver/shimatta_sdio.c
-LINKER_SCRIPT = ram-link.ld
-MAPFILE = $(RAM_CODE_TARGET)
-PREFIX = arm-none-eabi-
-
-CC = $(PREFIX)gcc
-OBJCOPY = $(PREFIX)objcopy
-SIZE = $(PREFIX)size
-
-ifneq ($(VERBOSE),true)
-QUIET=@
-else
-QUIET=
-endif
-
-
-DEFINES = -DSTM32F407xx -DSTM32F4XX -DHSE_VALUE=8000000UL
-INCLUDEPATH = -Iinclude
-
-LFLAGS = -mlittle-endian -mthumb -mcpu=cortex-m4 -mthumb-interwork
-LFLAGS += -mfloat-abi=hard -mfpu=fpv4-sp-d16 --disable-newlib-supplied-syscalls -nostartfiles
-LFLAGS += -T$(LINKER_SCRIPT) -Wl,-Map=$(MAPFILE).map -Wl,--print-memory-usage -g3
-
-CFLAGS = -c -mlittle-endian -mthumb -mcpu=cortex-m4 -mthumb-interwork -Os -g3
-CFLAGS += -mfloat-abi=hard -mfpu=fpv4-sp-d16 -nostartfiles
-CFLAGS += -Wall -Wextra -Wold-style-declaration -Wuninitialized -Wmaybe-uninitialized -Wunused-parameter -Wimplicit-fallthrough=3 -Wsign-compare
-
-OBJ = $(CFILES:%.c=$(OBJDIR)/%.c.o)
-
-default: $(RAM_CODE_TARGET).bin.h
-
-all: $(RAM_CODE_TARGET).bin.h
-
-%.bin.h: %.bin
-	@echo "[BIN2H] $@"
-	$(QUIET)python bin2carray.py $@ $^
-
-$(RAM_CODE_TARGET).bin: $(RAM_CODE_TARGET).elf
-	@echo "[ELF2BIN] $@"
-	$(QUIET)$(OBJCOPY) -O binary $^ $@
-
-$(RAM_CODE_TARGET).elf: $(OBJ) $(LINKER_SCRIPT)
-	@echo [LD] $@
-	$(QUIET)$(CC) $(LFLAGS) $(LIBRARYPATH) -o $@ $(OBJ) $(ASOBJ) $(LIBRARIES)
-	$(QUIET)$(SIZE) $@
-	
-$(OBJ):
-	@echo [CC] $@
-	$(eval OUTPATH=$(dir $@))
-	@mkdir -p $(OUTPATH)
-	$(QUIET)$(CC) $(CFLAGS) -MMD -MT $@ $(INCLUDEPATH) $(DEFINES) -o $@ $(@:$(OBJDIR)/%.c.o=%.c)
-
-.PHONY: clean qtproject
-
-clean:
-	@echo [CLEAN]
-	$(QUIET)rm -f $(OBJ) $(MAPFILE).map $(CFILES:%.c=$(OBJDIR)/%.c.d) $(RAM_CODE_TARGET).bin $(RAM_CODE_TARGET).elf $(RAM_CODE_TARGET).bin.c
-
-qtproject:
-	$(QUIET)rm -f $(target).files $(target).cflags $(target).config $(target).creator $(target).includes $(target).creator.user
-	@echo "Generating source file list"
-	$(QUIET)echo "$(CFILES)" | tr ' ' '\n' > $(target).files
-	@echo -n "Appending found header files from folders "
-	@echo `echo $(INCLUDEPATH) | sed "s/-I//g"`
-	$(QUIET)for dir in `echo $(INCLUDEPATH) | sed "s/-I//g"`; do \
-		find `echo "$${dir}"` -name "*.h" >> $(target).files; \
-	done
-	@echo "Generating $(target).cflags"
-	$(QUIET)echo "" > $(target).cflags
-	@echo "Generating $(target).includes"
-	$(QUIET)echo $(INCLUDEPATH) | sed "s/-I/,/g" | tr , '\n' | sed "/^$$/d" > $(target).includes;
-	@echo "Generating $(target).config"
-	$(QUIET)echo $(DEFINES) | sed "s/-D/,#define /g" | tr , '\n' | sed "/^$$/d" > $(target).config
-	@echo "Generating $(target).creator"
-	$(QUIET)echo "[GENERAL]" > $(target).creator
-
--include $(CFILES:%.c=$(OBJDIR)/%.c.d)
-

stm-firmware/updater/ram-code/bin2carray.py

@@ -4,6 +4,7 @@
 # bin2carray <output file> <input file>
 
 import os
+import os.path
 import sys
 
 if len(sys.argv) < 3:
@@ -18,7 +19,7 @@ with open(source_file, "rb") as src:
 	data = src.read()
 
 with open(dest_file, "w") as dest:
-	header_guard = "__" + dest_file.replace('.', '_').replace('-', '_') + "_H__"
+	header_guard = "__" + os.path.basename(dest_file).replace('.', '_').replace('-', '_') + "_H__"
 	dest.write("#ifndef %s\n" % (header_guard))
 	dest.write("#define %s\n" % (header_guard))
 	dest.write("static const char binary_blob[%d] = {\n" % (len(data)))