From a51d0a862daac811a5563b221323e9819140f6cb Mon Sep 17 00:00:00 2001 From: paulmreese Date: Sun, 24 Sep 2023 17:17:58 -0400 Subject: [PATCH 1/5] Update .gitignore for Mac --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 9fbc5c8..a4e50b3 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ build *.user CMakeLists.txt.old pico-sdk +.DS_Store From fe46ffe13fd3822efc22d1545444d2094dc2dd5d Mon Sep 17 00:00:00 2001 From: paulmreese Date: Sun, 24 Sep 2023 17:21:27 -0400 Subject: [PATCH 2/5] Checkout SMP branch of FreeRTOS --- build-all.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-all.sh b/build-all.sh index ecdad90..1a75ada 100644 --- a/build-all.sh +++ b/build-all.sh @@ -5,7 +5,7 @@ cmake -S tools/SimpleFSBuilder -B tools/SimpleFSBuilder/build make -C tools/SimpleFSBuilder/build || exit 1 test -d pico-sdk || git clone --recursive https://github.com/raspberrypi/pico-sdk -test -d pico-sdk/FreeRTOS || git clone --recursive https://github.com/FreeRTOS/FreeRTOS-Kernel pico-sdk/FreeRTOS +test -d pico-sdk/FreeRTOS || git clone --recursive --branch smp https://github.com/FreeRTOS/FreeRTOS-Kernel pico-sdk/FreeRTOS grep -e ip4_secondary_ip_address pico-sdk/lib/lwip/src/core/ipv4/ip4.c || patch -p1 -d pico-sdk/lib/lwip < lwip_patch/lwip.patch || (echo "Failed to apply patch" && exit 1) From 6236c7340a33d5addadce049759cb0862caf22d9 Mon Sep 17 00:00:00 2001 From: paulmreese Date: Wed, 25 Oct 2023 13:33:46 -0400 Subject: [PATCH 3/5] Account for merge of FreeRTOS smp branch into main --- PicoHTTPServer/FreeRTOSConfig.h | 9 ++++++--- build-all.sh | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/PicoHTTPServer/FreeRTOSConfig.h b/PicoHTTPServer/FreeRTOSConfig.h index a9f113b..3c255d5 100644 --- a/PicoHTTPServer/FreeRTOSConfig.h +++ b/PicoHTTPServer/FreeRTOSConfig.h @@ -102,13 +102,16 @@ #define configMAX_API_CALL_INTERRUPT_PRIORITY [dependent on processor and application] */ -#if FREE_RTOS_KERNEL_SMP // set by the RP2040 SMP port of FreeRTOS +/* SMP Related config. */ +#define configUSE_PASSIVE_IDLE_HOOK 0 +#define portSUPPORT_SMP 1 + /* SMP port only */ -#define configNUM_CORES 2 +#define configNUMBER_OF_CORES 2 #define configTICK_CORE 0 #define configRUN_MULTIPLE_PRIORITIES 1 #define configUSE_CORE_AFFINITY 1 -#endif + /* RP2040 specific */ #define configSUPPORT_PICO_SYNC_INTEROP 1 diff --git a/build-all.sh b/build-all.sh index 1a75ada..487935a 100644 --- a/build-all.sh +++ b/build-all.sh @@ -5,7 +5,7 @@ cmake -S tools/SimpleFSBuilder -B tools/SimpleFSBuilder/build make -C tools/SimpleFSBuilder/build || exit 1 test -d pico-sdk || git clone --recursive https://github.com/raspberrypi/pico-sdk -test -d pico-sdk/FreeRTOS || git clone --recursive --branch smp https://github.com/FreeRTOS/FreeRTOS-Kernel pico-sdk/FreeRTOS +test -d pico-sdk/FreeRTOS || git clone --recursive --branch main https://github.com/FreeRTOS/FreeRTOS-Kernel pico-sdk/FreeRTOS grep -e ip4_secondary_ip_address pico-sdk/lib/lwip/src/core/ipv4/ip4.c || patch -p1 -d pico-sdk/lib/lwip < lwip_patch/lwip.patch || (echo "Failed to apply patch" && exit 1) From 837a098c1bc2a06a5564d85ed0029faf8f375ba6 Mon Sep 17 00:00:00 2001 From: paulmreese Date: Wed, 25 Oct 2023 13:34:45 -0400 Subject: [PATCH 4/5] Add VSCode files to .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index a4e50b3..905d007 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ .visualgdb .vs +.vscode build *.user CMakeLists.txt.old From d06eea25c32370ba3c35bc80958ab2a4dc37fe69 Mon Sep 17 00:00:00 2001 From: paulmreese Date: Tue, 14 Nov 2023 21:05:55 -0500 Subject: [PATCH 5/5] Add necessary configuration variable configNUM_CORES --- PicoHTTPServer/FreeRTOSConfig.h | 1 + 1 file changed, 1 insertion(+) diff --git a/PicoHTTPServer/FreeRTOSConfig.h b/PicoHTTPServer/FreeRTOSConfig.h index 3c255d5..d5ee33d 100644 --- a/PicoHTTPServer/FreeRTOSConfig.h +++ b/PicoHTTPServer/FreeRTOSConfig.h @@ -108,6 +108,7 @@ /* SMP port only */ #define configNUMBER_OF_CORES 2 +#define configNUM_CORES 2 #define configTICK_CORE 0 #define configRUN_MULTIPLE_PRIORITIES 1 #define configUSE_CORE_AFFINITY 1