commit 21d4a54bd11ad91f89dda66d6ca9accd955016ba
author Sandrine Afsa <sandrine.afsa@arm.com> Tue Jun 24 10:27:15 2025 +0200
committer Sandrine Afsa <sandrine.afsa@arm.com> Thu Jul 17 13:19:43 2025 +0000
tree df85cacbbccfe6ad136dfba945919626e04718e1
parent f1ce43f8ab03399aeeb2fe370d95e100ae456353

tf-a-next: cope with new RF-A tree layout

Since RF-A commit "chore(rust): move all RF-A files to the top
directory", the rust/ directory does not exist anymore. Update the
`build_package.sh` and static checks scripts to cope with that.

Signed-off-by: Sandrine Afsa <sandrine.afsa@arm.com>
Change-Id: I2bafffa5742119a6439a8902c0d486fcd30d8f18

script/next-checks/next-checks-cargo-doc.sh

diff --git a/script/next-checks/next-checks-cargo-doc.sh b/script/next-checks/next-checks-cargo-doc.sh
index 073953f..2ce29cf 100755
--- a/script/next-checks/next-checks-cargo-doc.sh
+++ b/script/next-checks/next-checks-cargo-doc.sh
@@ -19,7 +19,7 @@
 echo >> "$LOG_TEST_FILENAME"
 echo "Platforms:" >> "$LOG_TEST_FILENAME"
 
-available_platforms=$(make --silent -C ${TF_ROOT}/rust list_platforms)
+available_platforms=$(make --silent -C ${TF_ROOT} list_platforms)
 
 # Run cargo doc for all platforms
 for plat in $available_platforms
@@ -27,7 +27,7 @@
     echo >> $LOG_FILE
     echo "############### ${TEST_CASE} - platform: ${plat}" >> "$LOG_FILE"
     echo >> $LOG_FILE
-    make -C ${TF_ROOT}/rust PLAT=${plat} cargo-doc >> "$LOG_FILE" 2>&1
+    make -C ${TF_ROOT} PLAT=${plat} cargo-doc >> "$LOG_FILE" 2>&1
 
     if [ "$?" -ne 0 ]; then
         echo -e "  ${plat}\t: FAIL" >> "$LOG_TEST_FILENAME"

script/next-checks/next-checks-cargo-fmt.sh

diff --git a/script/next-checks/next-checks-cargo-fmt.sh b/script/next-checks/next-checks-cargo-fmt.sh
index 4db97c9..6adb58b 100755
--- a/script/next-checks/next-checks-cargo-fmt.sh
+++ b/script/next-checks/next-checks-cargo-fmt.sh
@@ -19,7 +19,7 @@
 
 EXIT_VALUE=0
 
-cargo fmt --manifest-path=${TF_ROOT}/rust/Cargo.toml --all -- --check  &> "$LOG_FILE"
+cargo fmt --all -- --check  &> "$LOG_FILE"
 
 if [ "$?" -ne 0 ]; then
     EXIT_VALUE=1

script/next-checks/next-checks-clippy.sh

diff --git a/script/next-checks/next-checks-clippy.sh b/script/next-checks/next-checks-clippy.sh
index 167bab9..e851abb 100755
--- a/script/next-checks/next-checks-clippy.sh
+++ b/script/next-checks/next-checks-clippy.sh
@@ -19,7 +19,7 @@
 echo >> "$LOG_TEST_FILENAME"
 echo "Platforms:" >> "$LOG_TEST_FILENAME"
 
-available_platforms=$(make --silent -C ${TF_ROOT}/rust list_platforms)
+available_platforms=$(make --silent -C ${TF_ROOT} list_platforms)
 
 # Run clippy for all platforms
 for plat in $available_platforms
@@ -27,7 +27,7 @@
     echo >> $LOG_FILE
     echo "############### ${TEST_CASE} - platform: ${plat}" >> "$LOG_FILE"
     echo >> $LOG_FILE
-    make -C ${TF_ROOT}/rust PLAT=${plat} clippy >> "$LOG_FILE" 2>&1
+    make -C ${TF_ROOT} PLAT=${plat} clippy >> "$LOG_FILE" 2>&1
 
     if [ "$?" -ne 0 ]; then
         echo -e "  ${plat}\t: FAIL" >> "$LOG_TEST_FILENAME"
@@ -41,7 +41,7 @@
 echo >> $LOG_FILE
 echo "############### ${TEST_CASE} - platform: tests" >> "$LOG_FILE"
 echo >> $LOG_FILE
-make -C ${TF_ROOT}/rust clippy-test >> "$LOG_FILE" 2>&1
+make -C ${TF_ROOT} clippy-test >> "$LOG_FILE" 2>&1
 
 if [ "$?" -ne 0 ]; then
     echo -e "  clippy-test\t: FAIL" >> "$LOG_TEST_FILENAME"

script/next-checks/next-checks-generic-tests.sh

diff --git a/script/next-checks/next-checks-generic-tests.sh b/script/next-checks/next-checks-generic-tests.sh
index 4774291..ab6167f 100755
--- a/script/next-checks/next-checks-generic-tests.sh
+++ b/script/next-checks/next-checks-generic-tests.sh
@@ -46,7 +46,6 @@
 # Run cargo test
 
 if [ "$REPO_NAME" == "trusted-firmware-a" ]; then
-  cd rust
   # These tests are platform independent. However, we are specifying a platform:
   #     The fvp platform is expected to cover all platform independent features that can be tested
   #     with cargo test.