Skip to content
Snippets Groups Projects
Commit 807e4ea6 authored by Alexander Alashkin's avatar Alexander Alashkin Committed by Cesanta Bot
Browse files

Fix STM32F4_CC3100 Mongoose example compilation 

PUBLISHED_FROM=7a67a67d2f0007e241e4ccb57bc24a43ba20bfde
parent 507e8bfa
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
examples/STM32F4_CC3100/Makefile
+ 2
− 3
View file @ 807e4ea6
SDK ?= $(shell cat sdk.version) SDK ?= $(shell cat sdk.version)
SRC_DIR ?= $(realpath ../../..) SRC_DIR ?= $(realpath ../..)
.PHONY: all clean .PHONY: all clean
...@@ -8,6 +8,5 @@ MAKEFLAGS += w ...@@ -8,6 +8,5 @@ MAKEFLAGS += w
all clean: all clean:
docker run --rm -i -v $(SRC_DIR):/src $(SDK) \ docker run --rm -i -v $(SRC_DIR):/src $(SDK) \
/bin/bash -c "\ /bin/bash -c "\
make -C /src/mongoose mongoose.c mongoose.h && \ make -C /src/examples/STM32F4_CC3100 -f Makefile.build $@ -$(MAKEFLAGS) \
make -C /src/mongoose/examples/STM32F4_CC3100 -f Makefile.build $@ -$(MAKEFLAGS) \
" "
examples/STM32F4_CC3100/Makefile.build
+ 22
− 23
View file @ 807e4ea6
...@@ -11,9 +11,9 @@ STM32F4_SRCS = stm32f4xx_hal_spi.c stm32f4xx_hal_gpio.c stm32f4xx_hal_cortex.c\ ...@@ -11,9 +11,9 @@ STM32F4_SRCS = stm32f4xx_hal_spi.c stm32f4xx_hal_gpio.c stm32f4xx_hal_cortex.c\
stm32f4xx_hal_uart.c stm32f4xx_hal_tim.c \ stm32f4xx_hal_uart.c stm32f4xx_hal_tim.c \
stm32f4xx_hal_tim_ex.c stm32f4xx_hal_rtc_ex.c stm32f4xx_hal_rtc.c stm32f4xx_hal_tim_ex.c stm32f4xx_hal_rtc_ex.c stm32f4xx_hal_rtc.c
SRCS = main.c mongoose.c startup_utils.c ${CC3100_DRV_SRCS} ${CC3100_PLATFORM_SRCS} ${STM32F4_SRCS} SRCS = main.c mongoose.c startup_utils.c ${CC3100_DRV_SRCS} ${CC3100_PLATFORM_SRCS} ${STM32F4_SRCS}
REPO_ROOT=./../../../ REPO_ROOT=./../../
CC3100_SDKROOT=/opt/CC3100SDK_1.2.0/cc3100-sdk CC3100_SDKROOT=/opt/CC3100SDK_1.2.0/cc3100-sdk
STM32CUBEF4_ROOT=/opt/STM32CubeF4 STM32CUBEF4_ROOT=/opt/STM32CubeF4
STM32CUBEF4_DRV_PATH=${STM32CUBEF4_ROOT}/Drivers STM32CUBEF4_DRV_PATH=${STM32CUBEF4_ROOT}/Drivers
...@@ -22,7 +22,7 @@ CC = arm-none-eabi-gcc ...@@ -22,7 +22,7 @@ CC = arm-none-eabi-gcc
OBJCOPY = arm-none-eabi-objcopy OBJCOPY = arm-none-eabi-objcopy
FP_FLAGS = -mfloat-abi=hard -mfpu=fpv4-sp-d16 FP_FLAGS = -mfloat-abi=hard -mfpu=fpv4-sp-d16
ARCH_FLAGS = -mthumb -mcpu=cortex-m4 ARCH_FLAGS = -mthumb -mcpu=cortex-m4
BUILD_DIR=.build BUILD_DIR=.build
OUT_DIR=out OUT_DIR=out
...@@ -36,21 +36,20 @@ OBJS = $(addprefix $(BUILD_DIR)/,$(patsubst %.c,%.o,$(SRCS)) $(patsubst %.s,%.o, ...@@ -36,21 +36,20 @@ OBJS = $(addprefix $(BUILD_DIR)/,$(patsubst %.c,%.o,$(SRCS)) $(patsubst %.s,%.o,
VPATH = ${CC3100_SDKROOT}/simplelink/source\ VPATH = ${CC3100_SDKROOT}/simplelink/source\
${CC3100_SDKROOT}/platform/stm32discovery\ ${CC3100_SDKROOT}/platform/stm32discovery\
${STM32CUBEF4_ROOT}/Drivers/STM32F4xx_HAL_Driver/Src\ ${STM32CUBEF4_ROOT}/Drivers/STM32F4xx_HAL_Driver/Src\
${STM32CUBEF4_ROOT}/Drivers/BSP/STM32F4-Discovery\ ${STM32CUBEF4_ROOT}/Drivers/BSP/STM32F4-Discovery\
${REPO_ROOT}/mongoose ${REPO_ROOT}
# CC3100 SDK and STM32 SDK include headers w/out path, just like # CC3100 SDK and STM32 SDK include headers w/out path, just like
# #include "simplelink.h". As result, we have to add all required directories # #include "simplelink.h". As result, we have to add all required directories
# into IPATH # into IPATH
IPATH = . \ IPATH = . ${CC3100_SDKROOT}/simplelink/include\
${CC3100_SDKROOT}/simplelink/include\ ${CC3100_SDKROOT}/platform/stm32discovery\
${CC3100_SDKROOT}/platform/stm32discovery\ ${STM32CUBEF4_DRV_PATH}/BSP/STM32F4-Discovery\
${STM32CUBEF4_DRV_PATH}/BSP/STM32F4-Discovery\ ${STM32CUBEF4_DRV_PATH}/STM32F4xx_HAL_Driver/Inc\
${STM32CUBEF4_DRV_PATH}/STM32F4xx_HAL_Driver/Inc\ ${STM32CUBEF4_DRV_PATH}/CMSIS/Include\
${STM32CUBEF4_DRV_PATH}/CMSIS/Include\ ${STM32CUBEF4_DRV_PATH}/CMSIS/Device/ST/STM32F4xx/Include
${STM32CUBEF4_DRV_PATH}/CMSIS/Device/ST/STM32F4xx/Include
LDFLAGS = --static -nostartfiles LDFLAGS = --static -nostartfiles
LDLIBS = -Wl,--start-group -lc -lgcc -lnosys -Wl,--end-group LDLIBS = -Wl,--start-group -lc -lgcc -lnosys -Wl,--end-group
...@@ -59,13 +58,13 @@ LDSCRIPT = stm32f429xx.ld ...@@ -59,13 +58,13 @@ LDSCRIPT = stm32f429xx.ld
INCDIRS = $(addprefix -I,$(IPATH)) INCDIRS = $(addprefix -I,$(IPATH))
CFLAGS = ${FP_FLAGS} ${ARCH_FLAGS} ${INCDIRS}\ CFLAGS = ${FP_FLAGS} ${ARCH_FLAGS} ${INCDIRS}\
-D${BOARD} -DEXT_LIB_REGISTERED_GENERAL_EVENTS \ -D${BOARD} -DEXT_LIB_REGISTERED_GENERAL_EVENTS \
-DSL_FULL\ -DSL_FULL\
-DCS_PLATFORM=6 \ -DCS_PLATFORM=6 \
-D__STM32F407xx_H \ -D__STM32F407xx_H \
-DMG_SIMPLELINK_NO_OSI \ -DMG_SIMPLELINK_NO_OSI \
-DMG_ENABLE_MQTT \ -DMG_ENABLE_MQTT \
-g -fno-common -ffunction-sections -fdata-sections \ -g -fno-common -ffunction-sections -fdata-sections \
ELF = ${BUILD_DIR}/${PROJECT}.elf ELF = ${BUILD_DIR}/${PROJECT}.elf
BIN = ${OUT_DIR}/${PROJECT}.bin BIN = ${OUT_DIR}/${PROJECT}.bin
...@@ -79,15 +78,15 @@ ${OUT_DIR}: ...@@ -79,15 +78,15 @@ ${OUT_DIR}:
mkdir -p $@ mkdir -p $@
$(BUILD_DIR)/%.o: %.c $(BUILD_DIR)/%.o: %.c
$(CC) ${CFLAGS} $^ -c -o $@ $(CC) ${CFLAGS} $^ -c -o $@
$(BUILD_DIR)/%.o: %.s $(BUILD_DIR)/%.o: %.s
$(CC) ${CFLAGS} $^ -c -o $@ $(CC) ${CFLAGS} $^ -c -o $@
${ELF}: ${OBJS} ${ELF}: ${OBJS}
$(CC) ${ARCH_FLAGS} ${FP_FLAGS} $(LDFLAGS) $(OBJS) $(LDLIBS) -T$(LDSCRIPT) -o $@ $(CC) ${ARCH_FLAGS} ${FP_FLAGS} $(LDFLAGS) $(OBJS) $(LDLIBS) -T$(LDSCRIPT) -o $@
${BIN}: ${ELF} ${BIN}: ${ELF}
$(OBJCOPY) -Obinary $^ $@ $(OBJCOPY) -Obinary $^ $@
clean: clean:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment