Fix SDK branch for enc_bootloader

raspberrypi · Feb 7, 2025 · b0c593e · b0c593e
1 parent fbaff6a
commit b0c593e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/enc_bootloader/CMakeLists.txt b/enc_bootloader/CMakeLists.txt
@@ -20,10 +20,11 @@ if (NOT USE_PRECOMPILED)
 
     # Temporary import handling, to ensure SDK branch with PICO_MINIMAL_VECTOR_TABLE is present
     file(READ ${PICO_SDK_PATH}/src/rp2_common/pico_crt0/crt0.S CRT0_S)
-    if (CRT0_S MATCHES "PICO_MINIMAL_VECTOR_TABLE")
+    file(READ ${PICO_SDK_PATH}/src/rp2_common/hardware_clocks/clocks.c CLOCKS_C)
+    if ((CRT0_S MATCHES "PICO_MINIMAL_VECTOR_TABLE") AND (CLOCKS_C MATCHES "clock_configure_mhz"))
         include(${PICO_SDK_PATH}/external/pico_sdk_import.cmake)
     else()
-        # This clones the will-v-pi/pico-sdk repo on the min-vtor branch
+        # This clones the will-v-pi/pico-sdk repo on the self-decrypting branch
         include(tmp_pico_sdk_import.cmake)
     endif()
 

diff --git a/enc_bootloader/tmp_pico_sdk_import.cmake b/enc_bootloader/tmp_pico_sdk_import.cmake
@@ -1,7 +1,7 @@
 # This is a modified copy of <PICO_SDK_PATH>/external/pico_sdk_import.cmake to use a specific git repo and branch
 
 set(PICO_SDK_FETCH_FROM_GIT_URL "https://github.com/will-v-pi/pico-sdk")
-set(PICO_SDK_FETCH_FROM_GIT_TAG "min-vtor")
+set(PICO_SDK_FETCH_FROM_GIT_TAG "self-decrypting")
 
 include(FetchContent)
 FetchContent_Declare(