libraries: Change autoconf.h to zephyr/autoconf.h

-During the last Zephyr upmerge the includes changed from autoconf.h
 to zephyr/autoconf.h which this commit fixes for the following:
 - TF-M header for IOCTL API
 - Out-of-tree device nrf device integration for TF-M
 - HW unique key library (and sysbuild)
 - lwm2m_carrier (sysbuild)
 - Bootloader (Partition Manager)
 - Netboot (Partition Manager)
 - Lots of Partition Manager yml files

Signed-off-by: Frank Audun Kvamtrø <frank.kvamtro@nordicsemi.no>

Author: frkv

include/hw_unique_key.h

@@ -26,7 +26,7 @@ extern "C" {
 #include <stdbool.h>
 
 #if defined(__NRF_TFM__)
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 #endif
 #include <zephyr/devicetree.h>
 

include/tfm/tfm_ioctl_api.h

@@ -26,7 +26,7 @@
 /* Include core IOCTL services */
 #include <tfm_ioctl_core_api.h>
 
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 
 #if CONFIG_FW_INFO
 #include <fw_info_bare.h>

lib/bin/lwm2m_carrier/pm.yml.lwm2m_carrier

@@ -1,4 +1,4 @@
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 
 lwm2m_carrier:
   placement:

lib/hw_unique_key/pm.yml.huk

@@ -1,4 +1,4 @@
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 
 # Use the last partition in flash to store the Hardware Unique Key (HUK)
 # The size of the partition matches the fprotect block size since it will

modules/trusted-firmware-m/tfm_boards/board/RTE_Device.h

@@ -7,7 +7,7 @@
 #ifndef __RTE_DEVICE_H
 #define __RTE_DEVICE_H
 
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 
 /* ARRAY_SIZE causes a conflict as it is defined both by TF-M and indirectly by devicetree.h */
 #undef ARRAY_SIZE

modules/trusted-firmware-m/tfm_boards/board/device_cfg.h

@@ -7,7 +7,7 @@
 #ifndef DEVICE_CFG_H__
 #define DEVICE_CFG_H__
 
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 
 /* ARRAY_SIZE causes a conflict as it is defined both by TF-M and indirectly by devicetree.h */
 #undef ARRAY_SIZE

modules/trusted-firmware-m/tfm_boards/board/nrf_board.h

@@ -7,7 +7,7 @@
 #ifndef NRF_BOARD_H__
 #define NRF_BOARD_H__
 
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 #include <zephyr/devicetree.h>
 
 #include <hal/nrf_gpio.h>

modules/trusted-firmware-m/tfm_boards/board/tfm_peripherals_config.h

@@ -11,7 +11,7 @@
 extern "C" {
 #endif
 
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 #include <nrfx.h>
 
 #define TFM_PERIPHERAL_DCNF_SECURE CONFIG_NRF_DCNF_SECURE

modules/trusted-firmware-m/tfm_boards/common/assert.c

@@ -5,7 +5,7 @@
  */
 
 #include <pm_config.h>
-#include "autoconf.h"
+#include "zephyr/autoconf.h"
 #include "region_defs.h"
 #include "utilities.h"
 

modules/trusted-firmware-m/tfm_boards/common/tfm_hal_platform.c

@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
  */
 
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 
 #if defined(TFM_PARTITION_CRYPTO) && defined(CONFIG_HAS_HW_NRF_CC3XX)
 #include <nrf_cc3xx_platform.h>

modules/trusted-firmware-m/tfm_boards/include/zephyr/sys/__assert.h

@@ -15,7 +15,7 @@
  * The functionality will be forwarded to TF-M equivalent of the Zephyr API.
  */
 
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 #include "tfm_sp_log.h"
 #include "utilities.h"
 

modules/trusted-firmware-m/tfm_boards/include/zephyr/sys/check.h

@@ -15,7 +15,7 @@
  * The functionality will be forwarded to TF-M equivalent of the Zephyr API.
  */
 
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 #include <zephyr/sys/__assert.h>
 
 /* Note:

modules/trusted-firmware-m/tfm_boards/partition/flash_layout.h

@@ -8,7 +8,7 @@
 #define __FLASH_LAYOUT_H__
 
 #include <pm_config.h>
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 
 /* This header file is included from linker scatter file as well, where only a
  * limited C constructs are allowed. Therefore it is not possible to include

modules/trusted-firmware-m/tfm_boards/src/tfm_ioctl_ns_api.c

@@ -8,7 +8,7 @@
 #include <tfm_platform_api.h>
 #include <tfm_ioctl_api.h>
 
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 #include <errno.h>
 
 static int status2err(enum tfm_platform_err_t status, uint32_t result)

samples/bootloader/pm.yml

@@ -1,4 +1,4 @@
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 
 b0:
   size: CONFIG_PM_PARTITION_SIZE_B0_IMAGE

samples/nrf5340/netboot/pm.yml

@@ -1,4 +1,4 @@
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 
 b0n:
   size: CONFIG_B0N_SIZE

samples/tfm/tfm_secure_peripheral/secure_peripheral_partition/secure_peripheral_partition.c

@@ -19,7 +19,7 @@
 
 #include "util.h"
 
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 #include <zephyr/devicetree.h>
 
 #define BUTTON_PIN      DT_GPIO_PIN(DT_NODELABEL(button0), gpios)

scripts/partition_manager/partition_manager.rst

@@ -420,7 +420,7 @@ The information extracted from devicetree is the alignment value for some partit
 
 .. code-block:: yaml
 
-   #include <autoconf.h>
+   #include <zephyr/autoconf.h>
    #include <devicetree_legacy_unfixed.h>
 
    b0:

subsys/nrf_security/tfm/CMakeLists.txt

@@ -3,17 +3,7 @@
 #
 # SPDX-License-Identifier: LicenseRef-Nordic-5-Clause
 #
-
-# This file is nrf_security's entry-point for the TF-M build system
-set(BUILD_INSIDE_TFM True)
-
-set(west_root_dir ${CMAKE_CURRENT_LIST_DIR}/../../../..)
-
-set(NRFXLIB_DIR ${west_root_dir}/nrfxlib)
-set(NRF_SECURITY_ROOT ${CMAKE_CURRENT_LIST_DIR}/..)
-
-set(ZEPHYR_NRF_MODULE_DIR ${NRF_DIR})
-set(ZEPHYR_OBERON_PSA_CRYPTO_MODULE_DIR ${west_root_dir}/modules/crypto/oberon-psa-crypto)
+include(${TFM_EXTRA_CONFIG_PATH})
 
 include(${NRF_SECURITY_ROOT}/cmake/extensions.cmake)
 
@@ -25,7 +15,7 @@ set(mbedtls_target    ${MBEDTLS_TARGET_PREFIX}mbedtls)
 # Building nrf security for TF-M implies the following:
 # - Parse NRF_SECURITY_SETTINGS into CMake variables.
 #   Variables transferred from Zephyr to nRF Security TF-M build includes:
-#   - <build>/zephyr/.config
+#   - <build>/zephyr/.configc
 #   - GCC_M_CPU
 #   - ARM_MBEDTLS_PATH
 #   - autoconf.h
@@ -63,7 +53,7 @@ set(CONFIG_MBEDTLS_MD_C                             False)
 # control of the CryptoCell. Therefore, specifically for building TF-M we
 # enable it manually.
 if(CONFIG_HAS_HW_NRF_CC3XX)
-  set(CONFIG_NRF_CC3XX_PLATFORM                       True)
+  set(CONFIG_NRF_CC3XX_PLATFORM                     True)
 endif()
 
 # Disable threading for TF-M SPM image
@@ -86,10 +76,11 @@ set(CONFIG_BUILD_WITH_TFM                           False)
 # Enable the MBEDTLS_ENABLE_HEAP configuration since TF-M implements heap in crypto_init.c
 set(CONFIG_MBEDTLS_ENABLE_HEAP                      True)
 
+# Ensure that RNG is not usling legacy code
 set(CONFIG_MBEDTLS_PSA_CRYPTO_EXTERNAL_RNG          True)
 
-# TF-M build require that PSA Crypto APIs are compiled
-set(COMPILE_PSA_APIS True)
+# Ensure that PSA core is built inside TF-M image
+set(CONFIG_MBEDTLS_PSA_CRYPTO_C                     True)
 
 if ("${PROJECT_NAME}" STREQUAL "Bootloader")
   set(CONFIG_CC3XX_MBEDTLS_RSA_C    True)

subsys/partition_manager/pm.yml.emds

@@ -1,4 +1,4 @@
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 
 emds_storage:
   placement:

subsys/partition_manager/pm.yml.file_system

@@ -1,4 +1,4 @@
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 
 littlefs_storage:
   placement:

subsys/partition_manager/pm.yml.fmfu

@@ -1,4 +1,4 @@
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 
 fmfu_storage:
   placement: {before: [end]}

subsys/partition_manager/pm.yml.libmodem

@@ -1,4 +1,4 @@
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 
 nrf_modem_lib_sram:
   span: [nrf_modem_lib_ctrl, nrf_modem_lib_tx, nrf_modem_lib_rx, nrf_modem_lib_trace]

subsys/partition_manager/pm.yml.mcuboot

@@ -1,4 +1,4 @@
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 
 mcuboot_sram:
 #ifdef CONFIG_MCUBOOT_USE_ALL_AVAILABLE_RAM

subsys/partition_manager/pm.yml.memfault

@@ -1,4 +1,4 @@
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 
 memfault_storage:
   placement:

subsys/partition_manager/pm.yml.modem_trace

@@ -1,4 +1,4 @@
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 
 modem_trace:
   placement: {before: [end]}

subsys/partition_manager/pm.yml.nvs

@@ -1,4 +1,4 @@
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 
 # In nRF54L15 we place the TF-M non-secure storage partitions after the
 # TF-M non-secure application to avoid splitting the secure/non-secure

subsys/partition_manager/pm.yml.pcd

@@ -1,4 +1,4 @@
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 
 # This block of RAM is used for communicating Network Core firmware update
 # metadata

subsys/partition_manager/pm.yml.pgps

@@ -1,4 +1,4 @@
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 
 pgps:
   placement:

subsys/partition_manager/pm.yml.rpmsg_nrf53

@@ -1,4 +1,4 @@
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 
 # This block of RAM is used for IPC
 rpmsg_nrf53_sram:

subsys/partition_manager/pm.yml.secure_boot_storage

@@ -1,4 +1,4 @@
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 
 provision:
   size: CONFIG_PM_PARTITION_SIZE_PROVISION

subsys/partition_manager/pm.yml.settings

@@ -1,4 +1,4 @@
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 
 # In nRF54L15 we place the TF-M non-secure storage partitions after the
 # TF-M non-secure application to avoid splitting the secure/non-secure

subsys/partition_manager/pm.yml.tfm

@@ -1,4 +1,4 @@
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 
 tfm_sram:
   placement: {after: [start]}

subsys/partition_manager/pm.yml.vpr_launcher

@@ -1,4 +1,4 @@
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 
 vpr_launcher:
   placement: {before: app}

subsys/partition_manager/pm.yml.zboss

@@ -1,4 +1,4 @@
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 
 zboss_nvram:
   placement:

subsys/suit/cache/src/suit_dfu_cache_internal.h

@@ -12,7 +12,7 @@
 #include <zcbor_decode.h>
 #include <zephyr/storage/flash_map.h>
 #include <suit_dfu_cache.h>
-#include <autoconf.h>
+#include <zephyr/autoconf.h>
 
 /* Adding 5 bytes for bstring header and 1 byte for indefinite map header and
  * 9 bytes for tstr