Skip to content

Commit 7c2a085

Browse files
Merge branch 'main' into devcontainer-structure-4
2 parents 846c246 + 245604f commit 7c2a085

File tree

35 files changed

+72
-81
lines changed

35 files changed

+72
-81
lines changed

.devcontainer/All/Dockerfile.All.SRC

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ RUN git clone --branch nf-build https://github.com/nanoframework/STM32CubeL4.git
7474
&& git clone --branch chibios-21.11.x https://github.com/ChibiOS/ChibiOS-Contrib.git --depth 1 ./sources/ChibiOs-Contrib
7575

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

8080
# Clone dependent repos (mbedtls, fatfs and spiffs)
8181
RUN git clone --branch mbedtls-2.28.5 https://github.com/ARMmbed/mbedtls.git --depth 1 ./sources/mbedtls \

.devcontainer/AzureRTOS/Dockerfile.AzureRTOS.SRC

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ RUN git clone --branch nf-build https://github.com/nanoframework/STM32CubeL4.git
6363
&& git clone --branch nf-build https://github.com/nanoframework/STM32CubeH7.git --depth 1 ./sources/STM32CubeH7
6464

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

6969
# Clone dependent repos (mbedtls, fatfs and spiffs)
7070
RUN git clone --branch mbedtls-2.28.5 https://github.com/ARMmbed/mbedtls.git --depth 1 ./sources/mbedtls \

CMakeLists.txt

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -160,15 +160,6 @@ if(RTOS_CHIBIOS_CHECK OR RTOS_TI_SIMPLELINK_CHECK)
160160
unset(LINK_OPTIONS)
161161
#################################################################
162162

163-
#################################################################
164-
# clear other options and definitions that we want to set
165-
unset(COMPILE_OPTIONS)
166-
unset(C_COMPILE_OPTIONS)
167-
unset(CXX_COMPILE_OPTIONS)
168-
unset(COMPILE_DEFINITIONS)
169-
unset(LINK_OPTIONS)
170-
#################################################################
171-
172163
endif()
173164

174165
#################################################################################

src/HAL/Include/nanoHAL_Boot.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ extern "C"
6666

6767
// Launches the proprietary bootloader of the platform.
6868
// Returns false in case it's not supported (which is considered the default).
69-
// In case of a successfull call it won't return.
69+
// In case of a successful call it won't return.
7070
// Implemented as "weak" to allow it to be replaced with "hard" implementation at platform level.
7171
bool LaunchProprietaryBootloader();
7272

@@ -81,7 +81,7 @@ extern "C"
8181
// Returns false in case it's not supported (which is considered the default).
8282
bool RequestToLaunchProprietaryBootloader();
8383

84-
// Report successfull nanoBooter execution
84+
// Report successful nanoBooter execution
8585
void ReportSuccessfullNanoBooter();
8686

8787
#ifdef __cplusplus

src/HAL/nanoHAL_Boot.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ inline bool RequestToLaunchProprietaryBootloader()
9292
return false;
9393
}
9494

95-
// Report successfull nanoBooter execution
95+
// Report successful nanoBooter execution
9696
void ReportSuccessfullNanoBooter()
9797
{
9898
#if (TARGET_HAS_NANOBOOTER == TRUE)
@@ -107,7 +107,7 @@ void ReportSuccessfullNanoBooter()
107107

108108
// Calls the proprietary bootloader of the platform.
109109
// Returns false in case it's not supported (which is considered the default).
110-
// In case of a successfull call it won't return.
110+
// In case of a successful call it won't return.
111111
// Implemented as "weak" to allow it to be replaced with "hard" implementation at platform level.
112112
__nfweak bool LaunchProprietaryBootloader()
113113
{

src/System.IO.FileSystem/nf_sys_io_filesystem_System_IO_Directory.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ HRESULT Library_nf_sys_io_filesystem_System_IO_Directory::GetFilesNative___STATI
204204
stringBuffer = (char *)platform_malloc(FF_LFN_BUF + 1);
205205
workingBuffer = (char *)platform_malloc(2 * FF_LFN_BUF + 1);
206206

207-
// sanity check for successfull malloc
207+
// sanity check for successful malloc
208208
if (stringBuffer == NULL || workingBuffer == NULL)
209209
{
210210
// failed to allocate memory
@@ -337,7 +337,7 @@ HRESULT Library_nf_sys_io_filesystem_System_IO_Directory::GetDirectoriesNative__
337337
stringBuffer = (char *)platform_malloc(FF_LFN_BUF + 1);
338338
workingBuffer = (char *)platform_malloc(2 * FF_LFN_BUF + 1);
339339

340-
// sanity check for successfull malloc
340+
// sanity check for successful malloc
341341
if (stringBuffer == NULL || workingBuffer == NULL)
342342
{
343343
// failed to allocate memory

src/System.IO.FileSystem/nf_sys_io_filesystem_System_IO_File.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ HRESULT Library_nf_sys_io_filesystem_System_IO_File::ExistsNative___STATIC__BOOL
2929
// setup file path
3030
filePath = (char *)platform_malloc(2 * FF_LFN_BUF + 1);
3131

32-
// sanity check for successfull malloc
32+
// sanity check for successful malloc
3333
if (filePath == NULL)
3434
{
3535
// failed to allocate memory

src/System.IO.FileSystem/nf_sys_io_filesystem_System_IO_FileStream.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ HRESULT Library_nf_sys_io_filesystem_System_IO_FileStream::OpenFileNative___VOID
4040
// setup file path
4141
filePath = (char *)platform_malloc(2 * FF_LFN_BUF + 1);
4242

43-
// sanity check for successfull malloc
43+
// sanity check for successful malloc
4444
if (filePath == NULL)
4545
{
4646
// failed to allocate memory
@@ -167,7 +167,7 @@ HRESULT Library_nf_sys_io_filesystem_System_IO_FileStream::ReadNative___I4__STRI
167167
// setup file path
168168
filePath = (char *)platform_malloc(2 * FF_LFN_BUF + 1);
169169

170-
// sanity check for successfull malloc
170+
// sanity check for successful malloc
171171
if (filePath == NULL)
172172
{
173173
// failed to allocate memory
@@ -271,7 +271,7 @@ HRESULT Library_nf_sys_io_filesystem_System_IO_FileStream::WriteNative___VOID__S
271271
// setup file path
272272
filePath = (char *)platform_malloc(2 * FF_LFN_BUF + 1);
273273

274-
// sanity check for successfull malloc
274+
// sanity check for successful malloc
275275
if (filePath == NULL)
276276
{
277277
// failed to allocate memory
@@ -364,7 +364,7 @@ HRESULT Library_nf_sys_io_filesystem_System_IO_FileStream::GetLengthNative___I8_
364364
// setup file path
365365
filePath = (char *)platform_malloc(2 * FF_LFN_BUF + 1);
366366

367-
// sanity check for successfull malloc
367+
// sanity check for successful malloc
368368
if (filePath == NULL)
369369
{
370370
// failed to allocate memory

targets/AzureRTOS/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ if(NO_AZURERTOS_SOURCE_FOLDER)
8787

8888
FetchContent_Declare(
8989
azure_rtos
90-
GIT_REPOSITORY https://github.com/azure-rtos/threadx.git
90+
GIT_REPOSITORY https://github.com/eclipse-threadx/threadx.git
9191
GIT_TAG ${RTOS_VERSION}
9292
)
9393

@@ -146,7 +146,7 @@ if(AZURERTOS_USBX_REQUIRED)
146146

147147
FetchContent_Declare(
148148
azure_rtos_usbx
149-
GIT_REPOSITORY https://github.com/azure-rtos/usbx.git
149+
GIT_REPOSITORY https://github.com/eclipse-threadx/usbx.git
150150
GIT_TAG ${RTOS_VERSION}
151151
)
152152

@@ -207,7 +207,7 @@ if(AZURERTOS_FILEX_REQUIRED)
207207

208208
FetchContent_Declare(
209209
azure_rtos_filex
210-
GIT_REPOSITORY https://github.com/azure-rtos/filex.git
210+
GIT_REPOSITORY https://github.com/eclipse-threadx/filex.git
211211
GIT_TAG ${FILEX_VERSION}
212212
)
213213

@@ -268,7 +268,7 @@ if(AZURERTOS_NETXDUO_REQUIRED)
268268

269269
FetchContent_Declare(
270270
azure_rtos_netxduo
271-
GIT_REPOSITORY https://github.com/azure-rtos/netxduo.git
271+
GIT_REPOSITORY https://github.com/eclipse-threadx/netxduo.git
272272
GIT_TAG ${NETXDUO_VERSION}
273273
)
274274

targets/AzureRTOS/Maxim/MAX78000_FTHR/nanoBooter/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ int main(void)
129129
// init boot clipboard
130130
InitBootClipboard();
131131

132-
// report successfull nanoBooter execution
132+
// report successful nanoBooter execution
133133
ReportSuccessfullNanoBooter();
134134

135135
// the following IF is not mandatory, it's just providing a way for a user to 'force'

0 commit comments

Comments
 (0)