private/hsb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-organisation done

Browse Source 
Code compiles (not checked, though. Working from home now)

git-svn-id: https://svn.vbchaos.nl/svn/hsb/trunk@223 05563f52-14a8-4384-a975-3d1654cca0fa
This commit is contained in:
mmi
2017-09-28 18:04:30 +00:00
parent 1026e47257
commit 888601f8cf
4 changed files with 56 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/HAL/Makefile
View File

@@ -1,15 +1,50 @@
all: CROSS_COMPILE = arm-none-eabi-
$(MAKE) -C Keypad CC = $(CROSS_COMPILE)gcc
$(MAKE) -C Display LD = $(CROSS_COMPILE)gcc
$(MAKE) -C Misc AR = $(CROSS_COMPILE)ar
$(MAKE) -C Platform OBJCOPY = $(CROSS_COMPILE)objcopy
OBJDUMP = $(CROSS_COMPILE)objdump
OBJDIR = obj
SRCDIR = src/
ROOTDIR = ../
LIBRARY_NAME = libHAL.a
CCFLAGS = -c -O2 -Wall -g -fno-common -mcpu=cortex-m3 -mthumb -DOLI_STM32_H107 \
-Iinc \
-I$(ROOTDIR)/Platform/inc \
-I$(ROOTDIR)/hsb-mrts/inc \
-I$(ROOTDIR)/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc \
-I$(ROOTDIR)/FreeRTOS/Source/include \
-I$(ROOTDIR)/FreeRTOS/Source/portable/GCC/ARM_CM3 \
-I$(ROOTDIR)/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x \
-I$(ROOTDIR)/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/CoreSupport
ARFLAGS = rs
OBJECTS = \
IODevice.o \
keypadMatrix.o \
nhd0420.o
vpath %.o $(OBJDIR)
vpath %.c \
$(SRCDIR) \
$(ROOTDIR)/hsb-mrts/src
all: $(LIBRARY_NAME)
$(LIBRARY_NAME): $(OBJDIR) $(OBJECTS)
$(AR) $(ARFLAGS) $@ $(addprefix $(OBJDIR)/, $(OBJECTS))
%.o: %.c
$(CC) $(CCFLAGS) $< -o $(OBJDIR)/$@
$(OBJDIR):
mkdir -p $@
clean: clean:
$(MAKE) -C Keypad clean rm -rf $(OBJDIR) $(LIBRARY_NAME)
$(MAKE) -C Display clean
$(MAKE) -C Misc clean
$(MAKE) -C Platform clean
.PHONY: all clean .PHONY: all clean

2
S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/Makefile
View File

@@ -7,6 +7,7 @@ pho_hsb_olimex_stm32_h107:
@echo MAKE: $@ @echo MAKE: $@
@echo ------------------------------------------ @echo ------------------------------------------
$(MAKE) -C STM32F10x_StdPeriph_Lib_V3.5.0 $(MAKE) -C STM32F10x_StdPeriph_Lib_V3.5.0
$(MAKE) -C Platform
$(MAKE) -C HAL $(MAKE) -C HAL
$(MAKE) -C hsb-mrts $(MAKE) -C hsb-mrts
@@ -16,6 +17,7 @@ pho_hsb_olimex_stm32_h107:
clean: clean:
$(MAKE) -C STM32F10x_StdPeriph_Lib_V3.5.0 clean $(MAKE) -C STM32F10x_StdPeriph_Lib_V3.5.0 clean
$(MAKE) -C HAL clean $(MAKE) -C HAL clean
$(MAKE) -C Platform clean
$(MAKE) -C hsb-mrts clean $(MAKE) -C hsb-mrts clean
.PHONY: all clean .PHONY: all clean

8
S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/Platform/Makefile
View File

@@ -7,15 +7,13 @@ OBJDUMP = $(CROSS_COMPILE)objdump
OBJDIR = obj OBJDIR = obj
SRCDIR = src/ SRCDIR = src/
ROOTDIR = ../../ ROOTDIR = ../
LIBRARY_NAME = ../libPlatform.a LIBRARY_NAME = libPlatform.a
CCFLAGS = -c -O2 -Wall -g -fno-common -mcpu=cortex-m3 -mthumb -DOLI_STM32_H107 \ CCFLAGS = -c -O2 -Wall -g -fno-common -mcpu=cortex-m3 -mthumb -DOLI_STM32_H107 \
-Iinc \ -Iinc \
-I../Misc/inc \ -I$(ROOTDIR)/HAL/inc \
-I../Keypad/inc \
-I../Display/inc \
-I$(ROOTDIR)/hsb-mrts/inc \ -I$(ROOTDIR)/hsb-mrts/inc \
-I$(ROOTDIR)/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc \ -I$(ROOTDIR)/STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/STM32F10x_StdPeriph_Driver/inc \
-I$(ROOTDIR)/FreeRTOS/Source/include \ -I$(ROOTDIR)/FreeRTOS/Source/include \

