diff --git a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-baremetal/RTE/Network_Library/mongoose_custom.h b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-baremetal/RTE/Network_Library/mongoose_custom.h
index 1c460660..31a9cab8 100644
--- a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-baremetal/RTE/Network_Library/mongoose_custom.h
+++ b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-baremetal/RTE/Network_Library/mongoose_custom.h
@@ -1,78 +1,53 @@
-
-// <<< Use Configuration Wizard in Context Menu >>>
-
-// <o> System Architecture
-//   <0=> Bare metal
-//   <1=> FreeRTOS
-//   <2=> CMSIS-RTOS v1
-//   <3=> CMSIS-RTOS v2
-// <i> Select either bare metal operation or a supported RTOS
-// <i> FreeRTOS uses direct FreeRTOS calls
-// <i> CMSIS-RTOS1 supports only Keil RTX through API v1
-// <i> CMSIS-RTOS2 supports Keil RTX5 and FreeRTOS through API v2
-
-#define MG_CMSISPACK_ARCH 0
-
-
-// <h> Networking support
-// <o> Networking stack
-//   <0=> Built-in
-//   <1=> lwIP
-//   <2=> FreeRTOS-Plus-TCP
-//   <3=> MDK (RL)
-// <i> Select the networking stack to use with Mongoose Library
-// <i> The built-in stack can run on bare metal or over any RTOS
-// <i> "lwIP" requires using an RTOS and BSD socket mode
-// <i> "MDK" requires using CMSIS-RTOS1 (RTX + RL) or CMSIS-RTOS2 (MDK Plus or Pro), and BSD socket mode
-#define MG_CMSISPACK_NET 0
-
-// <q> Use Mbed-TLS
-// <i> Mongoose will use Mbed-TLS calls for TLS-related functionality
-#define MG_ENABLE_MBEDTLS 0
-// </h>
-
-
-// <c1> Enable custom mg_millis()
-// <i> Use a user-provided function to get uptime in milliseconds, otherwise Mongoose will default to using time(). Except for bare metal, Mongoose will use the time base for the configured architecture
-#define MG_ENABLE_CUSTOM_MILLIS 1
-// </c>
-
-
-// <c1> Enable custom mg_rand()
-// <i> Use a user-provided function to generate random numbers, otherwise Mongoose will default to using rand()
-#define MG_ENABLE_CUSTOM_RANDOM 1
-// </c>
-
-
-// <h> Filesystem support
-// <q> Enable packed (embedded) filesystem
-#define MG_ENABLE_PACKED_FS 1
-// </h>
-
-
-// <<< end of configuration section >>>
-
-// Translate to Mongoose macros
-#if MG_CMSISPACK_ARCH == 1
-#undef MG_ARCH
-#define MG_ARCH MG_ARCH_FREERTOS
-#elif MG_CMSISPACK_ARCH == 2
-#undef MG_ARCH
-#define MG_ARCH MG_ARCH_CMSIS_RTOS1
-#elif MG_CMSISPACK_ARCH == 3
-#undef MG_ARCH
-#define MG_ARCH MG_ARCH_CMSIS_RTOS2
-#endif
-#if MG_CMSISPACK_NET == 0
-#define MG_ENABLE_TCPIP 1
-#elif MG_CMSISPACK_NET == 1
-#define MG_ENABLE_LWIP 1
-#elif MG_CMSISPACK_NET == 2
-#define MG_ENABLE_FREERTOS_TCP 1
-#elif MG_CMSISPACK_NET == 3
-#define MG_ENABLE_RL 1
-#endif
-
-
-// Add your customization below this comment
-#define MG_ENABLE_DRIVER_STM32 1
+// See https://mongoose.ws/documentation/#build-options
+#pragma once
+
+// <<< Use Configuration Wizard in Context Menu >>>
+
+// <o MG_ARCH> Build environment
+//   <MG_ARCH_ARMCC=> Keil MDK
+//   <MG_ARCH_FREERTOS=> FreeRTOS
+//   <MG_ARCH_CMSIS_RTOS1=> CMSIS-RTOS v1
+//   <MG_ARCH_CMSIS_RTOS2=> CMSIS-RTOS v2
+//   <MG_ARCH_NEWLIB=> ARM GCC + Newlib
+#define MG_ARCH MG_ARCH_ARMCC
+
+// <q> Enable builtin TCP/IP stack
+#define MG_ENABLE_TCPIP 1
+
+// <h> Network Drivers for builtin TCP/IP stack
+// <q> Enable STM23Fxx Ethernet driver
+#define MG_ENABLE_DRIVER_STM32F 1
+
+// <q> Enable STM32Hxx Ethernet driver
+#define MG_ENABLE_DRIVER_STM32H 0
+
+// <q> Enable IMXRT Ethernet driver
+#define MG_ENABLE_DRIVER_IMXRT 0
+
+// <q> Enable W5500 Ethernet driver
+#define MG_ENABLE_DRIVER_W5500 0
+
+// <q> Enable TI TM4C Ethernet driver
+#define MG_ENABLE_DRIVER_TM4C 0
+
+// </h>
+
+// <o MG_TLS> TLS support
+//   <MG_TLS_NONE=> None
+//   <MG_TLS_BUILTIN=> Built-in TLS 1.3 stack
+//   <MG_TLS_MBED=> MbedTLS
+#define MG_TLS MG_TLS_NONE
+
+// <q> Enable custom mg_millis() 
+#define MG_ENABLE_CUSTOM_MILLIS 1
+
+// <q> Enable custom mg_random() 
+#define MG_ENABLE_CUSTOM_RANDOM 1
+
+// <q> Enable packed (embedded) filesystem
+#define MG_ENABLE_PACKED_FS 1
+
+// <<< end of configuration section >>>
+
+// Add your customization below this comment
+
diff --git a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos-lwip/RTE/Network_Library/mongoose_custom.h b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos-lwip/RTE/Network_Library/mongoose_custom.h
index 8166a2e0..18aca303 100644
--- a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos-lwip/RTE/Network_Library/mongoose_custom.h
+++ b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos-lwip/RTE/Network_Library/mongoose_custom.h
@@ -1,78 +1,55 @@
-
-// <<< Use Configuration Wizard in Context Menu >>>
-
-// <o> System Architecture
-//   <0=> Bare metal
-//   <1=> FreeRTOS
-//   <2=> CMSIS-RTOS v1
-//   <3=> CMSIS-RTOS v2
-// <i> Select either bare metal operation or a supported RTOS
-// <i> "FreeRTOS" uses direct FreeRTOS calls
-// <i> "CMSIS-RTOS v1" supports only Keil RTX through API v1
-// <i> "CMSIS-RTOS v2" supports Keil RTX5 and FreeRTOS through API v2
-
-#define MG_CMSISPACK_ARCH 1
-
-
-// <h> Networking support
-// <o> Networking stack
-//   <0=> Built-in
-//   <1=> lwIP
-//   <2=> FreeRTOS-Plus-TCP
-//   <3=> MDK (RL)
-// <i> Select the networking stack to use with Mongoose Library
-// <i> The built-in stack can run on bare metal or over any RTOS
-// <i> "lwIP" requires using an RTOS and BSD socket mode
-// <i> "MDK" requires using CMSIS-RTOS1 (RTX + RL) or CMSIS-RTOS2 (MDK Plus or Pro), and BSD socket mode
-#define MG_CMSISPACK_NET 1
-
-// <q> Use Mbed-TLS
-// <i> Mongoose will use Mbed-TLS calls for TLS-related functionality
-#define MG_ENABLE_MBEDTLS 0
-// </h>
-
-
-// <c1> Enable custom mg_millis()
-// <i> Use a user-provided function to get uptime in milliseconds, otherwise Mongoose will default to using time(). Except for bare metal, Mongoose will use the time base for the configured architecture
-//#define MG_ENABLE_CUSTOM_MILLIS 1
-// </c>
-
-
-// <c1> Enable custom mg_rand()
-// <i> Use a user-provided function to generate random numbers, otherwise Mongoose will default to using rand()
-#define MG_ENABLE_CUSTOM_RANDOM 1
-// </c>
-
-
-// <h> Filesystem support
-// <q> Enable packed (embedded) filesystem
-#define MG_ENABLE_PACKED_FS 1
-// </h>
-
-
-// <<< end of configuration section >>>
-
-// Translate to Mongoose macros
-#if MG_CMSISPACK_ARCH == 1
-#undef MG_ARCH
-#define MG_ARCH MG_ARCH_FREERTOS
-#elif MG_CMSISPACK_ARCH == 2
-#undef MG_ARCH
-#define MG_ARCH MG_ARCH_CMSIS_RTOS1
-#elif MG_CMSISPACK_ARCH == 3
-#undef MG_ARCH
-#define MG_ARCH MG_ARCH_CMSIS_RTOS2
-#endif
-#if MG_CMSISPACK_NET == 0
-#define MG_ENABLE_TCPIP 1
-#elif MG_CMSISPACK_NET == 1
-#define MG_ENABLE_LWIP 1
-#elif MG_CMSISPACK_NET == 2
-#define MG_ENABLE_FREERTOS_TCP 1
-#elif MG_CMSISPACK_NET == 3
-#define MG_ENABLE_RL 1
-#endif
-
-
-// Add your customization below this comment
-
+// See https://mongoose.ws/documentation/#build-options
+#pragma once
+
+// <<< Use Configuration Wizard in Context Menu >>>
+
+// <o MG_ARCH> Build environment
+//   <MG_ARCH_ARMCC=> Keil MDK
+//   <MG_ARCH_FREERTOS=> FreeRTOS
+//   <MG_ARCH_CMSIS_RTOS1=> CMSIS-RTOS v1
+//   <MG_ARCH_CMSIS_RTOS2=> CMSIS-RTOS v2
+//   <MG_ARCH_NEWLIB=> ARM GCC + Newlib
+#define MG_ARCH MG_ARCH_FREERTOS
+
+// <q> Enable builtin TCP/IP stack
+#define MG_ENABLE_TCPIP 0
+
+// <h> Network Drivers for builtin TCP/IP stack
+// <q> Enable STM23Fxx Ethernet driver
+#define MG_ENABLE_DRIVER_STM32F 0
+
+// <q> Enable STM32Hxx Ethernet driver
+#define MG_ENABLE_DRIVER_STM32H 0
+
+// <q> Enable IMXRT Ethernet driver
+#define MG_ENABLE_DRIVER_IMXRT 0
+
+// <q> Enable W5500 Ethernet driver
+#define MG_ENABLE_DRIVER_W5500 0
+
+// <q> Enable TI TM4C Ethernet driver
+#define MG_ENABLE_DRIVER_TM4C 0
+
+// </h>
+
+// <o MG_TLS> TLS support
+//   <MG_TLS_NONE=> None
+//   <MG_TLS_BUILTIN=> Built-in TLS 1.3 stack
+//   <MG_TLS_MBED=> MbedTLS
+#define MG_TLS MG_TLS_NONE
+
+// <q> Enable custom mg_millis() 
+#define MG_ENABLE_CUSTOM_MILLIS 0
+
+// <q> Enable custom mg_random() 
+#define MG_ENABLE_CUSTOM_RANDOM 1
+
+// <q> Enable packed (embedded) filesystem
+#define MG_ENABLE_PACKED_FS 1
+
+// <<< end of configuration section >>>
+
+// Add your customization below this comment
+#define MG_ENABLE_LWIP 1
+
+
diff --git a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos-tcp/RTE/Network_Library/mongoose_custom.h b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos-tcp/RTE/Network_Library/mongoose_custom.h
index 43db7428..2eba6594 100644
--- a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos-tcp/RTE/Network_Library/mongoose_custom.h
+++ b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos-tcp/RTE/Network_Library/mongoose_custom.h
@@ -1,78 +1,53 @@
-
-// <<< Use Configuration Wizard in Context Menu >>>
-
-// <o> System Architecture
-//   <0=> Bare metal
-//   <1=> FreeRTOS
-//   <2=> CMSIS-RTOS v1
-//   <3=> CMSIS-RTOS v2
-// <i> Select either bare metal operation or a supported RTOS
-// <i> "FreeRTOS" uses direct FreeRTOS calls
-// <i> "CMSIS-RTOS v1" supports only Keil RTX through API v1
-// <i> "CMSIS-RTOS v2" supports Keil RTX5 and FreeRTOS through API v2
-
-#define MG_CMSISPACK_ARCH 1
-
-
-// <h> Networking support
-// <o> Networking stack
-//   <0=> Built-in
-//   <1=> lwIP
-//   <2=> FreeRTOS-Plus-TCP
-//   <3=> MDK (RL)
-// <i> Select the networking stack to use with Mongoose Library
-// <i> The built-in stack can run on bare metal or over any RTOS
-// <i> "lwIP" requires using an RTOS and BSD socket mode
-// <i> "MDK" requires using CMSIS-RTOS1 (RTX + RL) or CMSIS-RTOS2 (MDK Plus or Pro), and BSD socket mode
-#define MG_CMSISPACK_NET 2
-
-// <q> Use Mbed-TLS
-// <i> Mongoose will use Mbed-TLS calls for TLS-related functionality
-#define MG_ENABLE_MBEDTLS 0
-// </h>
-
-
-// <c1> Enable custom mg_millis()
-// <i> Use a user-provided function to get uptime in milliseconds, otherwise Mongoose will default to using time(). Except for bare metal, Mongoose will use the time base for the configured architecture
-//#define MG_ENABLE_CUSTOM_MILLIS 1
-// </c>
-
-
-// <c1> Enable custom mg_rand()
-// <i> Use a user-provided function to generate random numbers, otherwise Mongoose will default to using rand()
-#define MG_ENABLE_CUSTOM_RANDOM 1
-// </c>
-
-
-// <h> Filesystem support
-// <q> Enable packed (embedded) filesystem
-#define MG_ENABLE_PACKED_FS 1
-// </h>
-
-
-// <<< end of configuration section >>>
-
-// Translate to Mongoose macros
-#if MG_CMSISPACK_ARCH == 1
-#undef MG_ARCH
-#define MG_ARCH MG_ARCH_FREERTOS
-#elif MG_CMSISPACK_ARCH == 2
-#undef MG_ARCH
-#define MG_ARCH MG_ARCH_CMSIS_RTOS1
-#elif MG_CMSISPACK_ARCH == 3
-#undef MG_ARCH
-#define MG_ARCH MG_ARCH_CMSIS_RTOS2
-#endif
-#if MG_CMSISPACK_NET == 0
-#define MG_ENABLE_TCPIP 1
-#elif MG_CMSISPACK_NET == 1
-#define MG_ENABLE_LWIP 1
-#elif MG_CMSISPACK_NET == 2
-#define MG_ENABLE_FREERTOS_TCP 1
-#elif MG_CMSISPACK_NET == 3
-#define MG_ENABLE_RL 1
-#endif
-
-
-// Add your customization below this comment
-
+// See https://mongoose.ws/documentation/#build-options
+#pragma once
+
+// <<< Use Configuration Wizard in Context Menu >>>
+
+// <o MG_ARCH> Build environment
+//   <MG_ARCH_ARMCC=> Keil MDK
+//   <MG_ARCH_FREERTOS=> FreeRTOS
+//   <MG_ARCH_CMSIS_RTOS1=> CMSIS-RTOS v1
+//   <MG_ARCH_CMSIS_RTOS2=> CMSIS-RTOS v2
+//   <MG_ARCH_NEWLIB=> ARM GCC + Newlib
+#define MG_ARCH MG_ARCH_FREERTOS
+
+// <q> Enable builtin TCP/IP stack
+#define MG_ENABLE_TCPIP 0
+
+// <h> Network Drivers for builtin TCP/IP stack
+// <q> Enable STM23Fxx Ethernet driver
+#define MG_ENABLE_DRIVER_STM32F 0
+
+// <q> Enable STM32Hxx Ethernet driver
+#define MG_ENABLE_DRIVER_STM32H 0
+
+// <q> Enable IMXRT Ethernet driver
+#define MG_ENABLE_DRIVER_IMXRT 0
+
+// <q> Enable W5500 Ethernet driver
+#define MG_ENABLE_DRIVER_W5500 0
+
+// <q> Enable TI TM4C Ethernet driver
+#define MG_ENABLE_DRIVER_TM4C 0
+
+// </h>
+
+// <o MG_TLS> TLS support
+//   <MG_TLS_NONE=> None
+//   <MG_TLS_BUILTIN=> Built-in TLS 1.3 stack
+//   <MG_TLS_MBED=> MbedTLS
+#define MG_TLS MG_TLS_NONE
+
+// <q> Enable custom mg_millis() 
+#define MG_ENABLE_CUSTOM_MILLIS 0
+
+// <q> Enable custom mg_random() 
+#define MG_ENABLE_CUSTOM_RANDOM 1
+
+// <q> Enable packed (embedded) filesystem
+#define MG_ENABLE_PACKED_FS 1
+
+// <<< end of configuration section >>>
+
+// Add your customization below this comment
+#define MG_ENABLE_FREERTOS_TCP 1
diff --git a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos/RTE/Network_Library/mongoose_custom.h b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos/RTE/Network_Library/mongoose_custom.h
index e3c9699e..390a6157 100644
--- a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos/RTE/Network_Library/mongoose_custom.h
+++ b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos/RTE/Network_Library/mongoose_custom.h
@@ -1,78 +1,53 @@
-
-// <<< Use Configuration Wizard in Context Menu >>>
-
-// <o> System Architecture
-//   <0=> Bare metal
-//   <1=> FreeRTOS
-//   <2=> CMSIS-RTOS v1
-//   <3=> CMSIS-RTOS v2
-// <i> Select either bare metal operation or a supported RTOS
-// <i> "FreeRTOS" uses direct FreeRTOS calls
-// <i> "CMSIS-RTOS v1" supports only Keil RTX through API v1
-// <i> "CMSIS-RTOS v2" supports Keil RTX5 and FreeRTOS through API v2
-
-#define MG_CMSISPACK_ARCH 1
-
-
-// <h> Networking support
-// <o> Networking stack
-//   <0=> Built-in
-//   <1=> lwIP
-//   <2=> FreeRTOS-Plus-TCP
-//   <3=> MDK (RL)
-// <i> Select the networking stack to use with Mongoose Library
-// <i> The built-in stack can run on bare metal or over any RTOS
-// <i> "lwIP" requires using an RTOS and BSD socket mode
-// <i> "MDK" requires using CMSIS-RTOS1 (RTX + RL) or CMSIS-RTOS2 (MDK Plus or Pro), and BSD socket mode
-#define MG_CMSISPACK_NET 0
-
-// <q> Use Mbed-TLS
-// <i> Mongoose will use Mbed-TLS calls for TLS-related functionality
-#define MG_ENABLE_MBEDTLS 0
-// </h>
-
-
-// <c1> Enable custom mg_millis()
-// <i> Use a user-provided function to get uptime in milliseconds, otherwise Mongoose will default to using time(). Except for bare metal, Mongoose will use the time base for the configured architecture
-//#define MG_ENABLE_CUSTOM_MILLIS 1
-// </c>
-
-
-// <c1> Enable custom mg_rand()
-// <i> Use a user-provided function to generate random numbers, otherwise Mongoose will default to using rand()
-#define MG_ENABLE_CUSTOM_RANDOM 1
-// </c>
-
-
-// <h> Filesystem support
-// <q> Enable packed (embedded) filesystem
-#define MG_ENABLE_PACKED_FS 1
-// </h>
-
-
-// <<< end of configuration section >>>
-
-// Translate to Mongoose macros
-#if MG_CMSISPACK_ARCH == 1
-#undef MG_ARCH
-#define MG_ARCH MG_ARCH_FREERTOS
-#elif MG_CMSISPACK_ARCH == 2
-#undef MG_ARCH
-#define MG_ARCH MG_ARCH_CMSIS_RTOS1
-#elif MG_CMSISPACK_ARCH == 3
-#undef MG_ARCH
-#define MG_ARCH MG_ARCH_CMSIS_RTOS2
-#endif
-#if MG_CMSISPACK_NET == 0
-#define MG_ENABLE_TCPIP 1
-#elif MG_CMSISPACK_NET == 1
-#define MG_ENABLE_LWIP 1
-#elif MG_CMSISPACK_NET == 2
-#define MG_ENABLE_FREERTOS_TCP 1
-#elif MG_CMSISPACK_NET == 3
-#define MG_ENABLE_RL 1
-#endif
-
-
-// Add your customization below this comment
-#define MG_ENABLE_DRIVER_STM32 1
+// See https://mongoose.ws/documentation/#build-options
+#pragma once
+
+// <<< Use Configuration Wizard in Context Menu >>>
+
+// <o MG_ARCH> Build environment
+//   <MG_ARCH_ARMCC=> Keil MDK
+//   <MG_ARCH_FREERTOS=> FreeRTOS
+//   <MG_ARCH_CMSIS_RTOS1=> CMSIS-RTOS v1
+//   <MG_ARCH_CMSIS_RTOS2=> CMSIS-RTOS v2
+//   <MG_ARCH_NEWLIB=> ARM GCC + Newlib
+#define MG_ARCH MG_ARCH_FREERTOS
+
+// <q> Enable builtin TCP/IP stack
+#define MG_ENABLE_TCPIP 1
+
+// <h> Network Drivers for builtin TCP/IP stack
+// <q> Enable STM23Fxx Ethernet driver
+#define MG_ENABLE_DRIVER_STM32F 1
+
+// <q> Enable STM32Hxx Ethernet driver
+#define MG_ENABLE_DRIVER_STM32H 0
+
+// <q> Enable IMXRT Ethernet driver
+#define MG_ENABLE_DRIVER_IMXRT 0
+
+// <q> Enable W5500 Ethernet driver
+#define MG_ENABLE_DRIVER_W5500 0
+
+// <q> Enable TI TM4C Ethernet driver
+#define MG_ENABLE_DRIVER_TM4C 0
+
+// </h>
+
+// <o MG_TLS> TLS support
+//   <MG_TLS_NONE=> None
+//   <MG_TLS_BUILTIN=> Built-in TLS 1.3 stack
+//   <MG_TLS_MBED=> MbedTLS
+#define MG_TLS MG_TLS_NONE
+
+// <q> Enable custom mg_millis() 
+#define MG_ENABLE_CUSTOM_MILLIS 0
+
+// <q> Enable custom mg_random() 
+#define MG_ENABLE_CUSTOM_RANDOM 1
+
+// <q> Enable packed (embedded) filesystem
+#define MG_ENABLE_PACKED_FS 1
+
+// <<< end of configuration section >>>
+
+// Add your customization below this comment
+
diff --git a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos_cmsis2-lwip/RTE/Network_Library/mongoose_custom.h b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos_cmsis2-lwip/RTE/Network_Library/mongoose_custom.h
index 36ad965e..b179d99a 100644
--- a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos_cmsis2-lwip/RTE/Network_Library/mongoose_custom.h
+++ b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos_cmsis2-lwip/RTE/Network_Library/mongoose_custom.h
@@ -1,78 +1,55 @@
-
-// <<< Use Configuration Wizard in Context Menu >>>
-
-// <o> System Architecture
-//   <0=> Bare metal
-//   <1=> FreeRTOS
-//   <2=> CMSIS-RTOS v1
-//   <3=> CMSIS-RTOS v2
-// <i> Select either bare metal operation or a supported RTOS
-// <i> "FreeRTOS" uses direct FreeRTOS calls
-// <i> "CMSIS-RTOS v1" supports only Keil RTX through API v1
-// <i> "CMSIS-RTOS v2" supports Keil RTX5 and FreeRTOS through API v2
-
-#define MG_CMSISPACK_ARCH 3
-
-
-// <h> Networking support
-// <o> Networking stack
-//   <0=> Built-in
-//   <1=> lwIP
-//   <2=> FreeRTOS-Plus-TCP
-//   <3=> MDK (RL)
-// <i> Select the networking stack to use with Mongoose Library
-// <i> The built-in stack can run on bare metal or over any RTOS
-// <i> "lwIP" requires using an RTOS and BSD socket mode
-// <i> "MDK" requires using CMSIS-RTOS1 (RTX + RL) or CMSIS-RTOS2 (MDK Plus or Pro), and BSD socket mode
-#define MG_CMSISPACK_NET 1
-
-// <q> Use Mbed-TLS
-// <i> Mongoose will use Mbed-TLS calls for TLS-related functionality
-#define MG_ENABLE_MBEDTLS 0
-// </h>
-
-
-// <c1> Enable custom mg_millis()
-// <i> Use a user-provided function to get uptime in milliseconds, otherwise Mongoose will default to using time(). Except for bare metal, Mongoose will use the time base for the configured architecture
-//#define MG_ENABLE_CUSTOM_MILLIS 1
-// </c>
-
-
-// <c1> Enable custom mg_rand()
-// <i> Use a user-provided function to generate random numbers, otherwise Mongoose will default to using rand()
-#define MG_ENABLE_CUSTOM_RANDOM 1
-// </c>
-
-
-// <h> Filesystem support
-// <q> Enable packed (embedded) filesystem
-#define MG_ENABLE_PACKED_FS 1
-// </h>
-
-
-// <<< end of configuration section >>>
-
-// Translate to Mongoose macros
-#if MG_CMSISPACK_ARCH == 1
-#undef MG_ARCH
-#define MG_ARCH MG_ARCH_FREERTOS
-#elif MG_CMSISPACK_ARCH == 2
-#undef MG_ARCH
-#define MG_ARCH MG_ARCH_CMSIS_RTOS1
-#elif MG_CMSISPACK_ARCH == 3
-#undef MG_ARCH
-#define MG_ARCH MG_ARCH_CMSIS_RTOS2
-#endif
-#if MG_CMSISPACK_NET == 0
-#define MG_ENABLE_TCPIP 1
-#elif MG_CMSISPACK_NET == 1
-#define MG_ENABLE_LWIP 1
-#elif MG_CMSISPACK_NET == 2
-#define MG_ENABLE_FREERTOS_TCP 1
-#elif MG_CMSISPACK_NET == 3
-#define MG_ENABLE_RL 1
-#endif
-
-
-// Add your customization below this comment
-
+// See https://mongoose.ws/documentation/#build-options
+#pragma once
+
+// <<< Use Configuration Wizard in Context Menu >>>
+
+// <o MG_ARCH> Build environment
+//   <MG_ARCH_ARMCC=> Keil MDK
+//   <MG_ARCH_FREERTOS=> FreeRTOS
+//   <MG_ARCH_CMSIS_RTOS1=> CMSIS-RTOS v1
+//   <MG_ARCH_CMSIS_RTOS2=> CMSIS-RTOS v2
+//   <MG_ARCH_NEWLIB=> ARM GCC + Newlib
+#define MG_ARCH MG_ARCH_CMSIS_RTOS2
+
+// <q> Enable builtin TCP/IP stack
+#define MG_ENABLE_TCPIP 0
+
+// <h> Network Drivers for builtin TCP/IP stack
+// <q> Enable STM23Fxx Ethernet driver
+#define MG_ENABLE_DRIVER_STM32F 0
+
+// <q> Enable STM32Hxx Ethernet driver
+#define MG_ENABLE_DRIVER_STM32H 0
+
+// <q> Enable IMXRT Ethernet driver
+#define MG_ENABLE_DRIVER_IMXRT 0
+
+// <q> Enable W5500 Ethernet driver
+#define MG_ENABLE_DRIVER_W5500 0
+
+// <q> Enable TI TM4C Ethernet driver
+#define MG_ENABLE_DRIVER_TM4C 0
+
+// </h>
+
+// <o MG_TLS> TLS support
+//   <MG_TLS_NONE=> None
+//   <MG_TLS_BUILTIN=> Built-in TLS 1.3 stack
+//   <MG_TLS_MBED=> MbedTLS
+#define MG_TLS MG_TLS_NONE
+
+// <q> Enable custom mg_millis() 
+#define MG_ENABLE_CUSTOM_MILLIS 0
+
+// <q> Enable custom mg_random() 
+#define MG_ENABLE_CUSTOM_RANDOM 1
+
+// <q> Enable packed (embedded) filesystem
+#define MG_ENABLE_PACKED_FS 1
+
+// <<< end of configuration section >>>
+
+// Add your customization below this comment
+#define MG_ENABLE_LWIP 1
+
+
diff --git a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos_cmsis2/RTE/Network_Library/mongoose_custom.h b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos_cmsis2/RTE/Network_Library/mongoose_custom.h
index 1e4be822..26fb7071 100644
--- a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos_cmsis2/RTE/Network_Library/mongoose_custom.h
+++ b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-freertos_cmsis2/RTE/Network_Library/mongoose_custom.h
@@ -1,78 +1,53 @@
-
-// <<< Use Configuration Wizard in Context Menu >>>
-
-// <o> System Architecture
-//   <0=> Bare metal
-//   <1=> FreeRTOS
-//   <2=> CMSIS-RTOS v1
-//   <3=> CMSIS-RTOS v2
-// <i> Select either bare metal operation or a supported RTOS
-// <i> "FreeRTOS" uses direct FreeRTOS calls
-// <i> "CMSIS-RTOS v1" supports only Keil RTX through API v1
-// <i> "CMSIS-RTOS v2" supports Keil RTX5 and FreeRTOS through API v2
-
-#define MG_CMSISPACK_ARCH 3
-
-
-// <h> Networking support
-// <o> Networking stack
-//   <0=> Built-in
-//   <1=> lwIP
-//   <2=> FreeRTOS-Plus-TCP
-//   <3=> MDK (RL)
-// <i> Select the networking stack to use with Mongoose Library
-// <i> The built-in stack can run on bare metal or over any RTOS
-// <i> "lwIP" requires using an RTOS and BSD socket mode
-// <i> "MDK" requires using CMSIS-RTOS1 (RTX + RL) or CMSIS-RTOS2 (MDK Plus or Pro), and BSD socket mode
-#define MG_CMSISPACK_NET 0
-
-// <q> Use Mbed-TLS
-// <i> Mongoose will use Mbed-TLS calls for TLS-related functionality
-#define MG_ENABLE_MBEDTLS 0
-// </h>
-
-
-// <c1> Enable custom mg_millis()
-// <i> Use a user-provided function to get uptime in milliseconds, otherwise Mongoose will default to using time(). Except for bare metal, Mongoose will use the time base for the configured architecture
-//#define MG_ENABLE_CUSTOM_MILLIS 1
-// </c>
-
-
-// <c1> Enable custom mg_rand()
-// <i> Use a user-provided function to generate random numbers, otherwise Mongoose will default to using rand()
-#define MG_ENABLE_CUSTOM_RANDOM 1
-// </c>
-
-
-// <h> Filesystem support
-// <q> Enable packed (embedded) filesystem
-#define MG_ENABLE_PACKED_FS 1
-// </h>
-
-
-// <<< end of configuration section >>>
-
-// Translate to Mongoose macros
-#if MG_CMSISPACK_ARCH == 1
-#undef MG_ARCH
-#define MG_ARCH MG_ARCH_FREERTOS
-#elif MG_CMSISPACK_ARCH == 2
-#undef MG_ARCH
-#define MG_ARCH MG_ARCH_CMSIS_RTOS1
-#elif MG_CMSISPACK_ARCH == 3
-#undef MG_ARCH
-#define MG_ARCH MG_ARCH_CMSIS_RTOS2
-#endif
-#if MG_CMSISPACK_NET == 0
-#define MG_ENABLE_TCPIP 1
-#elif MG_CMSISPACK_NET == 1
-#define MG_ENABLE_LWIP 1
-#elif MG_CMSISPACK_NET == 2
-#define MG_ENABLE_FREERTOS_TCP 1
-#elif MG_CMSISPACK_NET == 3
-#define MG_ENABLE_RL 1
-#endif
-
-
-// Add your customization below this comment
-#define MG_ENABLE_DRIVER_STM32 1
+// See https://mongoose.ws/documentation/#build-options
+#pragma once
+
+// <<< Use Configuration Wizard in Context Menu >>>
+
+// <o MG_ARCH> Build environment
+//   <MG_ARCH_ARMCC=> Keil MDK
+//   <MG_ARCH_FREERTOS=> FreeRTOS
+//   <MG_ARCH_CMSIS_RTOS1=> CMSIS-RTOS v1
+//   <MG_ARCH_CMSIS_RTOS2=> CMSIS-RTOS v2
+//   <MG_ARCH_NEWLIB=> ARM GCC + Newlib
+#define MG_ARCH MG_ARCH_CMSIS_RTOS2
+
+// <q> Enable builtin TCP/IP stack
+#define MG_ENABLE_TCPIP 1
+
+// <h> Network Drivers for builtin TCP/IP stack
+// <q> Enable STM23Fxx Ethernet driver
+#define MG_ENABLE_DRIVER_STM32F 1
+
+// <q> Enable STM32Hxx Ethernet driver
+#define MG_ENABLE_DRIVER_STM32H 0
+
+// <q> Enable IMXRT Ethernet driver
+#define MG_ENABLE_DRIVER_IMXRT 0
+
+// <q> Enable W5500 Ethernet driver
+#define MG_ENABLE_DRIVER_W5500 0
+
+// <q> Enable TI TM4C Ethernet driver
+#define MG_ENABLE_DRIVER_TM4C 0
+
+// </h>
+
+// <o MG_TLS> TLS support
+//   <MG_TLS_NONE=> None
+//   <MG_TLS_BUILTIN=> Built-in TLS 1.3 stack
+//   <MG_TLS_MBED=> MbedTLS
+#define MG_TLS MG_TLS_NONE
+
+// <q> Enable custom mg_millis() 
+#define MG_ENABLE_CUSTOM_MILLIS 0
+
+// <q> Enable custom mg_random() 
+#define MG_ENABLE_CUSTOM_RANDOM 1
+
+// <q> Enable packed (embedded) filesystem
+#define MG_ENABLE_PACKED_FS 1
+
+// <<< end of configuration section >>>
+
+// Add your customization below this comment
+
diff --git a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx-mdk/RTE/Network_Library/mongoose_custom.h b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx-mdk/RTE/Network_Library/mongoose_custom.h
index 17d6b1e8..964ab129 100644
--- a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx-mdk/RTE/Network_Library/mongoose_custom.h
+++ b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx-mdk/RTE/Network_Library/mongoose_custom.h
@@ -1,78 +1,54 @@
-
-// <<< Use Configuration Wizard in Context Menu >>>
-
-// <o> System Architecture
-//   <0=> Bare metal
-//   <1=> FreeRTOS
-//   <2=> CMSIS-RTOS v1
-//   <3=> CMSIS-RTOS v2
-// <i> Select either bare metal operation or a supported RTOS
-// <i> "FreeRTOS" uses direct FreeRTOS calls
-// <i> "CMSIS-RTOS v1" supports only Keil RTX through API v1
-// <i> "CMSIS-RTOS v2" supports Keil RTX5 and FreeRTOS through API v2
-
-#define MG_CMSISPACK_ARCH 2
-
-
-// <h> Networking support
-// <o> Networking stack
-//   <0=> Built-in
-//   <1=> lwIP
-//   <2=> FreeRTOS-Plus-TCP
-//   <3=> MDK (RL)
-// <i> Select the networking stack to use with Mongoose Library
-// <i> The built-in stack can run on bare metal or over any RTOS
-// <i> "lwIP" requires using an RTOS and BSD socket mode
-// <i> "MDK" requires using CMSIS-RTOS1 (RTX + RL) or CMSIS-RTOS2 (MDK Plus or Pro), and BSD socket mode
-#define MG_CMSISPACK_NET 3
-
-// <q> Use Mbed-TLS
-// <i> Mongoose will use Mbed-TLS calls for TLS-related functionality
-#define MG_ENABLE_MBEDTLS 0
-// </h>
-
-
-// <c1> Enable custom mg_millis()
-// <i> Use a user-provided function to get uptime in milliseconds, otherwise Mongoose will default to using time(). Except for bare metal, Mongoose will use the time base for the configured architecture
-//#define MG_ENABLE_CUSTOM_MILLIS 1
-// </c>
-
-
-// <c1> Enable custom mg_rand()
-// <i> Use a user-provided function to generate random numbers, otherwise Mongoose will default to using rand()
-#define MG_ENABLE_CUSTOM_RANDOM 1
-// </c>
-
-
-// <h> Filesystem support
-// <q> Enable packed (embedded) filesystem
-#define MG_ENABLE_PACKED_FS 1
-// </h>
-
-
-// <<< end of configuration section >>>
-
-// Translate to Mongoose macros
-#if MG_CMSISPACK_ARCH == 1
-#undef MG_ARCH
-#define MG_ARCH MG_ARCH_FREERTOS
-#elif MG_CMSISPACK_ARCH == 2
-#undef MG_ARCH
-#define MG_ARCH MG_ARCH_CMSIS_RTOS1
-#elif MG_CMSISPACK_ARCH == 3
-#undef MG_ARCH
-#define MG_ARCH MG_ARCH_CMSIS_RTOS2
-#endif
-#if MG_CMSISPACK_NET == 0
-#define MG_ENABLE_TCPIP 1
-#elif MG_CMSISPACK_NET == 1
-#define MG_ENABLE_LWIP 1
-#elif MG_CMSISPACK_NET == 2
-#define MG_ENABLE_FREERTOS_TCP 1
-#elif MG_CMSISPACK_NET == 3
-#define MG_ENABLE_RL 1
-#endif
-
-
-// Add your customization below this comment
-
+// See https://mongoose.ws/documentation/#build-options
+#pragma once
+
+// <<< Use Configuration Wizard in Context Menu >>>
+
+// <o MG_ARCH> Build environment
+//   <MG_ARCH_ARMCC=> Keil MDK
+//   <MG_ARCH_FREERTOS=> FreeRTOS
+//   <MG_ARCH_CMSIS_RTOS1=> CMSIS-RTOS v1
+//   <MG_ARCH_CMSIS_RTOS2=> CMSIS-RTOS v2
+//   <MG_ARCH_NEWLIB=> ARM GCC + Newlib
+#define MG_ARCH MG_ARCH_CMSIS_RTOS1
+
+// <q> Enable builtin TCP/IP stack
+#define MG_ENABLE_TCPIP 0
+
+// <h> Network Drivers for builtin TCP/IP stack
+// <q> Enable STM23Fxx Ethernet driver
+#define MG_ENABLE_DRIVER_STM32F 0
+
+// <q> Enable STM32Hxx Ethernet driver
+#define MG_ENABLE_DRIVER_STM32H 0
+
+// <q> Enable IMXRT Ethernet driver
+#define MG_ENABLE_DRIVER_IMXRT 0
+
+// <q> Enable W5500 Ethernet driver
+#define MG_ENABLE_DRIVER_W5500 0
+
+// <q> Enable TI TM4C Ethernet driver
+#define MG_ENABLE_DRIVER_TM4C 0
+
+// </h>
+
+// <o MG_TLS> TLS support
+//   <MG_TLS_NONE=> None
+//   <MG_TLS_BUILTIN=> Built-in TLS 1.3 stack
+//   <MG_TLS_MBED=> MbedTLS
+#define MG_TLS MG_TLS_NONE
+
+// <q> Enable custom mg_millis() 
+#define MG_ENABLE_CUSTOM_MILLIS 0
+
+// <q> Enable custom mg_random() 
+#define MG_ENABLE_CUSTOM_RANDOM 1
+
+// <q> Enable packed (embedded) filesystem
+#define MG_ENABLE_PACKED_FS 1
+
+// <<< end of configuration section >>>
+
+// Add your customization below this comment
+#define MG_ENABLE_RL 1
+
diff --git a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx/RTE/Network_Library/mongoose_custom.h b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx/RTE/Network_Library/mongoose_custom.h
index 2ba2d34b..e5a681c1 100644
--- a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx/RTE/Network_Library/mongoose_custom.h
+++ b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx/RTE/Network_Library/mongoose_custom.h
@@ -1,78 +1,53 @@
-
-// <<< Use Configuration Wizard in Context Menu >>>
-
-// <o> System Architecture
-//   <0=> Bare metal
-//   <1=> FreeRTOS
-//   <2=> CMSIS-RTOS v1
-//   <3=> CMSIS-RTOS v2
-// <i> Select either bare metal operation or a supported RTOS
-// <i> FreeRTOS uses direct FreeRTOS calls
-// <i> CMSIS-RTOS1 supports only Keil RTX through API v1
-// <i> CMSIS-RTOS2 supports Keil RTX5 and FreeRTOS through API v2
-
-#define MG_CMSISPACK_ARCH 2
-
-
-// <h> Networking support
-// <o> Networking stack
-//   <0=> Built-in
-//   <1=> lwIP
-//   <2=> FreeRTOS-Plus-TCP
-//   <3=> MDK (RL)
-// <i> Select the networking stack to use with Mongoose Library
-// <i> The built-in stack can run on bare metal or over any RTOS
-// <i> "lwIP" requires using an RTOS and BSD socket mode
-// <i> "MDK" requires using CMSIS-RTOS1 (RTX + RL) or CMSIS-RTOS2 (MDK Plus or Pro), and BSD socket mode
-#define MG_CMSISPACK_NET 0
-
-// <q> Use Mbed-TLS
-// <i> Mongoose will use Mbed-TLS calls for TLS-related functionality
-#define MG_ENABLE_MBEDTLS 0
-// </h>
-
-
-// <c1> Enable custom mg_millis()
-// <i> Use a user-provided function to get uptime in milliseconds, otherwise Mongoose will default to using time(). Except for bare metal, Mongoose will use the time base for the configured architecture
-//#define MG_ENABLE_CUSTOM_MILLIS 1
-// </c>
-
-
-// <c1> Enable custom mg_rand()
-// <i> Use a user-provided function to generate random numbers, otherwise Mongoose will default to using rand()
-#define MG_ENABLE_CUSTOM_RANDOM 1
-// </c>
-
-
-// <h> Filesystem support
-// <q> Enable packed (embedded) filesystem
-#define MG_ENABLE_PACKED_FS 1
-// </h>
-
-
-// <<< end of configuration section >>>
-
-// Translate to Mongoose macros
-#if MG_CMSISPACK_ARCH == 1
-#undef MG_ARCH
-#define MG_ARCH MG_ARCH_FREERTOS
-#elif MG_CMSISPACK_ARCH == 2
-#undef MG_ARCH
-#define MG_ARCH MG_ARCH_CMSIS_RTOS1
-#elif MG_CMSISPACK_ARCH == 3
-#undef MG_ARCH
-#define MG_ARCH MG_ARCH_CMSIS_RTOS2
-#endif
-#if MG_CMSISPACK_NET == 0
-#define MG_ENABLE_TCPIP 1
-#elif MG_CMSISPACK_NET == 1
-#define MG_ENABLE_LWIP 1
-#elif MG_CMSISPACK_NET == 2
-#define MG_ENABLE_FREERTOS_TCP 1
-#elif MG_CMSISPACK_NET == 3
-#define MG_ENABLE_RL 1
-#endif
-
-
-// Add your customization below this comment
-#define MG_ENABLE_DRIVER_STM32 1
+// See https://mongoose.ws/documentation/#build-options
+#pragma once
+
+// <<< Use Configuration Wizard in Context Menu >>>
+
+// <o MG_ARCH> Build environment
+//   <MG_ARCH_ARMCC=> Keil MDK
+//   <MG_ARCH_FREERTOS=> FreeRTOS
+//   <MG_ARCH_CMSIS_RTOS1=> CMSIS-RTOS v1
+//   <MG_ARCH_CMSIS_RTOS2=> CMSIS-RTOS v2
+//   <MG_ARCH_NEWLIB=> ARM GCC + Newlib
+#define MG_ARCH MG_ARCH_CMSIS_RTOS1
+
+// <q> Enable builtin TCP/IP stack
+#define MG_ENABLE_TCPIP 1
+
+// <h> Network Drivers for builtin TCP/IP stack
+// <q> Enable STM23Fxx Ethernet driver
+#define MG_ENABLE_DRIVER_STM32F 1
+
+// <q> Enable STM32Hxx Ethernet driver
+#define MG_ENABLE_DRIVER_STM32H 0
+
+// <q> Enable IMXRT Ethernet driver
+#define MG_ENABLE_DRIVER_IMXRT 0
+
+// <q> Enable W5500 Ethernet driver
+#define MG_ENABLE_DRIVER_W5500 0
+
+// <q> Enable TI TM4C Ethernet driver
+#define MG_ENABLE_DRIVER_TM4C 0
+
+// </h>
+
+// <o MG_TLS> TLS support
+//   <MG_TLS_NONE=> None
+//   <MG_TLS_BUILTIN=> Built-in TLS 1.3 stack
+//   <MG_TLS_MBED=> MbedTLS
+#define MG_TLS MG_TLS_NONE
+
+// <q> Enable custom mg_millis() 
+#define MG_ENABLE_CUSTOM_MILLIS 0
+
+// <q> Enable custom mg_random() 
+#define MG_ENABLE_CUSTOM_RANDOM 1
+
+// <q> Enable packed (embedded) filesystem
+#define MG_ENABLE_PACKED_FS 1
+
+// <<< end of configuration section >>>
+
+// Add your customization below this comment
+
diff --git a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx5-lwip/RTE/Network_Library/mongoose_custom.h b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx5-lwip/RTE/Network_Library/mongoose_custom.h
index 36ad965e..46cde88f 100644
--- a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx5-lwip/RTE/Network_Library/mongoose_custom.h
+++ b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx5-lwip/RTE/Network_Library/mongoose_custom.h
@@ -1,78 +1,54 @@
-
-// <<< Use Configuration Wizard in Context Menu >>>
-
-// <o> System Architecture
-//   <0=> Bare metal
-//   <1=> FreeRTOS
-//   <2=> CMSIS-RTOS v1
-//   <3=> CMSIS-RTOS v2
-// <i> Select either bare metal operation or a supported RTOS
-// <i> "FreeRTOS" uses direct FreeRTOS calls
-// <i> "CMSIS-RTOS v1" supports only Keil RTX through API v1
-// <i> "CMSIS-RTOS v2" supports Keil RTX5 and FreeRTOS through API v2
-
-#define MG_CMSISPACK_ARCH 3
-
-
-// <h> Networking support
-// <o> Networking stack
-//   <0=> Built-in
-//   <1=> lwIP
-//   <2=> FreeRTOS-Plus-TCP
-//   <3=> MDK (RL)
-// <i> Select the networking stack to use with Mongoose Library
-// <i> The built-in stack can run on bare metal or over any RTOS
-// <i> "lwIP" requires using an RTOS and BSD socket mode
-// <i> "MDK" requires using CMSIS-RTOS1 (RTX + RL) or CMSIS-RTOS2 (MDK Plus or Pro), and BSD socket mode
-#define MG_CMSISPACK_NET 1
-
-// <q> Use Mbed-TLS
-// <i> Mongoose will use Mbed-TLS calls for TLS-related functionality
-#define MG_ENABLE_MBEDTLS 0
-// </h>
-
-
-// <c1> Enable custom mg_millis()
-// <i> Use a user-provided function to get uptime in milliseconds, otherwise Mongoose will default to using time(). Except for bare metal, Mongoose will use the time base for the configured architecture
-//#define MG_ENABLE_CUSTOM_MILLIS 1
-// </c>
-
-
-// <c1> Enable custom mg_rand()
-// <i> Use a user-provided function to generate random numbers, otherwise Mongoose will default to using rand()
-#define MG_ENABLE_CUSTOM_RANDOM 1
-// </c>
-
-
-// <h> Filesystem support
-// <q> Enable packed (embedded) filesystem
-#define MG_ENABLE_PACKED_FS 1
-// </h>
-
-
-// <<< end of configuration section >>>
-
-// Translate to Mongoose macros
-#if MG_CMSISPACK_ARCH == 1
-#undef MG_ARCH
-#define MG_ARCH MG_ARCH_FREERTOS
-#elif MG_CMSISPACK_ARCH == 2
-#undef MG_ARCH
-#define MG_ARCH MG_ARCH_CMSIS_RTOS1
-#elif MG_CMSISPACK_ARCH == 3
-#undef MG_ARCH
-#define MG_ARCH MG_ARCH_CMSIS_RTOS2
-#endif
-#if MG_CMSISPACK_NET == 0
-#define MG_ENABLE_TCPIP 1
-#elif MG_CMSISPACK_NET == 1
-#define MG_ENABLE_LWIP 1
-#elif MG_CMSISPACK_NET == 2
-#define MG_ENABLE_FREERTOS_TCP 1
-#elif MG_CMSISPACK_NET == 3
-#define MG_ENABLE_RL 1
-#endif
-
-
-// Add your customization below this comment
-
+// See https://mongoose.ws/documentation/#build-options
+#pragma once
+
+// <<< Use Configuration Wizard in Context Menu >>>
+
+// <o MG_ARCH> Build environment
+//   <MG_ARCH_ARMCC=> Keil MDK
+//   <MG_ARCH_FREERTOS=> FreeRTOS
+//   <MG_ARCH_CMSIS_RTOS1=> CMSIS-RTOS v1
+//   <MG_ARCH_CMSIS_RTOS2=> CMSIS-RTOS v2
+//   <MG_ARCH_NEWLIB=> ARM GCC + Newlib
+#define MG_ARCH MG_ARCH_CMSIS_RTOS2
+
+// <q> Enable builtin TCP/IP stack
+#define MG_ENABLE_TCPIP 0
+
+// <h> Network Drivers for builtin TCP/IP stack
+// <q> Enable STM23Fxx Ethernet driver
+#define MG_ENABLE_DRIVER_STM32F 0
+
+// <q> Enable STM32Hxx Ethernet driver
+#define MG_ENABLE_DRIVER_STM32H 0
+
+// <q> Enable IMXRT Ethernet driver
+#define MG_ENABLE_DRIVER_IMXRT 0
+
+// <q> Enable W5500 Ethernet driver
+#define MG_ENABLE_DRIVER_W5500 0
+
+// <q> Enable TI TM4C Ethernet driver
+#define MG_ENABLE_DRIVER_TM4C 0
+
+// </h>
+
+// <o MG_TLS> TLS support
+//   <MG_TLS_NONE=> None
+//   <MG_TLS_BUILTIN=> Built-in TLS 1.3 stack
+//   <MG_TLS_MBED=> MbedTLS
+#define MG_TLS MG_TLS_NONE
+
+// <q> Enable custom mg_millis() 
+#define MG_ENABLE_CUSTOM_MILLIS 0
+
+// <q> Enable custom mg_random() 
+#define MG_ENABLE_CUSTOM_RANDOM 1
+
+// <q> Enable packed (embedded) filesystem
+#define MG_ENABLE_PACKED_FS 1
+
+// <<< end of configuration section >>>
+
+// Add your customization below this comment
+#define MG_ENABLE_LWIP 1
+
diff --git a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx5-mdk/RTE/Network_Library/mongoose_custom.h b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx5-mdk/RTE/Network_Library/mongoose_custom.h
index e1100688..34800f75 100644
--- a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx5-mdk/RTE/Network_Library/mongoose_custom.h
+++ b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx5-mdk/RTE/Network_Library/mongoose_custom.h
@@ -1,78 +1,54 @@
-
-// <<< Use Configuration Wizard in Context Menu >>>
-
-// <o> System Architecture
-//   <0=> Bare metal
-//   <1=> FreeRTOS
-//   <2=> CMSIS-RTOS v1
-//   <3=> CMSIS-RTOS v2
-// <i> Select either bare metal operation or a supported RTOS
-// <i> "FreeRTOS" uses direct FreeRTOS calls
-// <i> "CMSIS-RTOS v1" supports only Keil RTX through API v1
-// <i> "CMSIS-RTOS v2" supports Keil RTX5 and FreeRTOS through API v2
-
-#define MG_CMSISPACK_ARCH 3
-
-
-// <h> Networking support
-// <o> Networking stack
-//   <0=> Built-in
-//   <1=> lwIP
-//   <2=> FreeRTOS-Plus-TCP
-//   <3=> MDK (RL)
-// <i> Select the networking stack to use with Mongoose Library
-// <i> The built-in stack can run on bare metal or over any RTOS
-// <i> "lwIP" requires using an RTOS and BSD socket mode
-// <i> "MDK" requires using CMSIS-RTOS1 (RTX + RL) or CMSIS-RTOS2 (MDK Plus or Pro), and BSD socket mode
-#define MG_CMSISPACK_NET 3
-
-// <q> Use Mbed-TLS
-// <i> Mongoose will use Mbed-TLS calls for TLS-related functionality
-#define MG_ENABLE_MBEDTLS 0
-// </h>
-
-
-// <c1> Enable custom mg_millis()
-// <i> Use a user-provided function to get uptime in milliseconds, otherwise Mongoose will default to using time(). Except for bare metal, Mongoose will use the time base for the configured architecture
-//#define MG_ENABLE_CUSTOM_MILLIS 1
-// </c>
-
-
-// <c1> Enable custom mg_rand()
-// <i> Use a user-provided function to generate random numbers, otherwise Mongoose will default to using rand()
-#define MG_ENABLE_CUSTOM_RANDOM 1
-// </c>
-
-
-// <h> Filesystem support
-// <q> Enable packed (embedded) filesystem
-#define MG_ENABLE_PACKED_FS 1
-// </h>
-
-
-// <<< end of configuration section >>>
-
-// Translate to Mongoose macros
-#if MG_CMSISPACK_ARCH == 1
-#undef MG_ARCH
-#define MG_ARCH MG_ARCH_FREERTOS
-#elif MG_CMSISPACK_ARCH == 2
-#undef MG_ARCH
-#define MG_ARCH MG_ARCH_CMSIS_RTOS1
-#elif MG_CMSISPACK_ARCH == 3
-#undef MG_ARCH
-#define MG_ARCH MG_ARCH_CMSIS_RTOS2
-#endif
-#if MG_CMSISPACK_NET == 0
-#define MG_ENABLE_TCPIP 1
-#elif MG_CMSISPACK_NET == 1
-#define MG_ENABLE_LWIP 1
-#elif MG_CMSISPACK_NET == 2
-#define MG_ENABLE_FREERTOS_TCP 1
-#elif MG_CMSISPACK_NET == 3
-#define MG_ENABLE_RL 1
-#endif
-
-
-// Add your customization below this comment
-
+// See https://mongoose.ws/documentation/#build-options
+#pragma once
+
+// <<< Use Configuration Wizard in Context Menu >>>
+
+// <o MG_ARCH> Build environment
+//   <MG_ARCH_ARMCC=> Keil MDK
+//   <MG_ARCH_FREERTOS=> FreeRTOS
+//   <MG_ARCH_CMSIS_RTOS1=> CMSIS-RTOS v1
+//   <MG_ARCH_CMSIS_RTOS2=> CMSIS-RTOS v2
+//   <MG_ARCH_NEWLIB=> ARM GCC + Newlib
+#define MG_ARCH MG_ARCH_CMSIS_RTOS2
+
+// <q> Enable builtin TCP/IP stack
+#define MG_ENABLE_TCPIP 0
+
+// <h> Network Drivers for builtin TCP/IP stack
+// <q> Enable STM23Fxx Ethernet driver
+#define MG_ENABLE_DRIVER_STM32F 0
+
+// <q> Enable STM32Hxx Ethernet driver
+#define MG_ENABLE_DRIVER_STM32H 0
+
+// <q> Enable IMXRT Ethernet driver
+#define MG_ENABLE_DRIVER_IMXRT 0
+
+// <q> Enable W5500 Ethernet driver
+#define MG_ENABLE_DRIVER_W5500 0
+
+// <q> Enable TI TM4C Ethernet driver
+#define MG_ENABLE_DRIVER_TM4C 0
+
+// </h>
+
+// <o MG_TLS> TLS support
+//   <MG_TLS_NONE=> None
+//   <MG_TLS_BUILTIN=> Built-in TLS 1.3 stack
+//   <MG_TLS_MBED=> MbedTLS
+#define MG_TLS MG_TLS_NONE
+
+// <q> Enable custom mg_millis() 
+#define MG_ENABLE_CUSTOM_MILLIS 0
+
+// <q> Enable custom mg_random() 
+#define MG_ENABLE_CUSTOM_RANDOM 1
+
+// <q> Enable packed (embedded) filesystem
+#define MG_ENABLE_PACKED_FS 1
+
+// <<< end of configuration section >>>
+
+// Add your customization below this comment
+#define MG_ENABLE_RL 1
+
diff --git a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx5/RTE/Network_Library/mongoose_custom.h b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx5/RTE/Network_Library/mongoose_custom.h
index 977bb5a6..26fb7071 100644
--- a/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx5/RTE/Network_Library/mongoose_custom.h
+++ b/extra/cmsis-pack/Boards/ST/NUCLEO-F746ZG/nucleo-f746zg-keil-rtx5/RTE/Network_Library/mongoose_custom.h
@@ -1,78 +1,53 @@
-
-// <<< Use Configuration Wizard in Context Menu >>>
-
-// <o> System Architecture
-//   <0=> Bare metal
-//   <1=> FreeRTOS
-//   <2=> CMSIS-RTOS v1
-//   <3=> CMSIS-RTOS v2
-// <i> Select either bare metal operation or a supported RTOS
-// <i> FreeRTOS uses direct FreeRTOS calls
-// <i> CMSIS-RTOS1 supports only Keil RTX through API v1
-// <i> CMSIS-RTOS2 supports Keil RTX5 and FreeRTOS through API v2
-
-#define MG_CMSISPACK_ARCH 3
-
-
-// <h> Networking support
-// <o> Networking stack
-//   <0=> Built-in
-//   <1=> lwIP
-//   <2=> FreeRTOS-Plus-TCP
-//   <3=> MDK (RL)
-// <i> Select the networking stack to use with Mongoose Library
-// <i> The built-in stack can run on bare metal or over any RTOS
-// <i> "lwIP" requires using an RTOS and BSD socket mode
-// <i> "MDK" requires using CMSIS-RTOS1 (RTX + RL) or CMSIS-RTOS2 (MDK Plus or Pro), and BSD socket mode
-#define MG_CMSISPACK_NET 0
-
-// <q> Use Mbed-TLS
-// <i> Mongoose will use Mbed-TLS calls for TLS-related functionality
-#define MG_ENABLE_MBEDTLS 0
-// </h>
-
-
-// <c1> Enable custom mg_millis()
-// <i> Use a user-provided function to get uptime in milliseconds, otherwise Mongoose will default to using time(). Except for bare metal, Mongoose will use the time base for the configured architecture
-//#define MG_ENABLE_CUSTOM_MILLIS 1
-// </c>
-
-
-// <c1> Enable custom mg_rand()
-// <i> Use a user-provided function to generate random numbers, otherwise Mongoose will default to using rand()
-#define MG_ENABLE_CUSTOM_RANDOM 1
-// </c>
-
-
-// <h> Filesystem support
-// <q> Enable packed (embedded) filesystem
-#define MG_ENABLE_PACKED_FS 1
-// </h>
-
-
-// <<< end of configuration section >>>
-
-// Translate to Mongoose macros
-#if MG_CMSISPACK_ARCH == 1
-#undef MG_ARCH
-#define MG_ARCH MG_ARCH_FREERTOS
-#elif MG_CMSISPACK_ARCH == 2
-#undef MG_ARCH
-#define MG_ARCH MG_ARCH_CMSIS_RTOS1
-#elif MG_CMSISPACK_ARCH == 3
-#undef MG_ARCH
-#define MG_ARCH MG_ARCH_CMSIS_RTOS2
-#endif
-#if MG_CMSISPACK_NET == 0
-#define MG_ENABLE_TCPIP 1
-#elif MG_CMSISPACK_NET == 1
-#define MG_ENABLE_LWIP 1
-#elif MG_CMSISPACK_NET == 2
-#define MG_ENABLE_FREERTOS_TCP 1
-#elif MG_CMSISPACK_NET == 3
-#define MG_ENABLE_RL 1
-#endif
-
-
-// Add your customization below this comment
-#define MG_ENABLE_DRIVER_STM32 1
+// See https://mongoose.ws/documentation/#build-options
+#pragma once
+
+// <<< Use Configuration Wizard in Context Menu >>>
+
+// <o MG_ARCH> Build environment
+//   <MG_ARCH_ARMCC=> Keil MDK
+//   <MG_ARCH_FREERTOS=> FreeRTOS
+//   <MG_ARCH_CMSIS_RTOS1=> CMSIS-RTOS v1
+//   <MG_ARCH_CMSIS_RTOS2=> CMSIS-RTOS v2
+//   <MG_ARCH_NEWLIB=> ARM GCC + Newlib
+#define MG_ARCH MG_ARCH_CMSIS_RTOS2
+
+// <q> Enable builtin TCP/IP stack
+#define MG_ENABLE_TCPIP 1
+
+// <h> Network Drivers for builtin TCP/IP stack
+// <q> Enable STM23Fxx Ethernet driver
+#define MG_ENABLE_DRIVER_STM32F 1
+
+// <q> Enable STM32Hxx Ethernet driver
+#define MG_ENABLE_DRIVER_STM32H 0
+
+// <q> Enable IMXRT Ethernet driver
+#define MG_ENABLE_DRIVER_IMXRT 0
+
+// <q> Enable W5500 Ethernet driver
+#define MG_ENABLE_DRIVER_W5500 0
+
+// <q> Enable TI TM4C Ethernet driver
+#define MG_ENABLE_DRIVER_TM4C 0
+
+// </h>
+
+// <o MG_TLS> TLS support
+//   <MG_TLS_NONE=> None
+//   <MG_TLS_BUILTIN=> Built-in TLS 1.3 stack
+//   <MG_TLS_MBED=> MbedTLS
+#define MG_TLS MG_TLS_NONE
+
+// <q> Enable custom mg_millis() 
+#define MG_ENABLE_CUSTOM_MILLIS 0
+
+// <q> Enable custom mg_random() 
+#define MG_ENABLE_CUSTOM_RANDOM 1
+
+// <q> Enable packed (embedded) filesystem
+#define MG_ENABLE_PACKED_FS 1
+
+// <<< end of configuration section >>>
+
+// Add your customization below this comment
+