make reorganized

2016-08-16 14:28:08 +02:00
parent caa360625b
commit a8a4cb263d
16 changed files with 268 additions and 116 deletions
--- a/143
+++ b/143
@@ -1,97 +1,67 @@
-###############################################################################
-# ARM Section
-CROSS_COMPILE ?= arm-none-eabi-
-GEN_FLAGS := \
-	-mcpu=cortex-m4 \
-	-mthumb \
-	-mfloat-abi=hard \
-	-mfpu=fpv4-sp-d16 \
-	-Og \
-	-fmessage-length=0 \
-	-fsigned-char \
-	-ffunction-sections \
-	-fdata-sections \
-	-ffreestanding \
-	-fno-move-loop-invariants \
-	-Werror \
-	-Wunused \
-	-Wuninitialized \
-	-Wall \
-	-Wextra \
-	-Wmissing-declarations \
-	-Wconversion \
-	-Wpointer-arith \
-	-Wpadded \
-	-Wshadow \
-	-Wlogical-op \
-	-Waggregate-return \
-	-Wfloat-equal \
-	-g3
-#	-flto  ## behind -ffreestanding
+include config/make/rules.mk
+OS_NAME := kosmos

-C_FLAGS = \
-	-DDEBUG \
-	-DUSE_FULL_ASSERT \
-	-DTRACE \
-	-DOS_USE_TRACE_SEMIHOSTING_DEBUG \
-	-DSTM32F407xx \
-	-DUSE_HAL_DRIVER \
-	-DHSE_VALUE=8000000 \
-	$(addprefix -I, $(INCLUDES)) \
-	-std=gnu11 \
-	-Wmissing-prototypes \
-	-Wstrict-prototypes \
-	-Wbad-function-cast \
-	-Wno-bad-function-cast \
-	-Wno-conversion \
-	-Wno-sign-conversion \
-	-Wno-unused-parameter \
-	-Wno-sign-compare \
-	-Wno-missing-prototypes \
-	-Wno-missing-declarations
+# version numbering deployed by ci deploy script - no necessary for local build
+ifdef SW_KERNEL
+VERSION := -$(SW_KERNEL).$(SW_MAJOR).$(SW_MINOR)
+else
+VERSION :=
+endif

-L_FLAGS := \
-	-T mem.ld \
-	-T libs.ld \
-	-T sections.ld \
-	-nostartfiles \
-	-Xlinker --gc-sections \
-	-L"config/linker" \
-	-Wl,-Map,"template.map" \
-	--specs=nano.specs \
+MAIN_FILE = $(EXE_DIR)/lib$(OS_NAME)-$(ARCH)-$(BOARD)$(VERSION)$(DBG_EXT)$(LIB_EXT)
+DEPLOY_PACKET = lib$(OS_NAME)-$(ARCH)-$(BOARD)$(VERSION)$(DBG_EXT).tar.xz

-INCLUDES += \
-	/opt/arm-2011.09/arm-none-eabi/include \
-	/opt/arm-2011.09/lib/gcc/arm-none-eabi/4.6.1/include \
-	source/firmware
-
-###############################################################################
-# TOOLS Section
-CC = $(CROSS_COMPILE)gcc
-CXX = $(CROSS_COMPILE)g++
-OBJCOPY = $(CROSS_COMPILE)objcopy
+TEST_FILE = $(EXE_DIR)/$(TEST_APP)$(ELF_EXT)
+BIN_FILE = $(EXE_DIR)/$(TEST_APP)$(BIN_EXT)
+HEX_FILE = $(EXE_DIR)/$(TEST_APP)$(HEX_EXT)
+SIZE_FILE = $(SIZE_DIR)/$(TEST_APP)$(SIZE_EXT)
+MAP_FILE = $(MAP_DIR)/$(TEST_APP)$(MAP_EXT)

 OBJ_DIR = release/object/debug
 EXE_DIR = release/execute/debug

+#include subfolders
 include source/firmware/firmware.mk
-include source/test/src/src.mk
+ifdef TEST_APP
+include source/test/test.mk
+C_FLAGS += -DTEST_APP
+endif

