diff --git a/services/cram-console/src/cmds.rs b/services/cram-console/src/cmds.rs
index 648c9fe9f..4de7d8102 100644
--- a/services/cram-console/src/cmds.rs
+++ b/services/cram-console/src/cmds.rs
@@ -86,7 +86,9 @@ use test::*;
 mod pddb_cmd;
 #[cfg(feature = "pddb")]
 use pddb_cmd::*;
+#[cfg(feature = "usb")]
 mod usb;
+#[cfg(feature = "usb")]
 use usb::*;
 mod mbox;
 use mbox::*;
@@ -98,6 +100,7 @@ pub struct CmdEnv {
     trng_cmd: TrngCmd,
     #[cfg(feature = "pddb")]
     pddb_cmd: PddbCmd,
+    #[cfg(feature = "usb")]
     usb_cmd: Usb,
     mbox: Mbox,
 }
@@ -125,6 +128,7 @@ impl CmdEnv {
                 log::debug!("pddb");
                 PddbCmd::new(&xns)
             },
+            #[cfg(feature = "usb")]
             usb_cmd: {
                 log::debug!("usb");
                 Usb::new()
@@ -151,6 +155,7 @@ impl CmdEnv {
             &mut console_cmd,
             #[cfg(feature = "pddb")]
             &mut self.pddb_cmd,
+            #[cfg(feature = "usb")]
             &mut self.usb_cmd,
             &mut self.mbox,
         ];
diff --git a/services/cram-console/src/cmds/mbox.rs b/services/cram-console/src/cmds/mbox.rs
index 6b81302e3..9d59319ed 100644
--- a/services/cram-console/src/cmds/mbox.rs
+++ b/services/cram-console/src/cmds/mbox.rs
@@ -363,6 +363,7 @@ impl<'a> ShellCmdApi<'a> for Mbox {
                 //   - on Precursor (100MHz): 27.60 seconds
                 //   - RV32 Daric (400MHz): 10.11 seconds (2.72x over Precursor)
                 //   - CM7 Daric (400MHz): 3.66 seconds (2.76x over RV32; 7.54x over Precursor)
+                #[cfg(feature = "gam")]
                 "clifford" => {
                     log::info!("prefill");
                     let prefill = unsafe { self.phys_mem.as_slice_mut() };