From bb9733b9124fe7c9f64c9d1c6320bce68db09009 Mon Sep 17 00:00:00 2001
From: Valentin Thomazic <valentin.thomazic@thalesgroup.com>
Date: Mon, 13 Nov 2023 17:42:55 +0100
Subject: [PATCH] remove proxy kernel support

---
 README.md                  | 43 ++------------------------------------
 ci/install-riscvpk.sh      | 16 --------------
 corev_apu/tb/ariane_tb.cpp |  8 +------
 3 files changed, 3 insertions(+), 64 deletions(-)
 delete mode 100755 ci/install-riscvpk.sh

diff --git a/README.md b/README.md
index f988f5e1fc..9ed17d60d0 100644
--- a/README.md
+++ b/README.md
@@ -83,7 +83,6 @@ CVA6 User Documentation
       - [Prerequisites](#prerequisites)
       - [Environent setup](#environent-setup)
       - [Test execution](#test-execution)
-    - [Running User-Space Applications](#running-user-space-applications)
   - [Physical Implementation](#physical-implementation)
     - [ASIC Synthesis](#asic-synthesis)
     - [ASIC Gate Simulation with `core-v-verif` repository](#asic-gate-simulation-with-core-v-verif-repository)
@@ -220,46 +219,8 @@ bash verif/regress/dv-riscv-compliance.sh
 bash verif/regress/dv-riscv-tests.sh
 ```
 
-
-### Running User-Space Applications
-
-> :warning: **Warning**: this chapter needs to be updated. See Github issue https://github.com/openhwgroup/cva6/issues/1358.
-
-It is possible to run user-space binaries on CVA6 with ([RISC-V Proxy Kernel and Boot Loader](https://github.com/riscv/riscv-pk)).
-RISC-V PK can be installed by running: `./ci/install-riscvpk.sh`
-
-```
-mkdir build
-cd build
-../configure --prefix=$RISCV --host=riscv64-unknown-elf
-make
-make install
-```
-
-Then to run a RISC-V ELF using the Verilator model do:
-
-```
-echo '
-#include <stdio.h>
-
-int main(int argc, char const *argv[]) {
-    printf("Hello CVA6!\\n");
-    return 0;
-}' > hello.c
-riscv64-unknown-elf-gcc hello.c -o hello.elf
-```
-
-```
-make verilate
-work-ver/Variane_testharness $RISCV/riscv64-unknown-elf/bin/pk hello.elf
-```
-
-If you want to use QuestaSim to run it you can use the following command:
-```
-make sim elf-bin=$RISCV/riscv64-unknown-elf/bin/pk target-options=hello.elf  batch-mode=1
-```
-
-> Be patient! RTL simulation is way slower than Spike. If you think that you ran into problems you can inspect the trace files.
+You can run customs tests (.elf .S or .c) by following the example of the hello_world test in `verif/regress/smoke-test.sh`. \
+Please make sure to source `verif/regress/install-cva6.sh` and `verif/regress/install-riscv-dv.sh` since they set the environment to run tests.
 
 ## Physical Implementation
 
diff --git a/ci/install-riscvpk.sh b/ci/install-riscvpk.sh
deleted file mode 100755
index 73f476a020..0000000000
--- a/ci/install-riscvpk.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-set -e
-ROOT=$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)
-PATH=$RISCV/bin:/bin:$PATH
-
-cd $ROOT/tmp
-
-echo "Installing RISC-V Proxy Kernel and Boot Loader"
-git clone https://github.com/riscv-software-src/riscv-pk.git
-cd riscv-pk
-mkdir -p build
-cd build
-../configure --prefix=$RISCV --host=riscv64-unknown-elf
-make
-make install
diff --git a/corev_apu/tb/ariane_tb.cpp b/corev_apu/tb/ariane_tb.cpp
index 736f8974f9..0e4ff8fa77 100644
--- a/corev_apu/tb/ariane_tb.cpp
+++ b/corev_apu/tb/ariane_tb.cpp
@@ -111,13 +111,7 @@ EMULATOR DEBUG OPTIONS (only supported in debug build -- try `make debug`)\n",
 "  - run a bare metal test to generate an FST waveform:\n"
 "    %s -f rv64ui-p-add.fst $RISCV/riscv64-unknown-elf/share/riscv-tests/isa/rv64ui-p-add\n"
 #endif
-"  - run an ELF (you wrote, called 'hello') using the proxy kernel:\n"
-"    %s pk hello\n",
-         program_name, program_name, program_name
-#if VM_TRACE
-         , program_name, program_name
-#endif
-         );
+  , program_name, program_name);
 }
 
 // In case we use the DTM we do not want to use the JTAG