-###############################################################################
 C_SOURCES := $(foreach folder, $(SRC_DIR), $(wildcard $(folder)/*.c))
 C_OBJECTS := $(C_SOURCES:%.c=$(OBJ_DIR)/%.o)
-MAIN_FILE := $(EXE_DIR)/template.elf
-BIN_FILE :=  $(EXE_DIR)/template.bin
-OOCD_CFG_FILE := $(EXE_DIR)/openocd.cfg
+C_DEPS := $(SOURCES:%.c=$(OBJ_DIR)/%.d)
+
+all: $(MAIN_FILE)
+
+deploy: all
+	@$(MKDIR) $(EXE_DIR)/include
+	$(ROOT_DIR)/source/scripts/board_interface.py -b "$(ROOT_DIR)/source/firmware/arch/$(CPU)/board/$(BOARD)/include/$(BOARD).h" -o "$(EXE_DIR)/include/board_devices.h"
+	$(ROOT_DIR)/source/scripts/stack_interface.py -i "$(ROOT_DIR)/source/firmware/arch/$(CPU)/include/$(CPU)_stack.h" -o "$(EXE_DIR)/include/stack.h"
+	cp $(ROOT_DIR)/source/firmware/kernel/interface/*.* $(EXE_DIR)/include/
+	tar cvJf $(DEPLOY_PACKET) -C $(EXE_DIR) .
+
+
+$(MAIN_FILE): $(C_OBJECTS)
+	@$(MKDIR) $(EXE_DIR)
+	$(AR) $(AR_FLAGS) $(MAIN_FILE) $(C_OBJECTS)

-all: $(C_OBJECTS)
-	@mkdir -p $(EXE_DIR)
-	$(CXX) $(GEN_FLAGS) $(L_FLAGS)-o "$(MAIN_FILE)" $(C_OBJECTS)
-	$(OBJCOPY) $(MAIN_FILE) -O binary $(BIN_FILE)
 $(OBJ_DIR)/%.o: %.c
 	@mkdir -p $(OBJ_DIR)
 	@$(foreach folder, $(SRC_DIR), $(shell mkdir -p $(OBJ_DIR)/$(folder)))
-	$(CC) $(GEN_FLAGS) $(C_FLAGS) -MMD -MP -MF"$(subst .o,.d,$@)" -MT"$@" -c -o "$@" "$<"
+	$(call makedep,$<,$@,$(subst .o,.d,$@),$(GEN_FLAGS) $(C_FLAGS))
+	$(CC) $(GEN_FLAGS) $(C_FLAGS) -c -o "$@" "$<"
+
+test: $(C_OBJECTS)
+	@$(MKDIR) $(EXE_DIR)
+	@$(MKDIR) $(MAP_DIR)
+	@$(MKDIR) $(SIZE_DIR)
+	$(CXX) $(GEN_FLAGS) $(L_FLAGS) -Wl,-Map,"$(MAP_FILE)" -o "$(TEST_FILE)" $(C_OBJECTS)
+	$(OBJCOPY) $(TEST_FILE) -O binary $(BIN_FILE) 
+	$(OBJCOPY) $(TEST_FILE) -O ihex $(HEX_FILE)
+	$(NM) --size-sort --print-size $(TEST_FILE) > $(SIZE_FILE)
+	@echo
+	@$(SIZE) --format=berkeley -x $(TEST_FILE)
+	@echo

 clean:
 	$(foreach folder, $(SRC_DIR), $(shell rm -f $(OBJ_DIR)/$(folder)/*.o))
@@ -101,6 +71,17 @@ clean:
 	$(MAIN_FILE) \
 	$(BIN_FILE)

+distclean:
+	-rm -rf $(ROOT_DIR)/release
+
 install: all
-	echo "telnet_port 4444\ninit\nreset halt\nflash write_image erase $(BIN_FILE) 0x08000000 bin\nreset run\n shutdown\n" > $(OOCD_CFG_FILE)
-	openocd -f /usr/share/openocd/scripts/board/stm32f4discovery.cfg -f $(OOCD_CFG_FILE)
+	$(PRE_PROGRAM)
+	$(PROGRAM)
+
+ifneq "$(MAKECMDGOALS)" "clean"
+-include $(C_DEPS)
+else
+ifneq "$(MAKECMDGOALS)" "distclean"
+-include $(C_DEPS)
+endif
+endif