Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Olimex support for UDP #85

Merged
merged 1 commit into from
Nov 11, 2021
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 25 additions & 20 deletions microros_olimex_e407_extensions/Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
##########################################################################################################################
# File automatically-generated by tool: [projectgenerator] version: [3.11.2] date: [Thu Mar 25 12:18:08 CET 2021]
# File automatically-generated by tool: [projectgenerator] version: [3.11.2] date: [Thu Mar 25 12:18:08 CET 2021]
##########################################################################################################################

# ------------------------------------------------
Expand Down Expand Up @@ -202,7 +202,7 @@ SZ = $(CROSS_COMPILE)size
endif
HEX = $(CP) -O ihex
BIN = $(CP) -O binary -S

#######################################
# CFLAGS
#######################################
Expand All @@ -220,7 +220,7 @@ MCU = $(CPU) -mthumb $(FPU) $(FLOAT-ABI)

# macros for gcc
# AS defines
AS_DEFS =
AS_DEFS =

# C defines
C_DEFS = \
Expand Down Expand Up @@ -269,15 +269,15 @@ MICROROS_INCLUDES += -I$(EXTENSIONS_DIR)/include
MICROROS_INCLUDES += -I$(EXTENSIONS_DIR)/include/FreeRTOS_POSIX
C_INCLUDES += $(MICROROS_INCLUDES)

COLCON_INCLUDES += $(EXTENSIONS_DIR)/FreeRTOS-Plus-POSIX/include
COLCON_INCLUDES += $(EXTENSIONS_DIR)/include
COLCON_INCLUDES += $(EXTENSIONS_DIR)/include/private
COLCON_INCLUDES += $(EXTENSIONS_DIR)/include/FreeRTOS_POSIX
COLCON_INCLUDES += $(EXTENSIONS_DIR)/FreeRTOS-Plus-POSIX/include
COLCON_INCLUDES += $(EXTENSIONS_DIR)/include
COLCON_INCLUDES += $(EXTENSIONS_DIR)/include/private
COLCON_INCLUDES += $(EXTENSIONS_DIR)/include/FreeRTOS_POSIX
COLCON_INCLUDES += $(EXTENSIONS_DIR)/include/FreeRTOS_POSIX/sys
COLCON_INCLUDES += $(EXTENSIONS_DIR)/src/hal/interface
COLCON_INCLUDES += $(EXTENSIONS_DIR)/src/modules/interface
COLCON_INCLUDES += $(EXTENSIONS_DIR)/src/utils/interface
COLCON_INCLUDES += $(EXTENSIONS_DIR)/src/config
COLCON_INCLUDES += $(EXTENSIONS_DIR)/src/hal/interface
COLCON_INCLUDES += $(EXTENSIONS_DIR)/src/modules/interface
COLCON_INCLUDES += $(EXTENSIONS_DIR)/src/utils/interface
COLCON_INCLUDES += $(EXTENSIONS_DIR)/src/config
COLCON_INCLUDES += $(EXTENSIONS_DIR)/src/drivers/interface
COLCON_INCLUDES += $(EXTENSIONS_DIR)/Middlewares/Third_Party/LwIP/src/include/posix
COLCON_INCLUDES += $(EXTENSIONS_DIR)/Middlewares/Third_Party/LwIP/src/include
Expand All @@ -286,6 +286,11 @@ COLCON_INCLUDES += $(EXTENSIONS_DIR)/Drivers/STM32F4xx_HAL_Driver/Inc
COLCON_INCLUDES += $(EXTENSIONS_DIR)/Drivers/CMSIS/Device/ST/STM32F4xx/Include
COLCON_INCLUDES += $(EXTENSIONS_DIR)/Drivers/CMSIS/Include
COLCON_INCLUDES += $(EXTENSIONS_DIR)/Middlewares/Third_Party/LwIP/system
COLCON_INCLUDES += $(EXTENSIONS_DIR)/Middlewares/Third_Party/LwIP/src/include/compat/posix
COLCON_INCLUDES += $(EXTENSIONS_DIR)/Middlewares/Third_Party/LwIP/src/include/compat/posix/arpa
COLCON_INCLUDES += $(EXTENSIONS_DIR)/Middlewares/Third_Party/LwIP/src/include/compat/posix/net
COLCON_INCLUDES += $(EXTENSIONS_DIR)/Middlewares/Third_Party/LwIP/src/include/compat/posix/sys
COLCON_INCLUDES += $(EXTENSIONS_DIR)/Middlewares/Third_Party/LwIP/src/include/compat/stdc
COLCON_INCLUDES_STR := $(foreach x,$(COLCON_INCLUDES),$(x)\n)

# compile gcc flags
Expand All @@ -309,8 +314,8 @@ ARCHCPUFLAGS = $(MCU) $(C_DEFS) $(OPT) -Wall -fdata-sections -ffunction-sections
LDSCRIPT = STM32F407ZGTx_FLASH.ld

# libraries
LIBS = -lc -lm -lnosys
LIBDIR =
LIBS = -lc -lm -lnosys
LIBDIR =
LDFLAGS = $(MCU) --specs=nosys.specs -specs=nano.specs -T$(LDSCRIPT) $(LIBDIR) $(LIBS) -Wl,-Map=$(BUILD_DIR)/$(TARGET).map,--cref -Wl,--gc-sections

# default action: build all
Expand Down Expand Up @@ -370,7 +375,7 @@ vpath %.c $(sort $(dir $(C_SOURCES)))
OBJECTS += $(addprefix $(BUILD_DIR)/,$(notdir $(ASM_SOURCES:.s=.o)))
vpath %.s $(sort $(dir $(ASM_SOURCES)))

$(BUILD_DIR)/%.o: %.c Makefile | $(BUILD_DIR)
$(BUILD_DIR)/%.o: %.c Makefile | $(BUILD_DIR)
$(CC) -c $(CFLAGS) -Wa,-a,-ad,-alms=$(BUILD_DIR)/$(notdir $(<:.c=.lst)) $< -o $@

$(BUILD_DIR)/%.o: %.s Makefile | $(BUILD_DIR)
Expand All @@ -382,19 +387,19 @@ $(BUILD_DIR)/$(TARGET).elf: $(OBJECTS) Makefile

$(BUILD_DIR)/%.hex: $(BUILD_DIR)/%.elf | $(BUILD_DIR)
$(HEX) $< $@

$(BUILD_DIR)/%.bin: $(BUILD_DIR)/%.elf | $(BUILD_DIR)
$(BIN) $< $@
$(BIN) $< $@

$(BUILD_DIR):
mkdir $@
mkdir $@

#######################################
# clean up
#######################################
clean:
-rm -fR $(BUILD_DIR);
-rm -fR $(BUILD_DIR);

#######################################
# dependencies
#######################################
Expand Down