From ed980c3093e860335c12d9daea2cbe91b1761429 Mon Sep 17 00:00:00 2001
From: Pol Henarejos <pol.henarejos@cttc.es>
Date: Thu, 22 Jan 2026 11:59:46 +0100
Subject: [PATCH] Use new layout

Signed-off-by: Pol Henarejos <pol.henarejos@cttc.es>
---
 CMakeLists.txt         | 4 ++--
 pico-keys-sdk          | 2 +-
 src/hsm/CMakeLists.txt | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d83a9f8..dd97dfc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,7 +18,7 @@
 cmake_minimum_required(VERSION 3.13)
 
 if(ESP_PLATFORM)
-    set(EXTRA_COMPONENT_DIRS src pico-keys-sdk/src)
+    set(EXTRA_COMPONENT_DIRS pico-keys-sdk/config/esp32/components src/hsm)
     include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 else()
     if(NOT ENABLE_EMULATION)
@@ -124,7 +124,7 @@ if(NOT ESP_PLATFORM)
                 -Wl,--gc-sections
             )
         endif(APPLE)
-        target_link_libraries(pico_hsm PRIVATE pthread m)
+        target_link_libraries(pico_hsm PRIVATE pico_keys_sdk pthread m mbedtls)
     else()
         pico_add_extra_outputs(${CMAKE_PROJECT_NAME})
     endif()
diff --git a/pico-keys-sdk b/pico-keys-sdk
index 263e554..6860029 160000
--- a/pico-keys-sdk
+++ b/pico-keys-sdk
@@ -1 +1 @@
-Subproject commit 263e554cc6c59a5f168f8589c4bdabe6e1e64c25
+Subproject commit 68600291d0a85cbf695d798a330ebe78fb163a4d
diff --git a/src/hsm/CMakeLists.txt b/src/hsm/CMakeLists.txt
index 9a802b3..b5a83a6 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 mbedtls efuse
+    INCLUDE_DIRS .
+    REQUIRES mbedtls efuse pico-keys-sdk
 )
 idf_component_set_property(${COMPONENT_NAME} WHOLE_ARCHIVE ON)