spm: create new groups to test spm/hafnium
Following three set of tests are created to test spm/hafnium:
- spm-l1-build-tests
- spm-l2-boot-tests
- spm-l3-boot-tests
Change-Id: I394ed7f62c85bb21c3db3dc35c0dd99df4c9d402
Signed-off-by: Olivier Deprez <olivier.deprez@arm.com>
Signed-off-by: Manish Pandey <manish.pandey2@arm.com>
diff --git a/group/tf-l2-boot-tests-spm/fvp-optee-as-spm,fvp-default:fvp-spm.optee b/group/spm-l1-build-tests/fvp-default,fvp-default,fvp-default:nil
similarity index 100%
copy from group/tf-l2-boot-tests-spm/fvp-optee-as-spm,fvp-default:fvp-spm.optee
copy to group/spm-l1-build-tests/fvp-default,fvp-default,fvp-default:nil
diff --git a/group/tf-l2-boot-tests-spm/fvp-optee-as-spm,fvp-default:fvp-spm.optee b/group/spm-l1-build-tests/fvp-default,fvp-default:nil
similarity index 100%
copy from group/tf-l2-boot-tests-spm/fvp-optee-as-spm,fvp-default:fvp-spm.optee
copy to group/spm-l1-build-tests/fvp-default,fvp-default:nil
diff --git a/group/tf-l2-boot-tests-spm/fvp-optee-as-spm,fvp-default:fvp-spm.optee b/group/spm-l1-build-tests/fvp-default:nil
similarity index 100%
copy from group/tf-l2-boot-tests-spm/fvp-optee-as-spm,fvp-default:fvp-spm.optee
copy to group/spm-l1-build-tests/fvp-default:nil
diff --git a/group/tf-l2-boot-tests-spm/fvp-optee-as-spm,fvp-default:fvp-spm.optee b/group/spm-l2-boot-tests/fvp-default,fvp-optee-as-spm,fvp-default:fvp-spm.optee
similarity index 100%
rename from group/tf-l2-boot-tests-spm/fvp-optee-as-spm,fvp-default:fvp-spm.optee
rename to group/spm-l2-boot-tests/fvp-default,fvp-optee-as-spm,fvp-default:fvp-spm.optee
diff --git a/group/tf-l2-boot-tests-spm/fvp-spm,fvp-default:fvp-spm b/group/spm-l2-boot-tests/fvp-default,fvp-spm,fvp-default:fvp-spm
similarity index 100%
rename from group/tf-l2-boot-tests-spm/fvp-spm,fvp-default:fvp-spm
rename to group/spm-l2-boot-tests/fvp-default,fvp-spm,fvp-default:fvp-spm
diff --git a/group/tf-l2-boot-tests-spm/fvp-spm-optee-sp,fvp-default:fvp-spm.optee.sp b/group/spm-l2-boot-tests/fvp-default,fvp-spm-optee-sp,fvp-default:fvp-spm.optee.sp
similarity index 100%
rename from group/tf-l2-boot-tests-spm/fvp-spm-optee-sp,fvp-default:fvp-spm.optee.sp
rename to group/spm-l2-boot-tests/fvp-default,fvp-spm-optee-sp,fvp-default:fvp-spm.optee.sp
diff --git a/group/tf-l2-boot-tests-spm/fvp-spm-tbb,fvp-default:fvp-spm b/group/spm-l2-boot-tests/fvp-default,fvp-spm-tbb,fvp-default:fvp-spm
similarity index 100%
rename from group/tf-l2-boot-tests-spm/fvp-spm-tbb,fvp-default:fvp-spm
rename to group/spm-l2-boot-tests/fvp-default,fvp-spm-tbb,fvp-default:fvp-spm
diff --git a/group/tf-l2-boot-tests-spm/fvp-spm-tbb-dualroot,fvp-default:fvp-spm b/group/spm-l2-boot-tests/fvp-default,fvp-spm-tbb-dualroot,fvp-default:fvp-spm
similarity index 100%
rename from group/tf-l2-boot-tests-spm/fvp-spm-tbb-dualroot,fvp-default:fvp-spm
rename to group/spm-l2-boot-tests/fvp-default,fvp-spm-tbb-dualroot,fvp-default:fvp-spm
diff --git a/group/tf-l3-boot-tests-spm/fvp-spm,fvp-default:fvp-spm.linux b/group/spm-l3-boot-tests/fvp-default,fvp-spm,fvp-default:fvp-spm.linux
similarity index 100%
rename from group/tf-l3-boot-tests-spm/fvp-spm,fvp-default:fvp-spm.linux
rename to group/spm-l3-boot-tests/fvp-default,fvp-spm,fvp-default:fvp-spm.linux
diff --git a/group/tf-l3-boot-tests-spm/fvp-spm-rst-bl31,fvp-default:fvp-spm.rstbl31 b/group/spm-l3-boot-tests/fvp-default,fvp-spm-rst-bl31,fvp-default:fvp-spm.rstbl31
similarity index 100%
rename from group/tf-l3-boot-tests-spm/fvp-spm-rst-bl31,fvp-default:fvp-spm.rstbl31
rename to group/spm-l3-boot-tests/fvp-default,fvp-spm-rst-bl31,fvp-default:fvp-spm.rstbl31
diff --git a/group/tf-l1-build-fvp/fvp-spm,fvp-default:nil b/group/tf-l1-build-fvp/fvp-spm,fvp-default:nil
deleted file mode 100644
index d824d67..0000000
--- a/group/tf-l1-build-fvp/fvp-spm,fvp-default:nil
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright (c) 2020, Arm Limited. All rights reserved.
-#
-# SPDX-License-Identifier: BSD-3-Clause
-#
-
-#
-# To build SP packages in TF-A we need to build FIP.
-# The resulting FIP has valid SP Packages mentioned in SP_LAYOUT_FILE but
-# dummy BL33 and BL32.
-#
-post_tf_build() {
- # Create non-empty dummy images to include in the FIP.
- local dummy_file="$(mktempfile)"
- echo "hello world" > "$dummy_file"
-
- build_fip BL33="$dummy_file" BL32="$dummy_file"
-}
diff --git a/spm_config/fvp-default b/spm_config/fvp-default
new file mode 100644
index 0000000..7d8d20b
--- /dev/null
+++ b/spm_config/fvp-default
@@ -0,0 +1 @@
+PROJECT=reference