Fix to install rsictl directly from the git

Signed-off-by: Sangwan Kwon <sangwan.kwon@samsung.com>

Author: bitboom

.github/workflows/ci.yml

@@ -149,7 +149,7 @@ jobs:
     - name: Check local packages and all of its dependencies for errors
       run: >
         cargo check --workspace
-        --exclude islet_sdk --exclude rsictl
+        --exclude islet_sdk
         --exclude ciborium
         --exclude islet_mc_harnesses
 

.gitmodules

@@ -73,6 +73,3 @@
 [submodule "third-party/dtc"]
 	path = third-party/dtc
 	url = https://git.kernel.org/pub/scm/utils/dtc/dtc.git
-[submodule "tools/rsictl"]
-	path = tools/rsictl
-	url = https://github.com/islet-project/rsictl.git

Cargo.lock

@@ -11,7 +11,6 @@ members = [
     "realm/rsi-test",
     "rmm/",
     "sdk",
-    "tools/rsictl",
 ]
 
 [profile.dev]

Cargo.toml

@@ -7,8 +7,11 @@ export PATH := ${ROOT}/assets/toolchain/aarch64-none-linux-gnu/bin:${PATH}
 export CROSS_COMPILE := aarch64-none-linux-gnu-
 export ARCH := arm64
 
-CMDLINE = ${ROOT}/tools/rsictl
+CMDLINE = https://github.com/islet-project/rsictl.git
 HEADERS = rsi.h
+CONFIG_ARM = --config target.aarch64-unknown-linux-gnu.linker='"aarch64-none-linux-gnu-gcc"' \
+             --config target.aarch64-unknown-linux-gnu.rustflags='[ "-C", "target-feature=+crt-static" ]'
+TARGET_ARM = aarch64-unknown-linux-gnu
 
 obj-m += rsi.o
 
@@ -19,7 +22,7 @@ module: ${HEADERS}
 	cp rsi.ko ${SHARED_DIR}
 
 cmdline:
-	cargo install --path "${CMDLINE}" --root "${SHARED_DIR}" --target aarch64-unknown-linux-gnu
+	cargo install ${CONFIG_ARM} --git "${CMDLINE}" --root "${SHARED_DIR}" --target ${TARGET_ARM}
 
 clean:
 	make -C ${KERNEL_DIR} M=${HERE} clean

realm/linux-rsi/Makefile

@@ -7,4 +7,3 @@ ROOT=$(git rev-parse --show-toplevel)
 cd $ROOT && git submodule update --init --depth 1 assets
 git submodule update --init --depth 1 $ROOT/third-party/ciborium
 git submodule update --init --depth 1 $ROOT/third-party/coset
-git submodule update --init --depth 1 $ROOT/tools/rsictl

scripts/deps/assets.sh

@@ -12,7 +12,6 @@ git submodule update --init --depth 1 $ROOT/assets
 git submodule update --init --depth 1 $ROOT/third-party/tf-a
 git submodule update --init --depth 1 $ROOT/third-party/ciborium
 git submodule update --init --depth 1 $ROOT/third-party/coset
-git submodule update --init --depth 1 $ROOT/tools/rsictl
 
 # Install rust
 $HERE/deps/rust.sh

scripts/init_min.sh

@@ -13,7 +13,6 @@ git submodule update --init --depth 1 $ROOT/third-party/tf-a
 git submodule update --init --depth 1 $ROOT/third-party/cca-rmm-acs
 git submodule update --init --depth 1 $ROOT/third-party/ciborium
 git submodule update --init --depth 1 $ROOT/third-party/coset
-git submodule update --init --depth 1 $ROOT/tools/rsictl
 
 # Install rust (min)
 $HERE/deps/rust_min.sh