diff --git a/xous-rs/assemble.ps1 b/xous-rs/assemble.ps1 deleted file mode 100644 index c2fda062d..000000000 --- a/xous-rs/assemble.ps1 +++ /dev/null @@ -1,19 +0,0 @@ -# remove existing blobs because otherwise this will append object files to the old blobs -New-Item -Type Directory -Name bin -Force | Out-Null -Remove-Item -Force bin/*.a | Out-Null - -$crate = "xous" - -riscv64-unknown-elf-gcc -ggdb3 -c -mabi=ilp32 -march=rv32imac src/asm.S -o bin/$crate.o -riscv64-unknown-elf-ar crs bin/riscv32imac-unknown-none-elf.a bin/$crate.o -riscv64-unknown-elf-ar crs bin/riscv32imac-unknown-xous.a bin/$crate.o -riscv64-unknown-elf-ar crs bin/riscv32imc-unknown-none-elf.a bin/$crate.o - -riscv64-unknown-elf-gcc -ggdb3 -c -mabi=ilp32 -march=rv32i src/asm.S -DSKIP_MULTICORE -o bin/$crate.o -riscv64-unknown-elf-ar crs bin/riscv32i-unknown-none-elf.a bin/$crate.o - -riscv64-unknown-elf-gcc -ggdb3 -c -mabi=lp64 -march=rv64imac src/asm.S -o bin/$crate.o -riscv64-unknown-elf-ar crs bin/riscv64imac-unknown-none-elf.a bin/$crate.o -riscv64-unknown-elf-ar crs bin/riscv64gc-unknown-none-elf.a bin/$crate.o - -Remove-Item bin/$crate.o diff --git a/xous-rs/assemble.sh b/xous-rs/assemble.sh deleted file mode 100755 index 55bdb58d3..000000000 --- a/xous-rs/assemble.sh +++ /dev/null @@ -1,55 +0,0 @@ -#!/usr/bin/env bash - -# SPDX-FileCopyrightText: 2020 Sean Cross -# SPDX-FileCopyrightText: 2023 Foundation Devices, Inc -# SPDX-License-Identifier: Apache-2.0 - -set -euxo pipefail - -crate=xous-kernel - -usage() { - echo "Usage: $0 [-a riscv]" - exit 1 -} - -while getopts "a:" o; do - case "${o}" in - a) - arch=$OPTARG - ;; - *) - usage - ;; - esac -done - -arch=${arch:-riscv} - -mkdir -p bin - -case $arch in - riscv) - # Remove existing blobs because otherwise this will append object - # files to the old blobs - rm -f bin/riscv*.a - - riscv-none-elf-gcc -ggdb3 -c -mabi=ilp32 -march=rv32imac src/arch/riscv/asm.S -o bin/$crate.o - ar crs bin/riscv32imac-unknown-none-elf.a bin/$crate.o - ar crs bin/riscv32imac-unknown-xous-elf.a bin/$crate.o - ar crs bin/riscv32imc-unknown-none-elf.a bin/$crate.o - - riscv-none-elf-gcc -ggdb3 -c -mabi=ilp32 -march=rv32i src/arch/riscv/asm.S -DSKIP_MULTICORE -o bin/$crate.o - ar crs bin/riscv32i-unknown-none-elf.a bin/$crate.o - - riscv-none-elf-gcc -ggdb3 -c -mabi=lp64 -march=rv64imac src/arch/riscv/asm.S -o bin/$crate.o - ar crs bin/riscv64imac-unknown-none-elf.a bin/$crate.o - ar crs bin/riscv64gc-unknown-none-elf.a bin/$crate.o - ;; - - default) - usage - ;; -esac - -rm bin/$crate.o diff --git a/xous-rs/bin/riscv32i-unknown-none-elf.a b/xous-rs/bin/riscv32i-unknown-none-elf.a deleted file mode 100644 index 375cab9f4..000000000 Binary files a/xous-rs/bin/riscv32i-unknown-none-elf.a and /dev/null differ diff --git a/xous-rs/bin/riscv32imac-unknown-none-elf.a b/xous-rs/bin/riscv32imac-unknown-none-elf.a deleted file mode 100644 index ed5d527b8..000000000 Binary files a/xous-rs/bin/riscv32imac-unknown-none-elf.a and /dev/null differ diff --git a/xous-rs/bin/riscv32imac-unknown-xous-elf.a b/xous-rs/bin/riscv32imac-unknown-xous-elf.a deleted file mode 100644 index ed5d527b8..000000000 Binary files a/xous-rs/bin/riscv32imac-unknown-xous-elf.a and /dev/null differ diff --git a/xous-rs/bin/riscv32imc-unknown-none-elf.a b/xous-rs/bin/riscv32imc-unknown-none-elf.a deleted file mode 100644 index ed5d527b8..000000000 Binary files a/xous-rs/bin/riscv32imc-unknown-none-elf.a and /dev/null differ diff --git a/xous-rs/bin/riscv64gc-unknown-none-elf.a b/xous-rs/bin/riscv64gc-unknown-none-elf.a deleted file mode 100644 index a31bf4b25..000000000 Binary files a/xous-rs/bin/riscv64gc-unknown-none-elf.a and /dev/null differ diff --git a/xous-rs/bin/riscv64imac-unknown-none-elf.a b/xous-rs/bin/riscv64imac-unknown-none-elf.a deleted file mode 100644 index a31bf4b25..000000000 Binary files a/xous-rs/bin/riscv64imac-unknown-none-elf.a and /dev/null differ diff --git a/xous-rs/build.rs b/xous-rs/build.rs index 0e1ebcfd5..d071d8c54 100644 --- a/xous-rs/build.rs +++ b/xous-rs/build.rs @@ -8,17 +8,5 @@ fn main() { let target = env::var("TARGET").unwrap(); let name = env::var("CARGO_PKG_NAME").unwrap(); - if target.starts_with("riscv") { - fs::copy( - format!("bin/{}.a", target), - out_dir.join(format!("lib{}.a", name)), - ) - .expect("couldn't find asm support library for target platform"); - - println!("cargo:rustc-link-lib=static={}", name); - println!("cargo:rustc-link-search={}", out_dir.display()); - println!("cargo:rerun-if-changed=bin/{}.a", target); - } - println!("cargo:rerun-if-changed=build.rs"); } diff --git a/xous-rs/src/arch/riscv/mod.rs b/xous-rs/src/arch/riscv/mod.rs index 48a2e2a1a..1c0b0e748 100644 --- a/xous-rs/src/arch/riscv/mod.rs +++ b/xous-rs/src/arch/riscv/mod.rs @@ -321,5 +321,9 @@ extern "C" { } pub fn cache_flush() { - unsafe { riscv_cache_flush() }; + unsafe { + asm!( + "fence" + ) + }; }