aboutsummaryrefslogtreecommitdiff
path: root/fwu
diff options
context:
space:
mode:
authorSandrine Bailleux <sandrine.bailleux@arm.com>2018-11-26 10:13:51 +0100
committerSandrine Bailleux <sandrine.bailleux@arm.com>2018-11-27 10:51:20 +0100
commit7d34d304a5115a167102aa165c6a41124b00205d (patch)
tree685e2e15323da617f07cda8f8db2eb73a26cf91e /fwu
parent13d99f95ae68104f4e97a58f6887c75863b4f502 (diff)
downloadtf-a-tests-7d34d304a5115a167102aa165c6a41124b00205d.tar.gz
Move BL1 SMC FIDs macros out of platform layer
BL1 SMC function IDs are not platform-specific so move them to a new generic header file, called bl1.h. Change-Id: I621483f7737f8101e9f370343e1a45a731c31c3b Signed-off-by: Sandrine Bailleux <sandrine.bailleux@arm.com>
Diffstat (limited to 'fwu')
-rw-r--r--fwu/ns_bl1u/ns_bl1u_main.c1
-rw-r--r--fwu/ns_bl1u/ns_bl1u_tests.c9
-rw-r--r--fwu/ns_bl2u/ns_bl2u_main.c1
3 files changed, 4 insertions, 7 deletions
diff --git a/fwu/ns_bl1u/ns_bl1u_main.c b/fwu/ns_bl1u/ns_bl1u_main.c
index 46c22636..4a15e860 100644
--- a/fwu/ns_bl1u/ns_bl1u_main.c
+++ b/fwu/ns_bl1u/ns_bl1u_main.c
@@ -6,6 +6,7 @@
#include <arch_helpers.h>
#include <assert.h>
+#include <bl1.h>
#include <debug.h>
#include <errno.h>
#include <image_loader.h>
diff --git a/fwu/ns_bl1u/ns_bl1u_tests.c b/fwu/ns_bl1u/ns_bl1u_tests.c
index 082439a9..16ae2591 100644
--- a/fwu/ns_bl1u/ns_bl1u_tests.c
+++ b/fwu/ns_bl1u/ns_bl1u_tests.c
@@ -9,6 +9,7 @@
* BL1.
******************************************************************************/
+#include <bl1.h>
#include <debug.h>
#include <errno.h>
#include <io_fip.h>
@@ -18,12 +19,6 @@
#include <tftf.h>
#include <tftf_lib.h>
-/* Expected number of SMC calls supported in BL1 */
-#define BL1_NUM_SMC_CALLS 11
-
-/* Expected version of BL1 SMC implementation */
-#define BL1_SMC_VER_VALUE 1
-
typedef struct {
/* Description to print before sending the SMC */
const char *description;
@@ -49,7 +44,7 @@ static const ns_bl1u_test_t tests[] = {
{
.description = "BL1_SMC_VERSION",
.args = { BL1_SMC_VERSION, 0, 0, 0, 0 },
- .expect = BL1_SMC_VER_VALUE,
+ .expect = BL1_VERSION,
},
{
diff --git a/fwu/ns_bl2u/ns_bl2u_main.c b/fwu/ns_bl2u/ns_bl2u_main.c
index 815859de..babcf93e 100644
--- a/fwu/ns_bl2u/ns_bl2u_main.c
+++ b/fwu/ns_bl2u/ns_bl2u_main.c
@@ -5,6 +5,7 @@
*/
#include <arch_helpers.h>
+#include <bl1.h>
#include <debug.h>
#include <firmware_image_package.h>
#include <fwu_nvm.h>