Platform: Update the include statements
Change the absolute including into relative path including
for platform sources.
Change-Id: I594577eae7689ea8ac6cb557d5b0b5a048ee9b4d
Signed-off-by: Mingyang Sun <mingyang.sun@arm.com>
diff --git a/platform/ext/common/template/attest_hal.c b/platform/ext/common/template/attest_hal.c
index 87d9736..69bafdd 100644
--- a/platform/ext/common/template/attest_hal.c
+++ b/platform/ext/common/template/attest_hal.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018-2019, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2020, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
@@ -7,9 +7,9 @@
#include <stddef.h>
#include <stdint.h>
-#include "platform/include/tfm_attest_hal.h"
-#include "platform/include/tfm_plat_boot_seed.h"
-#include "platform/include/tfm_plat_device_id.h"
+#include "tfm_attest_hal.h"
+#include "tfm_plat_boot_seed.h"
+#include "tfm_plat_device_id.h"
/*!
* \def BOOT_SEED
diff --git a/platform/ext/common/template/crypto_keys.c b/platform/ext/common/template/crypto_keys.c
index fde597d..c5564e5 100644
--- a/platform/ext/common/template/crypto_keys.c
+++ b/platform/ext/common/template/crypto_keys.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017-2019 Arm Limited. All rights reserved.
+ * Copyright (c) 2017-2020 Arm Limited. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "platform/include/tfm_plat_crypto_keys.h"
+#include "tfm_plat_crypto_keys.h"
#include <stddef.h>
#include "psa/crypto_types.h"
diff --git a/platform/ext/common/template/nv_counters.c b/platform/ext/common/template/nv_counters.c
index f2c230e..f1fb28c 100644
--- a/platform/ext/common/template/nv_counters.c
+++ b/platform/ext/common/template/nv_counters.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018-2019, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2020, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
@@ -20,7 +20,7 @@
* for testing purposes.
*/
-#include "platform/include/tfm_plat_nv_counters.h"
+#include "tfm_plat_nv_counters.h"
#include <limits.h>
#include "Driver_Flash.h"
diff --git a/platform/ext/common/template/tfm_initial_attestation_key_material.c b/platform/ext/common/template/tfm_initial_attestation_key_material.c
index 0d39635..65e91c0 100644
--- a/platform/ext/common/template/tfm_initial_attestation_key_material.c
+++ b/platform/ext/common/template/tfm_initial_attestation_key_material.c
@@ -1,13 +1,13 @@
/*
- * Copyright (c) 2019, Arm Limited. All rights reserved.
+ * Copyright (c) 2019-2020, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
*/
#include <stdint.h>
-#include "platform/include/tfm_plat_defs.h"
-#include "platform/include/tfm_plat_crypto_keys.h"
+#include "tfm_plat_defs.h"
+#include "tfm_plat_crypto_keys.h"
#include "psa/crypto_types.h"
#include "psa/crypto_values.h"
diff --git a/platform/ext/common/template/tfm_rotpk.c b/platform/ext/common/template/tfm_rotpk.c
index 2f26281..72811a5 100644
--- a/platform/ext/common/template/tfm_rotpk.c
+++ b/platform/ext/common/template/tfm_rotpk.c
@@ -1,12 +1,12 @@
/*
- * Copyright (c) 2019, Arm Limited. All rights reserved.
+ * Copyright (c) 2019-2020, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
*/
#include <stdint.h>
-#include "platform/include/tfm_plat_crypto_keys.h"
+#include "tfm_plat_crypto_keys.h"
/**
* \file tfm_rotpk.c
*
diff --git a/platform/ext/common/tfm_platform.c b/platform/ext/common/tfm_platform.c
index eabe3a4..5e5ffed 100644
--- a/platform/ext/common/tfm_platform.c
+++ b/platform/ext/common/tfm_platform.c
@@ -1,12 +1,12 @@
/*
- * Copyright (c) 2019, Arm Limited. All rights reserved.
+ * Copyright (c) 2019-2020, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
*/
#include "target_cfg.h"
-#include "platform/include/tfm_spm_hal.h"
+#include "tfm_spm_hal.h"
#include "uart_stdout.h"
/* platform-specific hw initialization */
diff --git a/platform/ext/target/cypress/psoc64/attest_hal.c b/platform/ext/target/cypress/psoc64/attest_hal.c
index d4d2407..97ca9a6 100644
--- a/platform/ext/target/cypress/psoc64/attest_hal.c
+++ b/platform/ext/target/cypress/psoc64/attest_hal.c
@@ -1,11 +1,11 @@
/*
- * Copyright (c) 2019, Arm Limited. All rights reserved.
+ * Copyright (c) 2019-2020, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
*/
-#include "platform/include/tfm_attest_hal.h"
+#include "tfm_attest_hal.h"
#include <stdint.h>
/* Example verification service URL for initial attestation token */
diff --git a/platform/ext/target/cypress/psoc64/dummy_boot_seed.c b/platform/ext/target/cypress/psoc64/dummy_boot_seed.c
index f4cbb5c..2a70a67 100644
--- a/platform/ext/target/cypress/psoc64/dummy_boot_seed.c
+++ b/platform/ext/target/cypress/psoc64/dummy_boot_seed.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018 ARM Limited
+ * Copyright (c) 2018-2020 ARM Limited
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "platform/include/tfm_plat_boot_seed.h"
+#include "tfm_plat_boot_seed.h"
/*!
* \def BOOT_SEED
diff --git a/platform/ext/target/cypress/psoc64/dummy_crypto_keys.c b/platform/ext/target/cypress/psoc64/dummy_crypto_keys.c
index 4281b38..c7a5354 100644
--- a/platform/ext/target/cypress/psoc64/dummy_crypto_keys.c
+++ b/platform/ext/target/cypress/psoc64/dummy_crypto_keys.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017-2019 ARM Limited
+ * Copyright (c) 2017-2020 ARM Limited
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "platform/include/tfm_plat_crypto_keys.h"
+#include "tfm_plat_crypto_keys.h"
#include <stddef.h>
#include "psa/crypto_types.h"
diff --git a/platform/ext/target/cypress/psoc64/dummy_device_id.c b/platform/ext/target/cypress/psoc64/dummy_device_id.c
index 1ff99b1..65452f8 100644
--- a/platform/ext/target/cypress/psoc64/dummy_device_id.c
+++ b/platform/ext/target/cypress/psoc64/dummy_device_id.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018-2019 ARM Limited
+ * Copyright (c) 2018-2020 ARM Limited
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-#include "platform/include/tfm_plat_device_id.h"
+#include "tfm_plat_device_id.h"
#include <stddef.h>
/*
* NOTE: Functions in this file must be ported per target platform.
diff --git a/platform/ext/target/cypress/psoc64/nv_counters.c b/platform/ext/target/cypress/psoc64/nv_counters.c
index 4eb77b1..0776095 100644
--- a/platform/ext/target/cypress/psoc64/nv_counters.c
+++ b/platform/ext/target/cypress/psoc64/nv_counters.c
@@ -1,12 +1,12 @@
/*
- * Copyright (c) 2018-2019, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2020, Arm Limited. All rights reserved.
* Copyright (c) 2020, Cypress Semiconductor Corporation. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
*/
-#include "platform/include/tfm_plat_nv_counters.h"
+#include "tfm_plat_nv_counters.h"
#include <limits.h>
#include <stddef.h>
diff --git a/platform/ext/target/cypress/psoc64/services/src/tfm_platform_system.c b/platform/ext/target/cypress/psoc64/services/src/tfm_platform_system.c
index 1d8c97a..6ff6694 100644
--- a/platform/ext/target/cypress/psoc64/services/src/tfm_platform_system.c
+++ b/platform/ext/target/cypress/psoc64/services/src/tfm_platform_system.c
@@ -1,11 +1,11 @@
/*
- * Copyright (c) 2018-2019, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2020, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
*/
-#include "platform/include/tfm_platform_system.h"
+#include "tfm_platform_system.h"
#include "platform_description.h"
void tfm_platform_hal_system_reset(void)
diff --git a/platform/ext/target/cypress/psoc64/spm_hal.c b/platform/ext/target/cypress/psoc64/spm_hal.c
index ae55f8b..83255a5 100644
--- a/platform/ext/target/cypress/psoc64/spm_hal.c
+++ b/platform/ext/target/cypress/psoc64/spm_hal.c
@@ -10,7 +10,7 @@
#include <stdio.h>
#include <string.h>
-#include "platform/include/tfm_spm_hal.h"
+#include "tfm_spm_hal.h"
#include "device_definition.h"
#include "region_defs.h"
diff --git a/platform/ext/target/cypress/psoc64/target_cfg.h b/platform/ext/target/cypress/psoc64/target_cfg.h
index b6dccff..be231e1 100644
--- a/platform/ext/target/cypress/psoc64/target_cfg.h
+++ b/platform/ext/target/cypress/psoc64/target_cfg.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018 ARM Limited
+ * Copyright (c) 2018-2020 ARM Limited
* Copyright (c) 2019, Cypress Semiconductor Corporation. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,7 +18,7 @@
#ifndef __TARGET_CFG_H__
#define __TARGET_CFG_H__
-#include "platform/ext/common/uart_stdout.h"
+#include "uart_stdout.h"
#include "tfm_peripherals_def.h"
#define TFM_DRIVER_STDIO Driver_USART5
diff --git a/platform/ext/target/mps2/an519/retarget/platform_retarget_dev.c b/platform/ext/target/mps2/an519/retarget/platform_retarget_dev.c
index 2e48657..1d69e63 100644
--- a/platform/ext/target/mps2/an519/retarget/platform_retarget_dev.c
+++ b/platform/ext/target/mps2/an519/retarget/platform_retarget_dev.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016-2019 Arm Limited
+ * Copyright (c) 2016-2020 Arm Limited
*
* Licensed under the Apache License Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@
#include "platform_retarget_dev.h"
#include "platform_retarget.h"
#include "system_cmsdk_mps2_an519.h"
-#include "platform/include/tfm_plat_defs.h"
+#include "tfm_plat_defs.h"
/* ARM UART driver structures */
#ifdef ARM_UART0_S
diff --git a/platform/ext/target/mps2/an519/services/src/tfm_platform_system.c b/platform/ext/target/mps2/an519/services/src/tfm_platform_system.c
index 93ba614..44fafbc 100644
--- a/platform/ext/target/mps2/an519/services/src/tfm_platform_system.c
+++ b/platform/ext/target/mps2/an519/services/src/tfm_platform_system.c
@@ -1,11 +1,11 @@
/*
- * Copyright (c) 2018-2019, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2020, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
*/
-#include "platform/include/tfm_platform_system.h"
+#include "tfm_platform_system.h"
#include "cmsis.h"
void tfm_platform_hal_system_reset(void)
diff --git a/platform/ext/target/mps2/an519/spm_hal.c b/platform/ext/target/mps2/an519/spm_hal.c
index 7362a77..93efa87 100644
--- a/platform/ext/target/mps2/an519/spm_hal.c
+++ b/platform/ext/target/mps2/an519/spm_hal.c
@@ -7,7 +7,7 @@
#include <stdio.h>
#include "cmsis.h"
-#include "platform/include/tfm_spm_hal.h"
+#include "tfm_spm_hal.h"
#include "tfm/spm_api.h"
#include "tfm/spm_db.h"
#include "tfm_platform_core_api.h"
diff --git a/platform/ext/target/mps2/an519/target_cfg.h b/platform/ext/target/mps2/an519/target_cfg.h
index fb985bf..8f45955 100644
--- a/platform/ext/target/mps2/an519/target_cfg.h
+++ b/platform/ext/target/mps2/an519/target_cfg.h
@@ -17,7 +17,7 @@
#ifndef __TARGET_CFG_H__
#define __TARGET_CFG_H__
-#include "platform/ext/common/uart_stdout.h"
+#include "uart_stdout.h"
#include "tfm_peripherals_def.h"
#include "tfm_plat_defs.h"
#include "arm_uart_drv.h"
diff --git a/platform/ext/target/mps2/an521/spm_hal.c b/platform/ext/target/mps2/an521/spm_hal.c
index 91cfb69..d1a6acb 100644
--- a/platform/ext/target/mps2/an521/spm_hal.c
+++ b/platform/ext/target/mps2/an521/spm_hal.c
@@ -7,7 +7,7 @@
#include <stdio.h>
#include "cmsis.h"
-#include "platform/include/tfm_spm_hal.h"
+#include "tfm_spm_hal.h"
#include "tfm/spm_api.h"
#include "tfm/spm_db.h"
#include "tfm_platform_core_api.h"
diff --git a/platform/ext/target/mps2/an521/target_cfg.h b/platform/ext/target/mps2/an521/target_cfg.h
index fb985bf..8f45955 100644
--- a/platform/ext/target/mps2/an521/target_cfg.h
+++ b/platform/ext/target/mps2/an521/target_cfg.h
@@ -17,7 +17,7 @@
#ifndef __TARGET_CFG_H__
#define __TARGET_CFG_H__
-#include "platform/ext/common/uart_stdout.h"
+#include "uart_stdout.h"
#include "tfm_peripherals_def.h"
#include "tfm_plat_defs.h"
#include "arm_uart_drv.h"
diff --git a/platform/ext/target/mps2/an539/services/src/tfm_platform_system.c b/platform/ext/target/mps2/an539/services/src/tfm_platform_system.c
index 2295ff6..4debc64 100644
--- a/platform/ext/target/mps2/an539/services/src/tfm_platform_system.c
+++ b/platform/ext/target/mps2/an539/services/src/tfm_platform_system.c
@@ -1,11 +1,11 @@
/*
- * Copyright (c) 2019, Arm Limited. All rights reserved.
+ * Copyright (c) 2019-2020, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
*/
-#include "platform/include/tfm_platform_system.h"
+#include "tfm_platform_system.h"
#include "cmsis.h"
void tfm_platform_hal_system_reset(void)
diff --git a/platform/ext/target/mps3/an524/device/source/device_definition.c b/platform/ext/target/mps3/an524/device/source/device_definition.c
index 7c86c3a..ea5a38c 100644
--- a/platform/ext/target/mps3/an524/device/source/device_definition.c
+++ b/platform/ext/target/mps3/an524/device/source/device_definition.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019 Arm Limited. All rights reserved.
+ * Copyright (c) 2019-2020 Arm Limited. All rights reserved.
*
* Licensed under the Apache License Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
#include "device_definition.h"
#include "platform_base_address.h"
-#include "platform/include/tfm_plat_defs.h"
+#include "tfm_plat_defs.h"
/* UART CMSDK driver structures */
#ifdef UART0_CMSDK_S
diff --git a/platform/ext/target/mps3/an524/plat_test.c b/platform/ext/target/mps3/an524/plat_test.c
index bfbe227..55f6a8b 100644
--- a/platform/ext/target/mps3/an524/plat_test.c
+++ b/platform/ext/target/mps3/an524/plat_test.c
@@ -1,12 +1,12 @@
/*
- * Copyright (c) 2019, Arm Limited. All rights reserved.
+ * Copyright (c) 2019-2020, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
*/
#include "timer_cmsdk_drv.h"
-#include "platform/include/tfm_plat_defs.h"
+#include "tfm_plat_defs.h"
#include "tfm_plat_test.h"
#include "device_definition.h"
diff --git a/platform/ext/target/mps3/an524/services/src/tfm_platform_system.c b/platform/ext/target/mps3/an524/services/src/tfm_platform_system.c
index 78d8f38..aa77e5d 100644
--- a/platform/ext/target/mps3/an524/services/src/tfm_platform_system.c
+++ b/platform/ext/target/mps3/an524/services/src/tfm_platform_system.c
@@ -1,11 +1,11 @@
/*
- * Copyright (c) 2018-2019, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2020, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
*/
-#include "platform/include/tfm_platform_system.h"
+#include "tfm_platform_system.h"
#include "platform_description.h"
void tfm_platform_hal_system_reset(void)
diff --git a/platform/ext/target/musca_a/plat_test.c b/platform/ext/target/musca_a/plat_test.c
index 5588bab..bf09254 100644
--- a/platform/ext/target/musca_a/plat_test.c
+++ b/platform/ext/target/musca_a/plat_test.c
@@ -1,12 +1,12 @@
/*
- * Copyright (c) 2019, Arm Limited. All rights reserved.
+ * Copyright (c) 2019-2020, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
*/
#include "timer_cmsdk_drv.h"
-#include "platform/include/tfm_plat_defs.h"
+#include "tfm_plat_defs.h"
#include "tfm_plat_test.h"
#include "device_definition.h"
diff --git a/platform/ext/target/musca_a/services/src/tfm_ioctl_ns_api.c b/platform/ext/target/musca_a/services/src/tfm_ioctl_ns_api.c
index 732802a..aaa4a76 100644
--- a/platform/ext/target/musca_a/services/src/tfm_ioctl_ns_api.c
+++ b/platform/ext/target/musca_a/services/src/tfm_ioctl_ns_api.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, Arm Limited. All rights reserved.
+ * Copyright (c) 2019-2020, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
@@ -7,7 +7,7 @@
#include <stdint.h>
#include "tfm_platform_api.h"
-#include "services/include/tfm_ioctl_api.h"
+#include "tfm_ioctl_api.h"
enum tfm_platform_err_t tfm_platform_gpio_init(uint32_t *result)
{
diff --git a/platform/ext/target/musca_a/services/src/tfm_ioctl_s_api.c b/platform/ext/target/musca_a/services/src/tfm_ioctl_s_api.c
index e744f39..46a5425 100644
--- a/platform/ext/target/musca_a/services/src/tfm_ioctl_s_api.c
+++ b/platform/ext/target/musca_a/services/src/tfm_ioctl_s_api.c
@@ -7,7 +7,7 @@
#include <stdint.h>
#include "tfm_platform_api.h"
-#include "services/include/tfm_ioctl_api.h"
+#include "tfm_ioctl_api.h"
__attribute__((section("SFN")))
enum tfm_platform_err_t tfm_platform_gpio_init(uint32_t *result)
diff --git a/platform/ext/target/musca_a/services/src/tfm_platform_system.c b/platform/ext/target/musca_a/services/src/tfm_platform_system.c
index 7faa0a8..e5c5088 100644
--- a/platform/ext/target/musca_a/services/src/tfm_platform_system.c
+++ b/platform/ext/target/musca_a/services/src/tfm_platform_system.c
@@ -6,12 +6,12 @@
*/
#include <stdbool.h>
-#include "platform/include/tfm_platform_system.h"
+#include "tfm_platform_system.h"
#include "platform_description.h"
#include "target_cfg.h"
#include "device_definition.h"
#include "psa/client.h"
-#include "services/include/tfm_ioctl_api.h"
+#include "tfm_ioctl_api.h"
void tfm_platform_hal_system_reset(void)
{
diff --git a/platform/ext/target/musca_a/spm_hal.c b/platform/ext/target/musca_a/spm_hal.c
index b38ed85..cf7fdb7 100644
--- a/platform/ext/target/musca_a/spm_hal.c
+++ b/platform/ext/target/musca_a/spm_hal.c
@@ -7,7 +7,7 @@
#include <stdio.h>
#include "cmsis.h"
-#include "platform/include/tfm_spm_hal.h"
+#include "tfm_spm_hal.h"
#include "tfm/spm_api.h"
#include "tfm/spm_db.h"
#include "tfm_platform_core_api.h"
diff --git a/platform/ext/target/musca_a/target_cfg.h b/platform/ext/target/musca_a/target_cfg.h
index dfbed39..4b28a48 100644
--- a/platform/ext/target/musca_a/target_cfg.h
+++ b/platform/ext/target/musca_a/target_cfg.h
@@ -17,7 +17,7 @@
#ifndef __TARGET_CFG_H__
#define __TARGET_CFG_H__
-#include "platform/ext/common/uart_stdout.h"
+#include "uart_stdout.h"
#include "tfm_peripherals_def.h"
#include "uart_pl011_drv.h"
diff --git a/platform/ext/target/musca_b1/Device/Source/device_definition.c b/platform/ext/target/musca_b1/Device/Source/device_definition.c
index 303e41f..90899d4 100644
--- a/platform/ext/target/musca_b1/Device/Source/device_definition.c
+++ b/platform/ext/target/musca_b1/Device/Source/device_definition.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017-2019 Arm Limited. All rights reserved.
+ * Copyright (c) 2017-2020 Arm Limited. All rights reserved.
*
* Licensed under the Apache License Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@
#include "device_cfg.h"
#include "device_definition.h"
#include "platform_base_address.h"
-#include "platform/include/tfm_plat_defs.h"
+#include "tfm_plat_defs.h"
/* ======= Peripheral configuration structure definitions ======= */
/* MUSCA B1 SCC driver structures */
diff --git a/platform/ext/target/musca_b1/attest_hal.c b/platform/ext/target/musca_b1/attest_hal.c
index c2f5c52..8f74644 100644
--- a/platform/ext/target/musca_b1/attest_hal.c
+++ b/platform/ext/target/musca_b1/attest_hal.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018-2019, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2020, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
@@ -7,9 +7,9 @@
#include <stddef.h>
#include <stdint.h>
-#include "platform/include/tfm_attest_hal.h"
-#include "platform/include/tfm_plat_boot_seed.h"
-#include "platform/include/tfm_plat_device_id.h"
+#include "tfm_attest_hal.h"
+#include "tfm_plat_boot_seed.h"
+#include "tfm_plat_device_id.h"
#ifdef CRYPTO_HW_ACCELERATOR
#include "crypto_hw.h"
diff --git a/platform/ext/target/musca_b1/crypto_keys.c b/platform/ext/target/musca_b1/crypto_keys.c
index e34f2be..2f34d8e 100644
--- a/platform/ext/target/musca_b1/crypto_keys.c
+++ b/platform/ext/target/musca_b1/crypto_keys.c
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#include "platform/include/tfm_plat_crypto_keys.h"
-#include "platform/include/tfm_attest_hal.h"
+#include "tfm_plat_crypto_keys.h"
+#include "tfm_attest_hal.h"
#include <stddef.h>
#include "psa/crypto_types.h"
#include "crypto_hw.h"
diff --git a/platform/ext/target/musca_b1/plat_test.c b/platform/ext/target/musca_b1/plat_test.c
index bfbe227..55f6a8b 100644
--- a/platform/ext/target/musca_b1/plat_test.c
+++ b/platform/ext/target/musca_b1/plat_test.c
@@ -1,12 +1,12 @@
/*
- * Copyright (c) 2019, Arm Limited. All rights reserved.
+ * Copyright (c) 2019-2020, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
*/
#include "timer_cmsdk_drv.h"
-#include "platform/include/tfm_plat_defs.h"
+#include "tfm_plat_defs.h"
#include "tfm_plat_test.h"
#include "device_definition.h"
diff --git a/platform/ext/target/musca_b1/services/src/tfm_ioctl_ns_api.c b/platform/ext/target/musca_b1/services/src/tfm_ioctl_ns_api.c
index 81605a6..31b6e86 100644
--- a/platform/ext/target/musca_b1/services/src/tfm_ioctl_ns_api.c
+++ b/platform/ext/target/musca_b1/services/src/tfm_ioctl_ns_api.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, Arm Limited. All rights reserved.
+ * Copyright (c) 2019-2020, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
@@ -8,7 +8,7 @@
#include <stdint.h>
#include <stdbool.h>
#include "tfm_platform_api.h"
-#include "services/include/tfm_ioctl_api.h"
+#include "tfm_ioctl_api.h"
enum tfm_platform_err_t
tfm_platform_set_pin_alt_func(uint32_t alt_func, uint64_t pin_mask,
diff --git a/platform/ext/target/musca_b1/services/src/tfm_ioctl_s_api.c b/platform/ext/target/musca_b1/services/src/tfm_ioctl_s_api.c
index 4472bf5..b191305 100644
--- a/platform/ext/target/musca_b1/services/src/tfm_ioctl_s_api.c
+++ b/platform/ext/target/musca_b1/services/src/tfm_ioctl_s_api.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2019, Arm Limited. All rights reserved.
+ * Copyright (c) 2019-2020, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
@@ -8,7 +8,7 @@
#include <stdint.h>
#include <stdbool.h>
#include "tfm_platform_api.h"
-#include "services/include/tfm_ioctl_api.h"
+#include "tfm_ioctl_api.h"
__attribute__((section("SFN")))
enum tfm_platform_err_t
diff --git a/platform/ext/target/musca_b1/services/src/tfm_platform_system.c b/platform/ext/target/musca_b1/services/src/tfm_platform_system.c
index 76c983d..44b5b92 100644
--- a/platform/ext/target/musca_b1/services/src/tfm_platform_system.c
+++ b/platform/ext/target/musca_b1/services/src/tfm_platform_system.c
@@ -6,12 +6,12 @@
*/
#include <stdbool.h>
-#include "platform/include/tfm_platform_system.h"
+#include "tfm_platform_system.h"
#include "platform_description.h"
#include "target_cfg.h"
#include "device_definition.h"
#include "psa/client.h"
-#include "services/include/tfm_ioctl_api.h"
+#include "tfm_ioctl_api.h"
void tfm_platform_hal_system_reset(void)
{
diff --git a/platform/ext/target/musca_b1/spm_hal.c b/platform/ext/target/musca_b1/spm_hal.c
index 7b81a4e..6ed2caf 100644
--- a/platform/ext/target/musca_b1/spm_hal.c
+++ b/platform/ext/target/musca_b1/spm_hal.c
@@ -7,7 +7,7 @@
#include <stdio.h>
#include "cmsis.h"
-#include "platform/include/tfm_spm_hal.h"
+#include "tfm_spm_hal.h"
#include "tfm/spm_api.h"
#include "tfm/spm_db.h"
#include "tfm_platform_core_api.h"
diff --git a/platform/ext/target/musca_b1/target_cfg.h b/platform/ext/target/musca_b1/target_cfg.h
index c6bb82d..f5bb406 100644
--- a/platform/ext/target/musca_b1/target_cfg.h
+++ b/platform/ext/target/musca_b1/target_cfg.h
@@ -17,7 +17,7 @@
#ifndef __TARGET_CFG_H__
#define __TARGET_CFG_H__
-#include "platform/ext/common/uart_stdout.h"
+#include "uart_stdout.h"
#include "tfm_peripherals_def.h"
#include "uart_pl011_drv.h"
diff --git a/platform/ext/target/musca_s1/crypto_keys.c b/platform/ext/target/musca_s1/crypto_keys.c
index bb18ed2..cdab39f 100644
--- a/platform/ext/target/musca_s1/crypto_keys.c
+++ b/platform/ext/target/musca_s1/crypto_keys.c
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#include "platform/include/tfm_plat_crypto_keys.h"
-#include "platform/include/tfm_attest_hal.h"
+#include "tfm_plat_crypto_keys.h"
+#include "tfm_attest_hal.h"
#include <stddef.h>
#include "psa/crypto_types.h"
#include "crypto_hw.h"
diff --git a/platform/ext/target/musca_s1/plat_test.c b/platform/ext/target/musca_s1/plat_test.c
index bfbe227..55f6a8b 100644
--- a/platform/ext/target/musca_s1/plat_test.c
+++ b/platform/ext/target/musca_s1/plat_test.c
@@ -1,12 +1,12 @@
/*
- * Copyright (c) 2019, Arm Limited. All rights reserved.
+ * Copyright (c) 2019-2020, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
*/
#include "timer_cmsdk_drv.h"
-#include "platform/include/tfm_plat_defs.h"
+#include "tfm_plat_defs.h"
#include "tfm_plat_test.h"
#include "device_definition.h"
diff --git a/platform/ext/target/musca_s1/services/src/tfm_ioctl_ns_api.c b/platform/ext/target/musca_s1/services/src/tfm_ioctl_ns_api.c
index 432dc33..770e64d 100644
--- a/platform/ext/target/musca_s1/services/src/tfm_ioctl_ns_api.c
+++ b/platform/ext/target/musca_s1/services/src/tfm_ioctl_ns_api.c
@@ -8,7 +8,7 @@
#include <stdint.h>
#include <stdbool.h>
#include "tfm_platform_api.h"
-#include "services/include/tfm_ioctl_api.h"
+#include "tfm_ioctl_api.h"
enum tfm_platform_err_t tfm_platform_gpio_init(uint32_t *result)
{
diff --git a/platform/ext/target/musca_s1/services/src/tfm_ioctl_s_api.c b/platform/ext/target/musca_s1/services/src/tfm_ioctl_s_api.c
index a53fc16..031f6d5 100644
--- a/platform/ext/target/musca_s1/services/src/tfm_ioctl_s_api.c
+++ b/platform/ext/target/musca_s1/services/src/tfm_ioctl_s_api.c
@@ -8,7 +8,7 @@
#include <stdint.h>
#include <stdbool.h>
#include "tfm_platform_api.h"
-#include "services/include/tfm_ioctl_api.h"
+#include "tfm_ioctl_api.h"
__attribute__((section("SFN")))
enum tfm_platform_err_t tfm_platform_gpio_init(uint32_t *result)
diff --git a/platform/ext/target/musca_s1/services/src/tfm_platform_system.c b/platform/ext/target/musca_s1/services/src/tfm_platform_system.c
index 333fc1e..5b0400e 100644
--- a/platform/ext/target/musca_s1/services/src/tfm_platform_system.c
+++ b/platform/ext/target/musca_s1/services/src/tfm_platform_system.c
@@ -6,12 +6,12 @@
*/
#include <stdbool.h>
-#include "platform/include/tfm_platform_system.h"
+#include "tfm_platform_system.h"
#include "platform_description.h"
#include "target_cfg.h"
#include "device_definition.h"
#include "psa/client.h"
-#include "services/include/tfm_ioctl_api.h"
+#include "tfm_ioctl_api.h"
void tfm_platform_hal_system_reset(void)
{
diff --git a/platform/ext/target/musca_s1/spm_hal.c b/platform/ext/target/musca_s1/spm_hal.c
index b90fc46..bdb4803 100644
--- a/platform/ext/target/musca_s1/spm_hal.c
+++ b/platform/ext/target/musca_s1/spm_hal.c
@@ -7,7 +7,7 @@
#include <stdio.h>
#include "cmsis.h"
-#include "platform/include/tfm_spm_hal.h"
+#include "tfm_spm_hal.h"
#include "tfm/spm_api.h"
#include "tfm/spm_db.h"
#include "tfm_platform_core_api.h"
diff --git a/platform/ext/target/musca_s1/target_cfg.h b/platform/ext/target/musca_s1/target_cfg.h
index d42f305..2a718c2 100644
--- a/platform/ext/target/musca_s1/target_cfg.h
+++ b/platform/ext/target/musca_s1/target_cfg.h
@@ -17,7 +17,7 @@
#ifndef __TARGET_CFG_H__
#define __TARGET_CFG_H__
-#include "platform/ext/common/uart_stdout.h"
+#include "uart_stdout.h"
#include "tfm_peripherals_def.h"
#include "uart_pl011_drv.h"
diff --git a/platform/ext/target/nxp/lpcxpresso55s69/plat_test.c b/platform/ext/target/nxp/lpcxpresso55s69/plat_test.c
index 3fdf958..24c1cb2 100755
--- a/platform/ext/target/nxp/lpcxpresso55s69/plat_test.c
+++ b/platform/ext/target/nxp/lpcxpresso55s69/plat_test.c
@@ -1,11 +1,11 @@
/*
- * Copyright (c) 2019, Arm Limited. All rights reserved.
+ * Copyright (c) 2019-2020, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
*/
-#include "platform/include/tfm_plat_defs.h"
+#include "tfm_plat_defs.h"
#include "tfm_plat_test.h"
#include "device_definition.h"
#include "tfm_peripherals_def.h"
diff --git a/platform/ext/target/nxp/lpcxpresso55s69/services/src/tfm_platform_system.c b/platform/ext/target/nxp/lpcxpresso55s69/services/src/tfm_platform_system.c
index 59a558d..86a854b 100755
--- a/platform/ext/target/nxp/lpcxpresso55s69/services/src/tfm_platform_system.c
+++ b/platform/ext/target/nxp/lpcxpresso55s69/services/src/tfm_platform_system.c
@@ -1,11 +1,11 @@
/*
- * Copyright (c) 2018-2019, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2020, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
*/
-#include "platform/include/tfm_platform_system.h"
+#include "tfm_platform_system.h"
#include "platform_description.h"
#include "device_definition.h"
diff --git a/platform/ext/target/nxp/lpcxpresso55s69/spm_hal.c b/platform/ext/target/nxp/lpcxpresso55s69/spm_hal.c
index 09acc15..909cd1e 100755
--- a/platform/ext/target/nxp/lpcxpresso55s69/spm_hal.c
+++ b/platform/ext/target/nxp/lpcxpresso55s69/spm_hal.c
@@ -7,7 +7,7 @@
#include <stdio.h>
#include "cmsis.h"
-#include "platform/include/tfm_spm_hal.h"
+#include "tfm_spm_hal.h"
#include "tfm/spm_api.h"
#include "tfm/spm_db.h"
#include "tfm_platform_core_api.h"
diff --git a/platform/ext/target/nxp/lpcxpresso55s69/target_cfg.h b/platform/ext/target/nxp/lpcxpresso55s69/target_cfg.h
index 997e8bd..9b85938 100755
--- a/platform/ext/target/nxp/lpcxpresso55s69/target_cfg.h
+++ b/platform/ext/target/nxp/lpcxpresso55s69/target_cfg.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2018-2019 Arm Limited
+ * Copyright (c) 2018-2020 Arm Limited
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
#ifndef __TARGET_CFG_H__
#define __TARGET_CFG_H__
-#include "platform/ext/common/uart_stdout.h"
+#include "uart_stdout.h"
#include "tfm_peripherals_def.h"
#include "fsl_usart.h"
diff --git a/platform/ext/target/sse-200_aws/retarget/platform_retarget_dev.c b/platform/ext/target/sse-200_aws/retarget/platform_retarget_dev.c
index f8b4df3..162f272 100644
--- a/platform/ext/target/sse-200_aws/retarget/platform_retarget_dev.c
+++ b/platform/ext/target/sse-200_aws/retarget/platform_retarget_dev.c
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2016-2019 Arm Limited
+ * Copyright (c) 2016-2020 Arm Limited
*
* Licensed under the Apache License Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -26,7 +26,7 @@
#include "platform_retarget_dev.h"
#include "platform_retarget.h"
#include "system_cmsdk_sse-200_aws.h"
-#include "platform/include/tfm_plat_defs.h"
+#include "tfm_plat_defs.h"
/* ARM UART driver structures */
#ifdef UART0_CMSDK_S
diff --git a/platform/ext/target/sse-200_aws/services/src/tfm_platform_system.c b/platform/ext/target/sse-200_aws/services/src/tfm_platform_system.c
index 93ba614..44fafbc 100644
--- a/platform/ext/target/sse-200_aws/services/src/tfm_platform_system.c
+++ b/platform/ext/target/sse-200_aws/services/src/tfm_platform_system.c
@@ -1,11 +1,11 @@
/*
- * Copyright (c) 2018-2019, Arm Limited. All rights reserved.
+ * Copyright (c) 2018-2020, Arm Limited. All rights reserved.
*
* SPDX-License-Identifier: BSD-3-Clause
*
*/
-#include "platform/include/tfm_platform_system.h"
+#include "tfm_platform_system.h"
#include "cmsis.h"
void tfm_platform_hal_system_reset(void)
diff --git a/platform/ext/target/sse-200_aws/spm_hal.c b/platform/ext/target/sse-200_aws/spm_hal.c
index befb16f..bb58cdf 100644
--- a/platform/ext/target/sse-200_aws/spm_hal.c
+++ b/platform/ext/target/sse-200_aws/spm_hal.c
@@ -7,7 +7,7 @@
#include <stdio.h>
#include "cmsis.h"
-#include "platform/include/tfm_spm_hal.h"
+#include "tfm_spm_hal.h"
#include "tfm/spm_api.h"
#include "tfm/spm_db.h"
#include "tfm_platform_core_api.h"
diff --git a/platform/ext/target/sse-200_aws/target_cfg.h b/platform/ext/target/sse-200_aws/target_cfg.h
index d3f6ed7..ec598a8 100644
--- a/platform/ext/target/sse-200_aws/target_cfg.h
+++ b/platform/ext/target/sse-200_aws/target_cfg.h
@@ -17,7 +17,7 @@
#ifndef __TARGET_CFG_H__
#define __TARGET_CFG_H__
-#include "platform/ext/common/uart_stdout.h"
+#include "uart_stdout.h"
#include "tfm_peripherals_def.h"
#include "tfm_plat_defs.h"
#include "uart_cmsdk_drv.h"