14
S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/hsb-mrts/Makefile
View File

@@ -37,10 +37,7 @@ STM32_CORE_SUPPORT_DIR = ../STM32F10x_StdPeriph_Lib_V3.5.0/Libraries/CMSIS/CM3/C
FREERTOS_DIR = ../FreeRTOS/Source/include FREERTOS_DIR = ../FreeRTOS/Source/include
FREERTOS_PORT_DIR = ../FreeRTOS/Source/portable/GCC/ARM_CM3 FREERTOS_PORT_DIR = ../FreeRTOS/Source/portable/GCC/ARM_CM3
HAL_DIR = ../HAL HAL_DIR = ../HAL
HAL_Misc_DIR = ../HAL/Misc/inc PLATFORM_DIR = ../Platform
HAL_PLATFORM_DIR = ../HAL/Platform/inc
HAL_KEYPAD_DIR = ../HAL/Keypad/inc
HAL_DISPLAY_DIR = ../HAL/Display/inc
LINKER_SCRIPTS_DIR = linker LINKER_SCRIPTS_DIR = linker
LINKER_SCRIPT = LinkerScript.ld LINKER_SCRIPT = LinkerScript.ld
@@ -60,11 +57,8 @@ INCLUDES = \
-I$(FREERTOS_PORT_DIR) \ -I$(FREERTOS_PORT_DIR) \
-I$(STM32_DEVICE_SUPPORT_DIR) \ -I$(STM32_DEVICE_SUPPORT_DIR) \
-I$(STM32_CORE_SUPPORT_DIR) \ -I$(STM32_CORE_SUPPORT_DIR) \
-I$(HAL_DIR) \ -I$(HAL_DIR)/inc \
-I$(HAL_Misc_DIR) \ -I$(PLATFORM_DIR)/inc \
-I$(HAL_PLATFORM_DIR) \
-I$(HAL_KEYPAD_DIR) \
-I$(HAL_DISPLAY_DIR)
all: OLI_STM32_H107 all: OLI_STM32_H107
@@ -81,7 +75,7 @@ OLI_STM32_H107: export CROSS_COMPILE := arm-none-eabi-
OLI_STM32_H107: export CCFLAGS := -c -O2 -Wall -g -lc -lm -fno-common -mcpu=cortex-m3 -DOLI_STM32_H107 -DENABLE_SERIAL_LOGGING -mthumb $(RELEASE_DEFINES) $(INCLUDES) OLI_STM32_H107: export CCFLAGS := -c -O2 -Wall -g -lc -lm -fno-common -mcpu=cortex-m3 -DOLI_STM32_H107 -DENABLE_SERIAL_LOGGING -mthumb $(RELEASE_DEFINES) $(INCLUDES)
OLI_STM32_H107: export ASFLAGS := -g -mapcs-32 OLI_STM32_H107: export ASFLAGS := -g -mapcs-32
OLI_STM32_H107: export LDFLAGS := -g -nostartfiles -mcpu=cortex-m3 -mthumb -T$(LINKER_SCRIPTS_DIR)/$(LINKER_SCRIPT) -Wl,-Map=hsb_mrts_OLI_STM32_H107.map OLI_STM32_H107: export LDFLAGS := -g -nostartfiles -mcpu=cortex-m3 -mthumb -T$(LINKER_SCRIPTS_DIR)/$(LINKER_SCRIPT) -Wl,-Map=hsb_mrts_OLI_STM32_H107.map
OLI_STM32_H107: export LDARCHIVES := -L. -L$(STM32_STDPERIPH_ROOT) -L$(HAL_DIR) -lhsb_mrts_OLI_STM32_H107 -lPlatform -lKeypad -lDisplay -lMisc -lSTM_StdPeriph OLI_STM32_H107: export LDARCHIVES := -L. -L$(STM32_STDPERIPH_ROOT) -L$(PLATFORM_DIR) -L$(HAL_DIR) -lhsb_mrts_OLI_STM32_H107 -lPlatform -lHAL -lSTM_StdPeriph
OLI_STM32_H107: export ARFLAGS := ru OLI_STM32_H107: export ARFLAGS := ru
OLI_STM32_H107: export OBJCOPYFLAGS := -O binary OLI_STM32_H107: export OBJCOPYFLAGS := -O binary
OLI_STM32_H107: export OBJDUMPFLAGS := -x --syms -S OLI_STM32_H107: export OBJDUMPFLAGS := -x --syms -S