From 5315d7fac6399e2a99f396f6b56e395946cb4757 Mon Sep 17 00:00:00 2001
From: Liu Jiang <gerry@linux.alibaba.com>
Date: Sat, 5 Feb 2022 10:34:39 +0800
Subject: [PATCH] tdx-tdcall: minor cleanups

---
 Makefile              | 2 +-
 td-shim-ld/src/lib.rs | 5 +----
 tdx-tdcall/.gitignore | 7 -------
 3 files changed, 2 insertions(+), 12 deletions(-)
 delete mode 100644 tdx-tdcall/.gitignore

diff --git a/Makefile b/Makefile
index ac2899fc..b3422102 100644
--- a/Makefile
+++ b/Makefile
@@ -94,7 +94,7 @@ integration-check-%:
 	cargo xcheck --target ${TOPDIR}/devtools/rustc-targets/x86_64-custom.json -p $(patsubst integration-check-%,%,$@) ${BUILD_TYPE_FLAG}
 
 integration-test-%:
-	cargo xtest --target ${TOPDIR}/devtools/rustc-targets/x86_64-custom.json -p $(patsubst integration-test-%,%,$@) ${BUILD_TYPE_FLAG}
+	cargo xtest --target ./x86_64-custom.json -p $(patsubst integration-test-%,%,$@) ${BUILD_TYPE_FLAG}
 
 integration-clean-%:
 	cargo clean --target ${TOPDIR}/devtools/rustc-targets/x86_64-custom.json -p $(patsubst integration-clean-%,%,$@) ${BUILD_TYPE_FLAG}
diff --git a/td-shim-ld/src/lib.rs b/td-shim-ld/src/lib.rs
index 1ccb6343..6b5ce3d1 100644
--- a/td-shim-ld/src/lib.rs
+++ b/td-shim-ld/src/lib.rs
@@ -22,10 +22,7 @@ use td_layout::metadata::*;
 use td_layout::runtime::{
     TD_PAYLOAD_BASE, TD_PAYLOAD_PARAM_BASE, TD_PAYLOAD_PARAM_SIZE, TD_PAYLOAD_SIZE,
 };
-use uefi_pi::{
-    fv::*,
-    pi::{fv::*, hob::*},
-};
+use uefi_pi::pi::fv::*;
 
 const MAX_IPL_CONTENT_SIZE: usize =
     TD_SHIM_IPL_SIZE as usize - size_of::<IplFvHeaderByte>() - size_of::<ResetVectorHeader>();
diff --git a/tdx-tdcall/.gitignore b/tdx-tdcall/.gitignore
deleted file mode 100644
index 68ee1f28..00000000
--- a/tdx-tdcall/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-*~
-
-# Cargo Junk
-Cargo.lock
-target/
-*.o
-*.obj