Merge pull request #1385 from zudwalex/move_stm32_examples

Move STM32 examples to stm32 folder

.github/workflows/test.yml

@@ -68,25 +68,25 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: stm32-freertos-tcp
-      run: make -C examples/stm32-freertos-tcp build
+      run: make -C examples/stm32/stm32-freertos-tcp build
   stm32-nucleo-f746z:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
     - name: stm32-nucleo-f746z
-      run: make -C examples/stm32-nucleo-f746z build
+      run: make -C examples/stm32/stm32-nucleo-f746z build
   stm32-nucleo-f429z:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
     - name: stm32-nucleo-f429z
-      run: make -C examples/stm32-nucleo-f429z build
+      run: make -C examples/stm32/stm32-nucleo-f429z build
   stm32-nucleo-h743z:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
     - name: stm32-nucleo-h743z
-      run: make -C examples/stm32-nucleo-h743z build
+      run: make -C examples/stm32/stm32-nucleo-h743z build
   nxp-mimxrt1020-azurertos:
     runs-on: ubuntu-latest
     steps:

examples/stm32/stm32-freertos-tcp/Makefile

@@ -1,13 +1,13 @@
 # FreeRTOS/{FreeRTOS-Kernel V10.4.3,FreeRTOS-Plus-TCP V2.3.2}
 PROG = firmware
 ARCH = stm32f7
-PROJECT_ROOT_PATH = $(realpath $(CURDIR)/../..)
+PROJECT_ROOT_PATH = $(realpath $(CURDIR)/../../..)
 DOCKER ?= docker run --rm -v $(PROJECT_ROOT_PATH):$(PROJECT_ROOT_PATH) -w $(CURDIR) mdashnet/armgcc
 FREERTOS_KERNEL_PATH ?= $(PROJECT_ROOT_PATH)/test/freertos-kernel
 FREERTOS_PLUS_TCP_PATH ?= $(PROJECT_ROOT_PATH)/test/freertos-tcp
 
 MONGOOSE_FLAGS = -DMG_ARCH=MG_ARCH_FREERTOS_TCP
-MCU_FLAGS = -mcpu=cortex-m7 -mthumb -mfloat-abi=softfp -mfpu=vfpv4 
+MCU_FLAGS = -mcpu=cortex-m7 -mthumb -mfloat-abi=softfp -mfpu=vfpv4
 #-mcpu=cortex-m7 -mthumb -mfpu=fpv5-sp-d16 -mfloat-abi=hard
 
 INCLUDES = -I$(PROJECT_ROOT_PATH) -I$(ARCH) -I$(FREERTOS_KERNEL_PATH)/include -I$(FREERTOS_PLUS_TCP_PATH)/include
@@ -36,19 +36,19 @@ SOURCES += $(FREERTOS_KERNEL_PATH)/portable/MemMang/heap_5.c
 SOURCES += $(FREERTOS_KERNEL_PATH)/portable/GCC/ARM_CM7/r0p1/port.c
 
 # FreeRTOS TCP stack sources
-SOURCES += $(FREERTOS_PLUS_TCP_PATH)/FreeRTOS_ARP.c 
-SOURCES += $(FREERTOS_PLUS_TCP_PATH)/FreeRTOS_DHCP.c 
-SOURCES += $(FREERTOS_PLUS_TCP_PATH)/FreeRTOS_DNS.c 
-SOURCES += $(FREERTOS_PLUS_TCP_PATH)/FreeRTOS_IP.c 
-SOURCES += $(FREERTOS_PLUS_TCP_PATH)/FreeRTOS_Sockets.c 
-SOURCES += $(FREERTOS_PLUS_TCP_PATH)/FreeRTOS_Stream_Buffer.c 
+SOURCES += $(FREERTOS_PLUS_TCP_PATH)/FreeRTOS_ARP.c
+SOURCES += $(FREERTOS_PLUS_TCP_PATH)/FreeRTOS_DHCP.c
+SOURCES += $(FREERTOS_PLUS_TCP_PATH)/FreeRTOS_DNS.c
+SOURCES += $(FREERTOS_PLUS_TCP_PATH)/FreeRTOS_IP.c
+SOURCES += $(FREERTOS_PLUS_TCP_PATH)/FreeRTOS_Sockets.c
+SOURCES += $(FREERTOS_PLUS_TCP_PATH)/FreeRTOS_Stream_Buffer.c
 SOURCES += $(FREERTOS_PLUS_TCP_PATH)/FreeRTOS_TCP_IP.c
-SOURCES += $(FREERTOS_PLUS_TCP_PATH)/FreeRTOS_TCP_WIN.c 
-SOURCES += $(FREERTOS_PLUS_TCP_PATH)/FreeRTOS_UDP_IP.c 
+SOURCES += $(FREERTOS_PLUS_TCP_PATH)/FreeRTOS_TCP_WIN.c
+SOURCES += $(FREERTOS_PLUS_TCP_PATH)/FreeRTOS_UDP_IP.c
 SOURCES += $(FREERTOS_PLUS_TCP_PATH)/portable/NetworkInterface/Common/phyHandling.c
 SOURCES += $(FREERTOS_PLUS_TCP_PATH)/portable/BufferManagement/BufferAllocation_1.c
 SOURCES += $(FREERTOS_PLUS_TCP_PATH)/portable/NetworkInterface/STM32Fxx/NetworkInterface.c
-SOURCES += $(FREERTOS_PLUS_TCP_PATH)/portable/NetworkInterface/STM32Fxx/stm32fxx_hal_eth.c 
+SOURCES += $(FREERTOS_PLUS_TCP_PATH)/portable/NetworkInterface/STM32Fxx/stm32fxx_hal_eth.c
 
 OBJECTS = obj/boot.o $(SOURCES:%.c=obj/%.o)
 

examples/stm32/stm32-nucleo-f429z/Makefile

@@ -2,7 +2,7 @@ NAME ?= $(notdir $(CURDIR))
 
 build:
 	git clone --depth 1 https://github.com/mongoose-examples/$(NAME)
-	cp ./../../mongoose.[ch] $(NAME)/Middlewares/Third_Party/Mongoose/
+	cp ./../../../mongoose.[ch] $(NAME)/Middlewares/Third_Party/Mongoose/
 	make -C $(NAME) build
 
 clean:

examples/stm32/stm32-nucleo-f746z/Makefile

@@ -2,7 +2,7 @@ NAME ?= $(notdir $(CURDIR))
 
 build:
 	git clone --depth 1 https://github.com/mongoose-examples/$(NAME)
-	cp ./../../mongoose.[ch] $(NAME)/Middlewares/Third_Party/Mongoose/
+	cp ./../../../mongoose.[ch] $(NAME)/Middlewares/Third_Party/Mongoose/
 	make -C $(NAME) build
 
 clean:

examples/stm32/stm32-nucleo-h743z/Makefile

@@ -2,7 +2,7 @@ NAME ?= $(notdir $(CURDIR))
 
 build:
 	git clone --depth 1 https://github.com/mongoose-examples/$(NAME)
-	cp ./../../mongoose.[ch] $(NAME)/Middlewares/Third_Party/Mongoose/
+	cp ./../../../mongoose.[ch] $(NAME)/Middlewares/Third_Party/Mongoose/
 	make -C $(NAME) build
 
 clean: