Skip to content

Commit

Permalink
Merge branch 'main' into fix-chibios-sd-read
Browse files Browse the repository at this point in the history
  • Loading branch information
networkfusion committed Mar 3, 2024
2 parents 6e85810 + 245604f commit 3ba4238
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .devcontainer/All/Dockerfile.All.SRC
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ RUN git clone --branch nf-build https://github.com/nanoframework/STM32CubeL4.git
&& git clone --branch chibios-21.11.x https://github.com/ChibiOS/ChibiOS-Contrib.git --depth 1 ./sources/ChibiOs-Contrib

# Clone repos for AzureRTOS
RUN git clone --branch v6.4.0_rel --recursive https://github.com/azure-rtos/threadx.git --depth 1 ./sources/AzureRTOS \
&& git clone --branch v6.3.0_rel --recursive https://github.com/azure-rtos/netxduo.git --depth 1 ./sources/NetxDuo
RUN git clone --branch v6.4.0_rel --recursive https://github.com/eclipse-threadx/threadx.git --depth 1 ./sources/AzureRTOS \
&& git clone --branch v6.3.0_rel --recursive https://github.com/eclipse-threadx/netxduo.git --depth 1 ./sources/NetxDuo

# Clone dependent repos (mbedtls, fatfs and spiffs)
RUN git clone --branch mbedtls-2.28.5 https://github.com/ARMmbed/mbedtls.git --depth 1 ./sources/mbedtls \
Expand Down
4 changes: 2 additions & 2 deletions .devcontainer/AzureRTOS/Dockerfile.AzureRTOS.SRC
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ RUN git clone --branch nf-build https://github.com/nanoframework/STM32CubeL4.git
&& git clone --branch nf-build https://github.com/nanoframework/STM32CubeH7.git --depth 1 ./sources/STM32CubeH7

# Clone repos for AzureRTOS
RUN git clone --branch v6.4.0_rel --recursive https://github.com/azure-rtos/threadx.git --depth 1 ./sources/AzureRTOS \
&& git clone --branch v6.4.0_rel --recursive https://github.com/azure-rtos/netxduo.git --depth 1 ./sources/NetxDuo
RUN git clone --branch v6.4.0_rel --recursive https://github.com/eclipse-threadx/threadx.git --depth 1 ./sources/AzureRTOS \
&& git clone --branch v6.4.0_rel --recursive https://github.com/eclipse-threadx/netxduo.git --depth 1 ./sources/NetxDuo

# Clone dependent repos (mbedtls, fatfs and spiffs)
RUN git clone --branch mbedtls-2.28.5 https://github.com/ARMmbed/mbedtls.git --depth 1 ./sources/mbedtls \
Expand Down
8 changes: 4 additions & 4 deletions targets/AzureRTOS/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ if(NO_AZURERTOS_SOURCE_FOLDER)

FetchContent_Declare(
azure_rtos
GIT_REPOSITORY https://github.com/azure-rtos/threadx.git
GIT_REPOSITORY https://github.com/eclipse-threadx/threadx.git
GIT_TAG ${RTOS_VERSION}
)

Expand Down Expand Up @@ -146,7 +146,7 @@ if(AZURERTOS_USBX_REQUIRED)

FetchContent_Declare(
azure_rtos_usbx
GIT_REPOSITORY https://github.com/azure-rtos/usbx.git
GIT_REPOSITORY https://github.com/eclipse-threadx/usbx.git
GIT_TAG ${RTOS_VERSION}
)

Expand Down Expand Up @@ -207,7 +207,7 @@ if(AZURERTOS_FILEX_REQUIRED)

FetchContent_Declare(
azure_rtos_filex
GIT_REPOSITORY https://github.com/azure-rtos/filex.git
GIT_REPOSITORY https://github.com/eclipse-threadx/filex.git
GIT_TAG ${FILEX_VERSION}
)

Expand Down Expand Up @@ -268,7 +268,7 @@ if(AZURERTOS_NETXDUO_REQUIRED)

FetchContent_Declare(
azure_rtos_netxduo
GIT_REPOSITORY https://github.com/azure-rtos/netxduo.git
GIT_REPOSITORY https://github.com/eclipse-threadx/netxduo.git
GIT_TAG ${NETXDUO_VERSION}
)

Expand Down

0 comments on commit 3ba4238

Please sign in to comment.