refactor(core): move board_capabilities to sec layer

diff --git a/core/embed/projects/boardloader/main.c b/core/embed/projects/boardloader/main.c
index 8d03d2aa..4bb2c3f3 100644
--- a/core/embed/projects/boardloader/main.c
+++ b/core/embed/projects/boardloader/main.c
@@ -21,13 +21,13 @@
 #include <trezor_rtl.h>
 
 #include <io/display.h>
+#include <sec/board_capabilities.h>
 #include <sec/secret.h>
 #include <sys/bootutils.h>
 #include <sys/reset_flags.h>
 #include <sys/rng.h>
 #include <sys/system.h>
 #include <sys/systick.h>
-#include <util/board_capabilities.h>
 #include <util/flash.h>
 #include <util/option_bytes.h>
 #include <util/rsod.h>
diff --git a/core/embed/projects/kernel/main.c b/core/embed/projects/kernel/main.c
index 0bc995a7..0b6e14a6 100644
--- a/core/embed/projects/kernel/main.c
+++ b/core/embed/projects/kernel/main.c
@@ -22,6 +22,7 @@
 
 #include <gfx/gfx_bitblt.h>
 #include <io/display.h>
+#include <sec/board_capabilities.h>
 #include <sec/random_delays.h>
 #include <sec/secret.h>
 #include <sec/secure_aes.h>
@@ -33,7 +34,6 @@
 #include <sys/sysevent.h>
 #include <sys/system.h>
 #include <sys/systick.h>
-#include <util/board_capabilities.h>
 #include <util/boot_image.h>
 #include <util/option_bytes.h>
 #include <util/rsod.h>
diff --git a/core/embed/projects/prodtest/cmd/prodtest_boardloader.c b/core/embed/projects/prodtest/cmd/prodtest_boardloader.c
index ba5fe7fa..7c13f139 100644
--- a/core/embed/projects/prodtest/cmd/prodtest_boardloader.c
+++ b/core/embed/projects/prodtest/cmd/prodtest_boardloader.c
@@ -20,8 +20,8 @@
 #include <trezor_rtl.h>
 
 #include <rtl/cli.h>
+#include <sec/board_capabilities.h>
 #include <sys/mpu.h>
-#include <util/board_capabilities.h>
 #include <util/flash.h>
 
 #include "common.h"
diff --git a/core/embed/projects/prodtest/cmd/prodtest_bootloader.c b/core/embed/projects/prodtest/cmd/prodtest_bootloader.c
index 37d96eab..97713570 100644
--- a/core/embed/projects/prodtest/cmd/prodtest_bootloader.c
+++ b/core/embed/projects/prodtest/cmd/prodtest_bootloader.c
@@ -21,8 +21,8 @@
 #include <trezor_rtl.h>
 
 #include <rtl/cli.h>
+#include <sec/board_capabilities.h>
 #include <sys/mpu.h>
-#include <util/board_capabilities.h>
 #include <util/boot_image.h>
 #include <util/image.h>
 
diff --git a/core/embed/projects/prodtest/main.c b/core/embed/projects/prodtest/main.c
index dc960767..c6abb41f 100644
--- a/core/embed/projects/prodtest/main.c
+++ b/core/embed/projects/prodtest/main.c
@@ -26,10 +26,10 @@
 #include <io/usb.h>
 #include <io/usb_config.h>
 #include <rtl/cli.h>
+#include <sec/board_capabilities.h>
 #include <sec/unit_properties.h>
 #include <sys/system.h>
 #include <sys/systick.h>
-#include <util/board_capabilities.h>
 #include <util/flash_otp.h>
 #include <util/rsod.h>
 
diff --git a/core/embed/projects/secmon/main.c b/core/embed/projects/secmon/main.c
index 7a9ebf53..b6832b79 100644
--- a/core/embed/projects/secmon/main.c
+++ b/core/embed/projects/secmon/main.c
@@ -20,6 +20,7 @@
 #include <trezor_bsp.h>
 #include <trezor_model.h>
 
