From f0f8e4382a4d3a54945efa58ac0d66edf3e7cfa3 Mon Sep 17 00:00:00 2001 From: Pol Henarejos Date: Sun, 22 Jun 2025 20:33:06 +0200 Subject: [PATCH] Fix cross build. Signed-off-by: Pol Henarejos --- CMakeLists.txt | 9 ++++++--- pico-keys-sdk | 2 +- src/hsm/CMakeLists.txt | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ea3af23..41042d8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -44,6 +44,12 @@ else() add_executable(pico_hsm) endif() +set(USB_ITF_CCID 1) +set(USB_ITF_WCID 1) +include(pico-keys-sdk/pico_keys_sdk_import.cmake) +if(NOT ESP_PLATFORM) + set(SOURCES ${PICO_KEYS_SOURCES}) +endif() set(SOURCES ${SOURCES} ${CMAKE_CURRENT_LIST_DIR}/src/hsm/sc_hsm.c ${CMAKE_CURRENT_LIST_DIR}/src/hsm/cmd_select.c @@ -77,9 +83,6 @@ set(SOURCES ${SOURCES} ${CMAKE_CURRENT_LIST_DIR}/src/hsm/files.c ${CMAKE_CURRENT_LIST_DIR}/src/hsm/kek.c ) -set(USB_ITF_CCID 1) -set(USB_ITF_WCID 1) -include(pico-keys-sdk/pico_keys_sdk_import.cmake) SET_VERSION(ver_major ver_minor "${CMAKE_CURRENT_LIST_DIR}/src/hsm/version.h" 1) diff --git a/pico-keys-sdk b/pico-keys-sdk index 11d8a53..113e720 160000 --- a/pico-keys-sdk +++ b/pico-keys-sdk @@ -1 +1 @@ -Subproject commit 11d8a5343c7aa76b8b32d0ec1ffc3e70ecb0eb13 +Subproject commit 113e720fcaaa6b9ca74d114bee1923bb2619ba3b diff --git a/src/hsm/CMakeLists.txt b/src/hsm/CMakeLists.txt index 31d66c9..9a802b3 100644 --- a/src/hsm/CMakeLists.txt +++ b/src/hsm/CMakeLists.txt @@ -1,6 +1,6 @@ idf_component_register( SRCS ${SOURCES} INCLUDE_DIRS . ../../pico-keys-sdk/src ../../pico-keys-sdk/src/fs ../../pico-keys-sdk/src/rng ../../pico-keys-sdk/src/usb - REQUIRES bootloader_support esp_partition esp_tinyusb zorxx__neopixel mbedtls efuse + REQUIRES mbedtls efuse ) idf_component_set_property(${COMPONENT_NAME} WHOLE_ARCHIVE ON)