Re-organisation done

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

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_PORT_DIR = ../FreeRTOS/Source/portable/GCC/ARM_CM3
HAL_DIR = ../HAL
HAL_Misc_DIR = ../HAL/Misc/inc
HAL_PLATFORM_DIR = ../HAL/Platform/inc
HAL_KEYPAD_DIR = ../HAL/Keypad/inc
HAL_DISPLAY_DIR = ../HAL/Display/inc
PLATFORM_DIR = ../Platform
LINKER_SCRIPTS_DIR = linker
LINKER_SCRIPT = LinkerScript.ld
@@ -60,11 +57,8 @@ INCLUDES = \
-I$(FREERTOS_PORT_DIR) \
-I$(STM32_DEVICE_SUPPORT_DIR) \
-I$(STM32_CORE_SUPPORT_DIR) \
-I$(HAL_DIR) \
-I$(HAL_Misc_DIR) \
-I$(HAL_PLATFORM_DIR) \
-I$(HAL_KEYPAD_DIR) \
-I$(HAL_DISPLAY_DIR)
-I$(HAL_DIR)/inc \
-I$(PLATFORM_DIR)/inc \
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 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 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 OBJCOPYFLAGS := -O binary
OLI_STM32_H107: export OBJDUMPFLAGS := -x --syms -S