Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
120 changes: 0 additions & 120 deletions patch/keystone/0001-CMake-Add-support-for-modern-CMake.patch

This file was deleted.

This file was deleted.

18 changes: 9 additions & 9 deletions scripts/install_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,19 @@ if { [ -e /etc/os-release ] && OS_RELEASE="/etc/os-release"; } || \
if [ "${VERSION_ID}" = "24.04" ]; then
apt install cmake g++ gcc git libasio-dev libelf-dev libepoxy-dev \
libglib2.0-dev libjpeg-dev libpixman-1-dev libsdl2-dev \
libslirp-dev libasio-dev libvirglrenderer-dev meson \
libslirp-dev libasio-dev libvirglrenderer-dev lld llvm meson \
ninja-build ocl-icd-opencl-dev python3 python3-dev \
python3-venv
elif [ "${VERSION_ID}" = "22.04" ]; then
apt install cmake g++ gcc git libasio-dev libelf-dev libepoxy-dev \
libglib2.0-dev libjpeg-dev libpixman-1-dev libsdl2-dev \
libslirp-dev libasio-dev libvirglrenderer-dev meson \
libslirp-dev libasio-dev libvirglrenderer-dev lld llvm meson \
ninja-build ocl-icd-opencl-dev python3 python3-dev \
python3-tomli python3-venv
elif [ "${VERSION_ID}" = "20.04" ]; then
apt install cmake g++ gcc git libasio-dev libelf-dev libepoxy-dev \
libglib2.0-dev libjpeg-dev libpixman-1-dev libsdl2-dev \
libslirp-dev libasio-dev libvirglrenderer-dev meson \
libslirp-dev libasio-dev libvirglrenderer-dev lld llvm meson \
ninja-build ocl-icd-opencl-dev python3 python3-dev \
python3-pip python3-venv
pip install --user tomli
Expand All @@ -45,8 +45,8 @@ if { [ -e /etc/os-release ] && OS_RELEASE="/etc/os-release"; } || \

# Pacboy handle package prefixes automatically
pacboy -S --noconfirm --needed \
toolchain cmake gtk3 libnfs libssh meson ninja pixman pkgconf \
python python-pexpect SDL2 zstd libelf asio libslirp
toolchain cmake gtk3 libnfs libssh lld llvm meson ninja pixman \
pkgconf python python-pexpect SDL2 zstd libelf asio libslirp
fi
else
case "$(uname)" in
Expand All @@ -55,12 +55,12 @@ else
readonly MAJOR_VERSION

if [ "${MAJOR_VERSION}" = "26" ]; then
brew install asio bison cmake jpeg libelf libslirp meson ninja \
python3 sdl2
brew install asio bison cmake jpeg libelf libslirp lld llvm \
meson ninja python3 sdl2
pip install --user numpy pexpect
elif [ "${MAJOR_VERSION}" = "15" ]; then
brew install asio bison cmake jpeg libelf libslirp meson ninja \
python3 sdl2
brew install asio bison cmake jpeg libelf libslirp lld llvm \
meson ninja python3 sdl2
pip install --user numpy pexpect
else
unsupported_operating_system
Expand Down
2 changes: 1 addition & 1 deletion tests/components/uart/uart-ibex-biflow-stdio-test.cc
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ TEST_BENCH(TestUart, IbexStdioBackend)

for (std::string::iterator itr = str.begin(); itr != str.end(); ++itr) {
m_initiator_1.do_write(ibex_uart::REG_WDATA, *itr); // data
sc_core::wait(1, sc_core::SC_NS); // wait for txn transication
sc_core::wait(1, sc_core::SC_NS); // wait for txn transication
}

fflush(stdout);
Expand Down
Loading
Loading