commit 4f0a470e67ec87069e35fd701f5db2fd7632023a
author Raef Coles <raef.coles@arm.com> Mon May 13 10:57:16 2024 +0100
committer Raef Coles <raef.coles@arm.com> Tue Jul 09 09:37:07 2024 +0100
tree e3c8ab5c21ecfff57362567b95e4785a50fdc9ee
parent b52543feb0d3de7498c48e857b3df8095d65ec0c

BL1: differentiate between BL1_1 and BL1_2 funcs

To prevent issues when linking

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

tests_reg/test/bl1/bl1_1/suites/integration/bl1_1_integration_tests.c

diff --git a/tests_reg/test/bl1/bl1_1/suites/integration/bl1_1_integration_tests.c b/tests_reg/test/bl1/bl1_1/suites/integration/bl1_1_integration_tests.c
index e7c8b27..0612b6a 100644
--- a/tests_reg/test/bl1/bl1_1/suites/integration/bl1_1_integration_tests.c
+++ b/tests_reg/test/bl1/bl1_1/suites/integration/bl1_1_integration_tests.c
@@ -24,7 +24,7 @@
 
     memset(bad_image, 0, BL1_2_CODE_SIZE);
 
-    FIH_CALL(validate_image_at_addr, fih_rc, bad_image);
+    FIH_CALL(bl1_1_validate_image_at_addr, fih_rc, bad_image);
     if (fih_eq(fih_rc, FIH_SUCCESS)) {
         TEST_FAIL("Bad image was successfully validated");
         return;
@@ -48,7 +48,7 @@
 
     bad_image[0] ^= 0xFF;
 
-    FIH_CALL(validate_image_at_addr, fih_rc, bad_image);
+    FIH_CALL(bl1_1_validate_image_at_addr, fih_rc, bad_image);
     if (fih_eq(fih_rc, FIH_SUCCESS)) {
         TEST_FAIL("Bad image was successfully validated");
         return;
@@ -71,7 +71,7 @@
 
     bad_image[BL1_2_CODE_SIZE - 1] ^= 0xFF;
 
-    FIH_CALL(validate_image_at_addr, fih_rc, bad_image);
+    FIH_CALL(bl1_1_validate_image_at_addr, fih_rc, bad_image);
     if (fih_eq(fih_rc, FIH_SUCCESS)) {
         TEST_FAIL("Bad image was successfully validated");
         return;

tests_reg/test/bl1/bl1_2/suites/integration/bl1_2_integration_tests.c

diff --git a/tests_reg/test/bl1/bl1_2/suites/integration/bl1_2_integration_tests.c b/tests_reg/test/bl1/bl1_2/suites/integration/bl1_2_integration_tests.c
index 4e8ec17..7a6e081 100644
--- a/tests_reg/test/bl1/bl1_2/suites/integration/bl1_2_integration_tests.c
+++ b/tests_reg/test/bl1/bl1_2/suites/integration/bl1_2_integration_tests.c
@@ -24,7 +24,7 @@
 
     FIH_CALL(copy_and_decrypt_image, fih_rc, 0);
     if (fih_eq(fih_rc, FIH_SUCCESS)) {
-        FIH_CALL(validate_image_at_addr, fih_rc, *image);
+        FIH_CALL(bl1_2_validate_image_at_addr, fih_rc, *image);
         if (fih_eq(fih_rc, FIH_SUCCESS)) {
             return 0;
         }
@@ -32,7 +32,7 @@
 
     FIH_CALL(copy_and_decrypt_image, fih_rc, 1);
     if (fih_eq(fih_rc, FIH_SUCCESS)) {
-        FIH_CALL(validate_image_at_addr, fih_rc, *image);
+        FIH_CALL(bl1_2_validate_image_at_addr, fih_rc, *image);
         if (fih_eq(fih_rc, FIH_SUCCESS)) {
             return 0;
         }
@@ -53,7 +53,7 @@
 
     memset(image, 0, sizeof(struct bl1_2_image_t));
 
-    FIH_CALL(validate_image_at_addr, fih_rc, image);
+    FIH_CALL(bl1_2_validate_image_at_addr, fih_rc, image);
     if (fih_eq(fih_rc, FIH_SUCCESS)) {
         TEST_FAIL("Bad image was successfully validated");
         return;
@@ -75,7 +75,7 @@
 
     image->protected_values.encrypted_data.data[0] ^= 0xFF;
 
-    FIH_CALL(validate_image_at_addr, fih_rc, image);
+    FIH_CALL(bl1_2_validate_image_at_addr, fih_rc, image);
     if (fih_eq(fih_rc, FIH_SUCCESS)) {
         TEST_FAIL("Bad image was successfully validated");
         return;
@@ -97,7 +97,7 @@
 
     image->protected_values.encrypted_data.data[IMAGE_BL2_CODE_SIZE - 1] ^= 0xFF;
 
-    FIH_CALL(validate_image_at_addr, fih_rc, image);
+    FIH_CALL(bl1_2_validate_image_at_addr, fih_rc, image);
     if (fih_eq(fih_rc, FIH_SUCCESS)) {
         TEST_FAIL("Bad image was successfully validated");
         return;
@@ -120,7 +120,7 @@
 
     image->protected_values.security_counter = 0;
 
-    FIH_CALL(validate_image_at_addr, fih_rc, image);
+    FIH_CALL(bl1_2_validate_image_at_addr, fih_rc, image);
     if (fih_eq(fih_rc, FIH_SUCCESS)) {
         TEST_FAIL("Bad image was successfully validated");
         return;