From 1de1889e43f816b3cb6c3a55677f642c633958d2 Mon Sep 17 00:00:00 2001 From: ZhaoXi Date: Fri, 8 Mar 2024 16:10:32 +0800 Subject: [PATCH] test for sdk pr and update README --- README.md | 3 +++ run_openeuler.sh | 15 +-------------- sdk | 2 +- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 748cf65cc..b700657f6 100644 --- a/README.md +++ b/README.md @@ -78,6 +78,9 @@ For example, download the OKL-5.10 in current directory, and compile with pengla For oe versions greater than 23, you can access the source code after [Run openEuler with Penglai Supports](#run-openeuler-with-penglai-supports) and don't need to compile the image like in the previous step for version $\lt$ 23. ### Build OpenSBI (with Penglai supports) + +If you want to use **opensbi 0.9 or 1.0**, you need to use the previous version of the penglai-enclave-driver, the corresponding commit is [bb5021cd9f76d033d6e174b2b96bbc4503766385](https://github.com/Penglai-Enclave/Penglai-Enclave-sPMP/tree/bb5021cd9f76d033d6e174b2b96bbc4503766385). And you can use the latest penglai-enclave-driver to support opensbi-1.2. + **For openEuler version $\lt$ 23:** When compiling opensbi-0.9/1.0, you can use the toolchain `CROSS_COMPILE=/home/penglai/toolchain-720/bin/riscv64-unkown-linux-gnu-`. For opensbi-1.2, you can use `CROSS_COMPILE=riscv64-unknown-linux-gnu-`. diff --git a/run_openeuler.sh b/run_openeuler.sh index 7ebf1758c..15852b495 100755 --- a/run_openeuler.sh +++ b/run_openeuler.sh @@ -41,20 +41,7 @@ while getopts ":k:o:" opt; do esac done -if (($kernel_version == 2003)) -then - imagepath=openEuler-2003-qemu-riscv64.qcow2 -elif (($kernel_version == 2303)) -then - imagepath=openEuler-2303-qemu-riscv64.qcow2 -elif (($kernel_version == 2309)) -then - imagepath=openEuler-2309-qemu-riscv64.qcow2 -else - echo "Invalid kernel version: $kernel_version" >&2 - print_usage - exit 1 -fi +imagepath=openEuler-$kernel_version-qemu-riscv64.qcow2 if [ $(echo "$opensbi_version == 0.9" | bc -l) -eq 1 ] then diff --git a/sdk b/sdk index e7412efd9..ec441a1d1 160000 --- a/sdk +++ b/sdk @@ -1 +1 @@ -Subproject commit e7412efd971e3ceafbaeb6491727be6ab7db91af +Subproject commit ec441a1d116d665a1b228b9c15d77ca1a1bbf0d9