commit f44f1602b72d934801742397c485eeb3d9806f26
author Andrew Walbran <qwandor@google.com> Tue May 30 14:59:19 2023 +0000
committer Andrew Walbran <qwandor@google.com> Thu Jun 01 14:57:04 2023 +0000
tree f316244c79780384f48c7864aebe07027a9600eb
parent 4dd2093850c70ac10ccef5c973fbc759ed7ab9bf

The psci crate was renamed to smccc. Use the new version.

Bug: 245889995
Test: m pvmfw
Change-Id: Ib61e46a6613c1fcfcf559d3672584b6e7b85cb7d

pvmfw/Android.bp

diff --git a/pvmfw/Android.bp b/pvmfw/Android.bp
index e5fdfe8..c9909e6 100644
--- a/pvmfw/Android.bp
+++ b/pvmfw/Android.bp
@@ -25,10 +25,10 @@
         "liblibfdt",
         "liblog_rust_nostd",
         "libonce_cell_nostd",
-        "libpsci",
         "libpvmfw_avb_nostd",
         "libpvmfw_embedded_key",
         "libpvmfw_fdt_template",
+        "libsmccc",
         "libstatic_assertions",
         "libtinyvec_nostd",
         "libuuid_nostd",

pvmfw/src/hvc.rs

diff --git a/pvmfw/src/hvc.rs b/pvmfw/src/hvc.rs
index 1e2bca2..e03c9d3 100644
--- a/pvmfw/src/hvc.rs
+++ b/pvmfw/src/hvc.rs
@@ -16,7 +16,7 @@
 
 pub mod trng;
 use self::trng::Error;
-use psci::smccc::{
+use smccc::{
     error::{positive_or_error_64, success_or_error_64},
     hvc64,
 };