diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 65515979..d9bdac66 100644 --- a/.github/workflows/test.yml +++ b/.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: diff --git a/examples/stm32-freertos-tcp/HAL/Legacy/stm32_hal_legacy.h b/examples/stm32/stm32-freertos-tcp/HAL/Legacy/stm32_hal_legacy.h similarity index 100% rename from examples/stm32-freertos-tcp/HAL/Legacy/stm32_hal_legacy.h rename to examples/stm32/stm32-freertos-tcp/HAL/Legacy/stm32_hal_legacy.h diff --git a/examples/stm32-freertos-tcp/HAL/stm32f7xx_hal.c b/examples/stm32/stm32-freertos-tcp/HAL/stm32f7xx_hal.c similarity index 100% rename from examples/stm32-freertos-tcp/HAL/stm32f7xx_hal.c rename to examples/stm32/stm32-freertos-tcp/HAL/stm32f7xx_hal.c diff --git a/examples/stm32-freertos-tcp/HAL/stm32f7xx_hal.h b/examples/stm32/stm32-freertos-tcp/HAL/stm32f7xx_hal.h similarity index 100% rename from examples/stm32-freertos-tcp/HAL/stm32f7xx_hal.h rename to examples/stm32/stm32-freertos-tcp/HAL/stm32f7xx_hal.h diff --git a/examples/stm32-freertos-tcp/HAL/stm32f7xx_hal_conf.h b/examples/stm32/stm32-freertos-tcp/HAL/stm32f7xx_hal_conf.h similarity index 100% rename from examples/stm32-freertos-tcp/HAL/stm32f7xx_hal_conf.h rename to examples/stm32/stm32-freertos-tcp/HAL/stm32f7xx_hal_conf.h diff --git a/examples/stm32-freertos-tcp/HAL/stm32f7xx_hal_cortex.c b/examples/stm32/stm32-freertos-tcp/HAL/stm32f7xx_hal_cortex.c similarity index 100% rename from examples/stm32-freertos-tcp/HAL/stm32f7xx_hal_cortex.c rename to examples/stm32/stm32-freertos-tcp/HAL/stm32f7xx_hal_cortex.c diff --git a/examples/stm32-freertos-tcp/HAL/stm32f7xx_hal_cortex.h b/examples/stm32/stm32-freertos-tcp/HAL/stm32f7xx_hal_cortex.h similarity index 100% rename from examples/stm32-freertos-tcp/HAL/stm32f7xx_hal_cortex.h rename to examples/stm32/stm32-freertos-tcp/HAL/stm32f7xx_hal_cortex.h diff --git a/examples/stm32-freertos-tcp/HAL/stm32f7xx_hal_def.h b/examples/stm32/stm32-freertos-tcp/HAL/stm32f7xx_hal_def.h similarity index 100% rename from examples/stm32-freertos-tcp/HAL/stm32f7xx_hal_def.h rename to examples/stm32/stm32-freertos-tcp/HAL/stm32f7xx_hal_def.h diff --git a/examples/stm32-freertos-tcp/HAL/stm32f7xx_hal_gpio.c b/examples/stm32/stm32-freertos-tcp/HAL/stm32f7xx_hal_gpio.c similarity index 100% rename from examples/stm32-freertos-tcp/HAL/stm32f7xx_hal_gpio.c rename to examples/stm32/stm32-freertos-tcp/HAL/stm32f7xx_hal_gpio.c diff --git a/examples/stm32-freertos-tcp/HAL/stm32f7xx_hal_gpio.h b/examples/stm32/stm32-freertos-tcp/HAL/stm32f7xx_hal_gpio.h similarity index 100% rename from examples/stm32-freertos-tcp/HAL/stm32f7xx_hal_gpio.h rename to examples/stm32/stm32-freertos-tcp/HAL/stm32f7xx_hal_gpio.h diff --git a/examples/stm32-freertos-tcp/HAL/stm32f7xx_hal_gpio_ex.h b/examples/stm32/stm32-freertos-tcp/HAL/stm32f7xx_hal_gpio_ex.h similarity index 100% rename from examples/stm32-freertos-tcp/HAL/stm32f7xx_hal_gpio_ex.h rename to examples/stm32/stm32-freertos-tcp/HAL/stm32f7xx_hal_gpio_ex.h diff --git a/examples/stm32-freertos-tcp/HAL/stm32f7xx_hal_rcc.h b/examples/stm32/stm32-freertos-tcp/HAL/stm32f7xx_hal_rcc.h similarity index 100% rename from examples/stm32-freertos-tcp/HAL/stm32f7xx_hal_rcc.h rename to examples/stm32/stm32-freertos-tcp/HAL/stm32f7xx_hal_rcc.h diff --git a/examples/stm32-freertos-tcp/HAL/stm32f7xx_hal_rcc_ex.h b/examples/stm32/stm32-freertos-tcp/HAL/stm32f7xx_hal_rcc_ex.h similarity index 100% rename from examples/stm32-freertos-tcp/HAL/stm32f7xx_hal_rcc_ex.h rename to examples/stm32/stm32-freertos-tcp/HAL/stm32f7xx_hal_rcc_ex.h diff --git a/examples/stm32-freertos-tcp/Makefile b/examples/stm32/stm32-freertos-tcp/Makefile similarity index 85% rename from examples/stm32-freertos-tcp/Makefile rename to examples/stm32/stm32-freertos-tcp/Makefile index 323a664f..5c08a57a 100644 --- a/examples/stm32-freertos-tcp/Makefile +++ b/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) diff --git a/examples/stm32-freertos-tcp/README.md b/examples/stm32/stm32-freertos-tcp/README.md similarity index 100% rename from examples/stm32-freertos-tcp/README.md rename to examples/stm32/stm32-freertos-tcp/README.md diff --git a/examples/stm32-freertos-tcp/main.c b/examples/stm32/stm32-freertos-tcp/main.c similarity index 100% rename from examples/stm32-freertos-tcp/main.c rename to examples/stm32/stm32-freertos-tcp/main.c diff --git a/examples/stm32-freertos-tcp/openocd.cfg b/examples/stm32/stm32-freertos-tcp/openocd.cfg similarity index 100% rename from examples/stm32-freertos-tcp/openocd.cfg rename to examples/stm32/stm32-freertos-tcp/openocd.cfg diff --git a/examples/stm32-freertos-tcp/stm32f7/FreeRTOSConfig.h b/examples/stm32/stm32-freertos-tcp/stm32f7/FreeRTOSConfig.h similarity index 100% rename from examples/stm32-freertos-tcp/stm32f7/FreeRTOSConfig.h rename to examples/stm32/stm32-freertos-tcp/stm32f7/FreeRTOSConfig.h diff --git a/examples/stm32-freertos-tcp/stm32f7/FreeRTOSIPConfig.h b/examples/stm32/stm32-freertos-tcp/stm32f7/FreeRTOSIPConfig.h similarity index 100% rename from examples/stm32-freertos-tcp/stm32f7/FreeRTOSIPConfig.h rename to examples/stm32/stm32-freertos-tcp/stm32f7/FreeRTOSIPConfig.h diff --git a/examples/stm32-freertos-tcp/stm32f7/boot.s b/examples/stm32/stm32-freertos-tcp/stm32f7/boot.s similarity index 100% rename from examples/stm32-freertos-tcp/stm32f7/boot.s rename to examples/stm32/stm32-freertos-tcp/stm32f7/boot.s diff --git a/examples/stm32-freertos-tcp/stm32f7/cmsis_gcc.h b/examples/stm32/stm32-freertos-tcp/stm32f7/cmsis_gcc.h similarity index 100% rename from examples/stm32-freertos-tcp/stm32f7/cmsis_gcc.h rename to examples/stm32/stm32-freertos-tcp/stm32f7/cmsis_gcc.h diff --git a/examples/stm32-freertos-tcp/stm32f7/core_cm7.h b/examples/stm32/stm32-freertos-tcp/stm32f7/core_cm7.h similarity index 100% rename from examples/stm32-freertos-tcp/stm32f7/core_cm7.h rename to examples/stm32/stm32-freertos-tcp/stm32f7/core_cm7.h diff --git a/examples/stm32-freertos-tcp/stm32f7/core_cmFunc.h b/examples/stm32/stm32-freertos-tcp/stm32f7/core_cmFunc.h similarity index 100% rename from examples/stm32-freertos-tcp/stm32f7/core_cmFunc.h rename to examples/stm32/stm32-freertos-tcp/stm32f7/core_cmFunc.h diff --git a/examples/stm32-freertos-tcp/stm32f7/core_cmInstr.h b/examples/stm32/stm32-freertos-tcp/stm32f7/core_cmInstr.h similarity index 100% rename from examples/stm32-freertos-tcp/stm32f7/core_cmInstr.h rename to examples/stm32/stm32-freertos-tcp/stm32f7/core_cmInstr.h diff --git a/examples/stm32-freertos-tcp/stm32f7/core_cmSimd.h b/examples/stm32/stm32-freertos-tcp/stm32f7/core_cmSimd.h similarity index 100% rename from examples/stm32-freertos-tcp/stm32f7/core_cmSimd.h rename to examples/stm32/stm32-freertos-tcp/stm32f7/core_cmSimd.h diff --git a/examples/stm32-freertos-tcp/stm32f7/device.h b/examples/stm32/stm32-freertos-tcp/stm32f7/device.h similarity index 100% rename from examples/stm32-freertos-tcp/stm32f7/device.h rename to examples/stm32/stm32-freertos-tcp/stm32f7/device.h diff --git a/examples/stm32-freertos-tcp/stm32f7/link.ld b/examples/stm32/stm32-freertos-tcp/stm32f7/link.ld similarity index 100% rename from examples/stm32-freertos-tcp/stm32f7/link.ld rename to examples/stm32/stm32-freertos-tcp/stm32f7/link.ld diff --git a/examples/stm32-freertos-tcp/stm32f7/portmacro.h b/examples/stm32/stm32-freertos-tcp/stm32f7/portmacro.h similarity index 100% rename from examples/stm32-freertos-tcp/stm32f7/portmacro.h rename to examples/stm32/stm32-freertos-tcp/stm32f7/portmacro.h diff --git a/examples/stm32-freertos-tcp/stm32f7/stm32f746xx.h b/examples/stm32/stm32-freertos-tcp/stm32f7/stm32f746xx.h similarity index 100% rename from examples/stm32-freertos-tcp/stm32f7/stm32f746xx.h rename to examples/stm32/stm32-freertos-tcp/stm32f7/stm32f746xx.h diff --git a/examples/stm32-freertos-tcp/stm32f7/stm32f7xx.h b/examples/stm32/stm32-freertos-tcp/stm32f7/stm32f7xx.h similarity index 100% rename from examples/stm32-freertos-tcp/stm32f7/stm32f7xx.h rename to examples/stm32/stm32-freertos-tcp/stm32f7/stm32f7xx.h diff --git a/examples/stm32-freertos-tcp/stm32f7/system_stm32f7xx.h b/examples/stm32/stm32-freertos-tcp/stm32f7/system_stm32f7xx.h similarity index 100% rename from examples/stm32-freertos-tcp/stm32f7/system_stm32f7xx.h rename to examples/stm32/stm32-freertos-tcp/stm32f7/system_stm32f7xx.h diff --git a/examples/stm32-nucleo-f429z/Makefile b/examples/stm32/stm32-nucleo-f429z/Makefile similarity index 67% rename from examples/stm32-nucleo-f429z/Makefile rename to examples/stm32/stm32-nucleo-f429z/Makefile index fe9aa4ed..92b4174e 100644 --- a/examples/stm32-nucleo-f429z/Makefile +++ b/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: diff --git a/examples/stm32-nucleo-f746z/Makefile b/examples/stm32/stm32-nucleo-f746z/Makefile similarity index 67% rename from examples/stm32-nucleo-f746z/Makefile rename to examples/stm32/stm32-nucleo-f746z/Makefile index fe9aa4ed..92b4174e 100644 --- a/examples/stm32-nucleo-f746z/Makefile +++ b/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: diff --git a/examples/stm32-nucleo-h743z/Makefile b/examples/stm32/stm32-nucleo-h743z/Makefile similarity index 67% rename from examples/stm32-nucleo-h743z/Makefile rename to examples/stm32/stm32-nucleo-h743z/Makefile index fe9aa4ed..92b4174e 100644 --- a/examples/stm32-nucleo-h743z/Makefile +++ b/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: