commit 79d8208f6783b7a7df6452cde73e10f660b952a1
author Raef Coles <raef.coles@arm.com> Thu Jan 07 15:42:38 2021 +0000
committer Kevin Peng <kevin.peng@arm.com> Tue Jan 19 07:26:49 2021 +0000
tree e4845571103a19740de279abf9cbcb8bed0c357a
parent e38a4841b846597197cf488b540eb7d2f666be6c

Platform: Add linker script for LVL1 and LVL2

Instead of generating from template. Also, update the macros used to
place symbols into a particular sections to match the new linker scripts.

Change-Id: I7b0f14687ba0bb4e6d2f1ffdfe70030738bfbec3
Signed-off-by: Raef Coles <raef.coles@arm.com>

platform/include/tfm_plat_test.h

diff --git a/platform/include/tfm_plat_test.h b/platform/include/tfm_plat_test.h
index 513134d..58bc6e0 100644
--- a/platform/include/tfm_plat_test.h
+++ b/platform/include/tfm_plat_test.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Arm Limited. All rights reserved.
+ * Copyright (c) 2019-2021, Arm Limited. All rights reserved.
  *
  * SPDX-License-Identifier: BSD-3-Clause
  *
@@ -13,13 +13,13 @@
 /**
  * \brief Busy wait until the user presses a specific button
  */
-TFM_LINK_SET_RO_IN_PARTITION_SECTION("TFM_SP_CORE_TEST")
+TFM_LINK_SET_RO_IN_PARTITION_SECTION("TFM_SP_CORE_TEST", "PSA-ROT")
 void tfm_plat_test_wait_user_button_pressed(void);
 
 /**
  * \brief Busy wait until the user releases a specific button
  */
-TFM_LINK_SET_RO_IN_PARTITION_SECTION("TFM_SP_CORE_TEST")
+TFM_LINK_SET_RO_IN_PARTITION_SECTION("TFM_SP_CORE_TEST", "PSA-ROT")
 void tfm_plat_test_wait_user_button_released(void);
 
 /**
@@ -27,7 +27,7 @@
  *
  * \return Returns the current status of LEDs
  */
-TFM_LINK_SET_RO_IN_PARTITION_SECTION("TFM_SP_CORE_TEST")
+TFM_LINK_SET_RO_IN_PARTITION_SECTION("TFM_SP_CORE_TEST", "PSA-ROT")
 uint32_t tfm_plat_test_get_led_status(void);
 
 /**
@@ -35,7 +35,7 @@
  *
  * \param[in]  status  The status to be set
  */
-TFM_LINK_SET_RO_IN_PARTITION_SECTION("TFM_SP_CORE_TEST")
+TFM_LINK_SET_RO_IN_PARTITION_SECTION("TFM_SP_CORE_TEST", "PSA-ROT")
 void tfm_plat_test_set_led_status(uint32_t status);
 
 /**
@@ -43,7 +43,7 @@
  *
  * \return Returns the mask of the LEDs used for testing
  */
-TFM_LINK_SET_RO_IN_PARTITION_SECTION("TFM_SP_CORE_TEST")
+TFM_LINK_SET_RO_IN_PARTITION_SECTION("TFM_SP_CORE_TEST", "PSA-ROT")
 uint32_t tfm_plat_test_get_userled_mask(void);
 
 /**
@@ -54,13 +54,13 @@
  * the timer should be long enough so that the test service can go to the state
  * where it starts waiting for the interrupt.
  */
-TFM_LINK_SET_RO_IN_PARTITION_SECTION("TFM_IRQ_TEST_1")
+TFM_LINK_SET_RO_IN_PARTITION_SECTION("TFM_IRQ_TEST_1", "APP-ROT")
 void tfm_plat_test_secure_timer_start(void);
 
 /**
  * \brief Stops the Secure timer and clears the timer interrupt.
  */
-TFM_LINK_SET_RO_IN_PARTITION_SECTION("TFM_IRQ_TEST_1")
+TFM_LINK_SET_RO_IN_PARTITION_SECTION("TFM_IRQ_TEST_1", "APP-ROT")
 void tfm_plat_test_secure_timer_stop(void);
 
 /**