+#include <sec/board_capabilities.h>
 #include <sec/random_delays.h>
 #include <sec/secure_aes.h>
 #include <sec/unit_properties.h>
@@ -27,7 +28,6 @@
 #include <sys/system.h>
 #include <sys/systick.h>
 #include <sys/sysutils.h>
-#include <util/board_capabilities.h>
 #include <util/boot_image.h>
 #include <util/flash.h>
 #include <util/option_bytes.h>
diff --git a/core/embed/sec/board_capabilities/inc/sec/board_capabilities.h b/core/embed/sec/board_capabilities/inc/sec/board_capabilities.h
new file mode 100644
index 00000000..11e1ad98
--- /dev/null
+++ b/core/embed/sec/board_capabilities/inc/sec/board_capabilities.h
@@ -0,0 +1,81 @@
+/*
+ * This file is part of the Trezor project, https://trezor.io/
+ *
+ * Copyright (c) SatoshiLabs
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <trezor_types.h>
+
+typedef struct __attribute__((packed)) {
+  uint8_t version_major;
+  uint8_t version_minor;
+  uint8_t version_patch;
+  uint8_t version_build;
+} boardloader_version_t;
+
+#ifdef SECURE_MODE
+
+// Structure holding board capabilities.
+// Older boardloaders can have it missing or reordered.
+//
+// Simple key-tag-length-value structure at fixed boardloader address.
+//
+//  header 4 bytes `TRZC`
+//  each field is 4 bytes or multiple (because of alignment)
+//  4 bytes are
+//  1-byte tag+type - CapabilityTag
+//  1 byte length - counting from next byte forward
+//  0 or more bytes of data, doesn't have to be aligned
+//
+// Last tag must be terminator or all space used.
+
+#define CAPABILITIES_HEADER "TRZC"
+
+enum CapabilityTag {
+  TAG_TERMINATOR = 0x00,
+  TAG_CAPABILITY = 0x01,
+  TAG_MODEL_NAME = 0x02,
+  TAG_BOARDLOADER_VERSION = 0x03
+};
+
+typedef struct __attribute__((packed)) {
+  uint8_t header[4];
+  uint8_t model_tag;
+  uint8_t model_length;
+  uint32_t model_name;
+  uint8_t version_tag;
+  uint8_t version_length;
+  boardloader_version_t version;
+  uint8_t terminator_tag;
+  uint8_t terminator_length;
+} board_capabilities_t;
+
+// Parses capabilities from boardloader into RAM
+//
+// This function must be called before any other function
+// that uses the capabilities
+void parse_boardloader_capabilities();
+
+#endif  // SECURE_MODE
+
+// Gets four bytes containing characters identifying the board
+// (e.g. `T3T1` for Trezor Safe 5)
+uint32_t get_board_name();
+
+// Gets the boardloader version
+void get_boardloader_version(boardloader_version_t* version);
diff --git a/core/embed/sec/board_capabilities/stm32/board_capabilities.c b/core/embed/sec/board_capabilities/stm32/board_capabilities.c
new file mode 100644
index 00000000..efe1f8fb
--- /dev/null
+++ b/core/embed/sec/board_capabilities/stm32/board_capabilities.c
@@ -0,0 +1,90 @@
+/*
+ * This file is part of the Trezor project, https://trezor.io/
+ *
+ * Copyright (c) SatoshiLabs
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifdef SECURE_MODE
+
+#include <trezor_model.h>
+#include <trezor_rtl.h>
+
+#include <sec/board_capabilities.h>
+#include <sys/mpu.h>
+
+static uint32_t board_name = 0;
+
+static boardloader_version_t boardloader_version = {0};
+
+const uint32_t get_board_name() { return board_name; }
+
+void get_boardloader_version(boardloader_version_t *version) {
+  *version = boardloader_version;
+}
+
+void parse_boardloader_capabilities() {
+  mpu_mode_t mpu_mode = mpu_reconfig(MPU_MODE_BOARDCAPS);
+
+  const uint8_t *pos = (const uint8_t *)BOARDCAPS_START;
+  const uint8_t *end = (const uint8_t *)(BOARDCAPS_START + BOARDCAPS_MAXSIZE);
+
+  if (memcmp(pos, CAPABILITIES_HEADER, 4) != 0) {
+    mpu_restore(mpu_mode);
+    return;
+  }
+
+  pos += 4;
+
+  // -2 for possible tag without any data
+  while (pos <= end - 2) {
+    enum CapabilityTag tag = pos[0];
+    uint8_t length = pos[1];
+    pos += 2;
+
+    if (pos + length > end) {
+      error_shutdown("Bad capabilities format");
+    }
+
+    switch (tag) {
+      case TAG_CAPABILITY:
+        // not used yet, just advance pointer
+        break;
+      case TAG_MODEL_NAME:
+        if (length != sizeof(uint32_t)) {
+          break;
+        }
+        memcpy((uint8_t *)&board_name, pos, sizeof(uint32_t));
+        break;
+      case TAG_BOARDLOADER_VERSION:
+        if (length != sizeof(boardloader_version)) {
+          break;
+        }
+        memcpy(&boardloader_version, pos, length);
+        break;
+      case TAG_TERMINATOR:
+        mpu_restore(mpu_mode);
+        return;
+      default:
+        break;
+    }
+
+    pos += length;
+  }
+
+  mpu_restore(mpu_mode);
+}
+
+#endif  // SECURE_MODE
diff --git a/core/embed/sec/board_capabilities/unix/board_capabilities.c b/core/embed/sec/board_capabilities/unix/board_capabilities.c
new file mode 100644
index 00000000..1f65bf61
--- /dev/null
+++ b/core/embed/sec/board_capabilities/unix/board_capabilities.c
@@ -0,0 +1,36 @@
+/*
+ * This file is part of the Trezor project, https://trezor.io/
+ *
+ * Copyright (c) SatoshiLabs
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <trezor_bsp.h>
+#include <trezor_rtl.h>
+
+#include <sec/board_capabilities.h>
+
+void parse_boardloader_capabilities() {}
+
+uint32_t get_board_name() { return HW_MODEL; }
+
+// Gets the boardloader version
+void get_boardloader_version(boardloader_version_t* version) {
+  boardloader_version_t v = {.version_major = 0,
+                             .version_minor = 0,
+                             .version_patch = 0,
+                             .version_build = 0};
+  *version = v;
+}
diff --git a/core/embed/sys/smcall/stm32/smcall_dispatch.c b/core/embed/sys/smcall/stm32/smcall_dispatch.c
index 465bb8d0..c971958c 100644
--- a/core/embed/sys/smcall/stm32/smcall_dispatch.c
+++ b/core/embed/sys/smcall/stm32/smcall_dispatch.c
@@ -21,6 +21,7 @@
 
 #include <trezor_rtl.h>
 
+#include <sec/board_capabilities.h>
 #include <sec/random_delays.h>
 #include <sec/rng_strong.h>
 #include <sec/secret.h>
@@ -30,7 +31,6 @@
 #include <sys/bootutils.h>
 #include <sys/irq.h>
 #include <sys/system.h>
-#include <util/board_capabilities.h>
 #include <util/fwutils.h>
 
 #ifdef USE_BACKUP_RAM
diff --git a/core/embed/sys/smcall/stm32/smcall_stubs.c b/core/embed/sys/smcall/stm32/smcall_stubs.c
index de892bec..74089ce4 100644
--- a/core/embed/sys/smcall/stm32/smcall_stubs.c
+++ b/core/embed/sys/smcall/stm32/smcall_stubs.c
@@ -53,7 +53,7 @@ void boot_image_replace(const boot_image_t *image) {
 // board_capabilities.h
 // =============================================================================
 
-#include <util/board_capabilities.h>
+#include <sec/board_capabilities.h>
 
 uint32_t get_board_name(void) { return smcall_invoke0(SMCALL_GET_BOARD_NAME); }
 
diff --git a/core/embed/util/board_capabilities/inc/util/board_capabilities.h b/core/embed/util/board_capabilities/inc/util/board_capabilities.h
deleted file mode 100644
index 11e1ad98..00000000
--- a/core/embed/util/board_capabilities/inc/util/board_capabilities.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * This file is part of the Trezor project, https://trezor.io/
- *
- * Copyright (c) SatoshiLabs
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include <trezor_types.h>
-
-typedef struct __attribute__((packed)) {
-  uint8_t version_major;
-  uint8_t version_minor;
-  uint8_t version_patch;
-  uint8_t version_build;
-} boardloader_version_t;
-
-#ifdef SECURE_MODE
-
-// Structure holding board capabilities.
-// Older boardloaders can have it missing or reordered.
-//
-// Simple key-tag-length-value structure at fixed boardloader address.
-//
-//  header 4 bytes `TRZC`
-//  each field is 4 bytes or multiple (because of alignment)
-//  4 bytes are
-//  1-byte tag+type - CapabilityTag
-//  1 byte length - counting from next byte forward
-//  0 or more bytes of data, doesn't have to be aligned
-//
-// Last tag must be terminator or all space used.
-
-#define CAPABILITIES_HEADER "TRZC"
-
-enum CapabilityTag {
-  TAG_TERMINATOR = 0x00,
-  TAG_CAPABILITY = 0x01,
-  TAG_MODEL_NAME = 0x02,
-  TAG_BOARDLOADER_VERSION = 0x03
-};
-
-typedef struct __attribute__((packed)) {
-  uint8_t header[4];
-  uint8_t model_tag;
-  uint8_t model_length;
-  uint32_t model_name;
-  uint8_t version_tag;
-  uint8_t version_length;
-  boardloader_version_t version;
-  uint8_t terminator_tag;
-  uint8_t terminator_length;
-} board_capabilities_t;
-
-// Parses capabilities from boardloader into RAM
-//
-// This function must be called before any other function
-// that uses the capabilities
-void parse_boardloader_capabilities();
-
-#endif  // SECURE_MODE
-
-// Gets four bytes containing characters identifying the board
-// (e.g. `T3T1` for Trezor Safe 5)
-uint32_t get_board_name();
-
-// Gets the boardloader version
-void get_boardloader_version(boardloader_version_t* version);
diff --git a/core/embed/util/board_capabilities/stm32/board_capabilities.c b/core/embed/util/board_capabilities/stm32/board_capabilities.c
deleted file mode 100644
index 89088abd..00000000
--- a/core/embed/util/board_capabilities/stm32/board_capabilities.c
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * This file is part of the Trezor project, https://trezor.io/
- *
- * Copyright (c) SatoshiLabs
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifdef SECURE_MODE
-
-#include <trezor_model.h>
-#include <trezor_rtl.h>
-
-#include <sys/mpu.h>
-#include <util/board_capabilities.h>
-
-static uint32_t board_name = 0;
-
-static boardloader_version_t boardloader_version = {0};
-
-const uint32_t get_board_name() { return board_name; }
-
-void get_boardloader_version(boardloader_version_t *version) {
-  *version = boardloader_version;
-}
-
-void parse_boardloader_capabilities() {
-  mpu_mode_t mpu_mode = mpu_reconfig(MPU_MODE_BOARDCAPS);
-
-  const uint8_t *pos = (const uint8_t *)BOARDCAPS_START;
-  const uint8_t *end = (const uint8_t *)(BOARDCAPS_START + BOARDCAPS_MAXSIZE);
-
-  if (memcmp(pos, CAPABILITIES_HEADER, 4) != 0) {
-    mpu_restore(mpu_mode);
-    return;
-  }
-
-  pos += 4;
-
-  // -2 for possible tag without any data
-  while (pos <= end - 2) {
-    enum CapabilityTag tag = pos[0];
-    uint8_t length = pos[1];
-    pos += 2;
-
-    if (pos + length > end) {
-      error_shutdown("Bad capabilities format");
-    }
-
-    switch (tag) {
-      case TAG_CAPABILITY:
-        // not used yet, just advance pointer
-        break;
-      case TAG_MODEL_NAME:
-        if (length != sizeof(uint32_t)) {
-          break;
-        }
-        memcpy((uint8_t *)&board_name, pos, sizeof(uint32_t));
-        break;
-      case TAG_BOARDLOADER_VERSION:
-        if (length != sizeof(boardloader_version)) {
-          break;
-        }
-        memcpy(&boardloader_version, pos, length);
-        break;
-      case TAG_TERMINATOR:
-        mpu_restore(mpu_mode);
-        return;
-      default:
-        break;
-    }
-
-    pos += length;
-  }
-
-  mpu_restore(mpu_mode);
-}
-
-#endif  // SECURE_MODE
diff --git a/core/embed/util/board_capabilities/unix/board_capabilities.c b/core/embed/util/board_capabilities/unix/board_capabilities.c
deleted file mode 100644
index 2153d492..00000000
--- a/core/embed/util/board_capabilities/unix/board_capabilities.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * This file is part of the Trezor project, https://trezor.io/
- *
- * Copyright (c) SatoshiLabs
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <trezor_bsp.h>
-#include <trezor_rtl.h>
-
-#include <util/board_capabilities.h>
-
-void parse_boardloader_capabilities() {}
-
-uint32_t get_board_name() { return HW_MODEL; }
-
-// Gets the boardloader version
-void get_boardloader_version(boardloader_version_t* version) {
-  boardloader_version_t v = {.version_major = 0,
-                             .version_minor = 0,
-                             .version_patch = 0,
-                             .version_build = 0};
-  *version = v;
-}
diff --git a/core/embed/util/image/boot_image.c b/core/embed/util/image/boot_image.c
index bcfb7e30..ada0676f 100644
--- a/core/embed/util/image/boot_image.c
+++ b/core/embed/util/image/boot_image.c
@@ -22,9 +22,9 @@
 #include <trezor_model.h>
 #include <trezor_rtl.h>
 
+#include <sec/board_capabilities.h>
 #include <sec/monoctr.h>
 #include <sys/mpu.h>
-#include <util/board_capabilities.h>
 #include <util/boot_image.h>
 #include <util/flash.h>
 #include <util/image.h>
diff --git a/core/site_scons/models/stm32f4_common.py b/core/site_scons/models/stm32f4_common.py
index db8e51d5..84428048 100644
--- a/core/site_scons/models/stm32f4_common.py
+++ b/core/site_scons/models/stm32f4_common.py
@@ -25,6 +25,7 @@ def stm32f4_common_files(env, features_wanted, defines, sources, paths):
         "embed/sys/mpu/inc",
         "embed/sys/pvd/inc",
         "embed/sys/rng/inc",
+        "embed/sec/board_capabilities/inc",
         "embed/sec/secret/inc",
         "embed/sec/unit_properties/inc",
         "embed/sys/stack/inc",
@@ -32,7 +33,6 @@ def stm32f4_common_files(env, features_wanted, defines, sources, paths):
         "embed/sys/syscall/inc",
         "embed/sys/task/inc",
         "embed/sys/time/inc",
-        "embed/util/board_capabilities/inc",
         "embed/util/cpuid/inc",
         "embed/util/flash/inc",
         "embed/util/fwutils/inc",
@@ -68,6 +68,7 @@ def stm32f4_common_files(env, features_wanted, defines, sources, paths):
     sources += [
         "embed/io/notify/notify.c",
         "embed/io/tsqueue/tsqueue.c",
+        "embed/sec/board_capabilities/stm32/board_capabilities.c",
         "embed/sec/monoctr/stm32f4/monoctr.c",
         "embed/sec/random_delays/stm32/random_delays.c",
         "embed/sec/rng/rng_strong.c",
@@ -101,7 +102,6 @@ def stm32f4_common_files(env, features_wanted, defines, sources, paths):
         "embed/sys/time/stm32/systick.c",
         "embed/sys/time/stm32/systimer.c",
         "embed/sys/task/sysevent.c",
-        "embed/util/board_capabilities/stm32/board_capabilities.c",
         "embed/util/cpuid/stm32/cpuid.c",
         "embed/util/flash/stm32f4/flash.c",
         "embed/util/flash/stm32f4/flash_layout.c",
diff --git a/core/site_scons/models/stm32u5_common.py b/core/site_scons/models/stm32u5_common.py
index 9ac455fb..114e89e7 100644
--- a/core/site_scons/models/stm32u5_common.py
+++ b/core/site_scons/models/stm32u5_common.py
@@ -13,6 +13,7 @@ def stm32u5_common_files(env, features_wanted, defines, sources, paths):
     paths += [
         "embed/io/notify/inc",
         "embed/io/tsqueue/inc",
+        "embed/sec/board_capabilities/inc",
         "embed/sec/hash_processor/inc",
         "embed/sec/monoctr/inc",
         "embed/sec/random_delays/inc",
@@ -35,7 +36,6 @@ def stm32u5_common_files(env, features_wanted, defines, sources, paths):
         "embed/sys/task/inc",
         "embed/sys/time/inc",
         "embed/sys/trustzone/inc",
-        "embed/util/board_capabilities/inc",
         "embed/util/cpuid/inc",
         "embed/util/flash/inc",
         "embed/util/fwutils/inc",
@@ -90,6 +90,7 @@ def stm32u5_common_files(env, features_wanted, defines, sources, paths):
     sources += [
         "embed/io/notify/notify.c",
         "embed/io/tsqueue/tsqueue.c",
+        "embed/sec/board_capabilities/stm32/board_capabilities.c",
         "embed/sec/hash_processor/stm32u5/hash_processor.c",
         "embed/sec/monoctr/stm32u5/monoctr.c",
         "embed/sec/random_delays/stm32/random_delays.c",
@@ -130,7 +131,6 @@ def stm32u5_common_files(env, features_wanted, defines, sources, paths):
         "embed/sys/time/stm32/systimer.c",
         "embed/sys/task/sysevent.c",
         "embed/sys/trustzone/stm32u5/trustzone.c",
-        "embed/util/board_capabilities/stm32/board_capabilities.c",
         "embed/util/cpuid/stm32/cpuid.c",
         "embed/util/flash/stm32u5/flash.c",
         "embed/util/flash/stm32u5/flash_layout.c",
diff --git a/core/site_scons/models/unix_common.py b/core/site_scons/models/unix_common.py
index 9450bb5a..4d10714b 100644
--- a/core/site_scons/models/unix_common.py
+++ b/core/site_scons/models/unix_common.py
@@ -16,6 +16,7 @@ def unix_common_files(env, features_wanted, defines, sources, paths):
         "embed/sec/time_estimate/inc",
         "embed/sys/bsp/inc",
         "embed/sys/inc",
+        "embed/sec/board_capabilities/inc",
         "embed/sec/rng/inc",
         "embed/sec/monoctr/inc",
         "embed/sec/secret/inc",
@@ -26,7 +27,6 @@ def unix_common_files(env, features_wanted, defines, sources, paths):
         "embed/sys/startup/inc",
         "embed/sys/task/inc",
         "embed/sys/time/inc",
-        "embed/util/board_capabilities/inc",
         "embed/util/cpuid/inc",
         "embed/util/flash/inc",
         "embed/util/fwutils/inc",
@@ -36,6 +36,7 @@ def unix_common_files(env, features_wanted, defines, sources, paths):
         "embed/io/display/unix/display_driver.c",
         "embed/io/notify/notify.c",
         "embed/io/usb/unix/sock.c",
+        "embed/sec/board_capabilities/unix/board_capabilities.c",
         "embed/sec/random_delays/unix/random_delays.c",
         "embed/sec/secret/unix/secret.c",
         "embed/sec/secret/unix/secret_keys.c",
@@ -54,7 +55,6 @@ def unix_common_files(env, features_wanted, defines, sources, paths):
         "embed/sys/task/unix/systask.c",
         "embed/sys/time/unix/systick.c",
         "embed/sys/time/unix/systimer.c",
-        "embed/util/board_capabilities/unix/board_capabilities.c",
         "embed/util/cpuid/unix/cpuid.c",
         "embed/util/flash/unix/flash.c",
         "embed/util/flash/unix/flash_otp.c",