Skip to content

Commit 87fd289

Browse files
committed
Revert "Add a disabled builder for riscv64 rva23 emulated tests"
This reverts commit 289688c.
1 parent 93a8c1d commit 87fd289

File tree

4 files changed

+1
-189
lines changed

4 files changed

+1
-189
lines changed

src/ci/docker/host-x86_64/disabled/riscv64a23-gnu/Dockerfile

Lines changed: 0 additions & 108 deletions
This file was deleted.

src/ci/docker/host-x86_64/disabled/riscv64a23-gnu/linux.config

Lines changed: 0 additions & 51 deletions
This file was deleted.

src/tools/build-manifest/src/main.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ static HOSTS: &[&str] = &[
4040
"powerpc64le-unknown-linux-gnu",
4141
"powerpc64le-unknown-linux-musl",
4242
"riscv64gc-unknown-linux-gnu",
43-
"riscv64a23-unknown-linux-gnu",
4443
"s390x-unknown-linux-gnu",
4544
"sparcv9-sun-solaris",
4645
"x86_64-apple-darwin",
@@ -156,7 +155,6 @@ static TARGETS: &[&str] = &[
156155
"riscv64gc-unknown-none-elf",
157156
"riscv64gc-unknown-linux-gnu",
158157
"riscv64gc-unknown-linux-musl",
159-
"riscv64a23-unknown-linux-gnu",
160158
"s390x-unknown-linux-gnu",
161159
"sparc64-unknown-linux-gnu",
162160
"sparcv9-sun-solaris",

src/tools/remote-test-client/src/main.rs

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -111,9 +111,7 @@ fn prepare_rootfs(target: &str, rootfs: &Path, server: &Path, rootfs_img: &Path)
111111
"arm-unknown-linux-gnueabihf" | "aarch64-unknown-linux-gnu" => {
112112
prepare_rootfs_cpio(rootfs, rootfs_img)
113113
}
114-
"riscv64a23-unknown-linux-gnu" | "riscv64gc-unknown-linux-gnu" => {
115-
prepare_rootfs_ext4(rootfs, rootfs_img)
116-
}
114+
"riscv64gc-unknown-linux-gnu" => prepare_rootfs_ext4(rootfs, rootfs_img),
117115
_ => panic!("{} is not supported", target),
118116
}
119117
}
@@ -236,31 +234,6 @@ fn start_qemu_emulator(target: &str, rootfs: &Path, server: &Path, tmpdir: &Path
236234
.arg(&format!("file={},format=raw,id=hd0", &rootfs_img.to_string_lossy()));
237235
t!(cmd.spawn());
238236
}
239-
"riscv64a23-unknown-linux-gnu" => {
240-
let mut cmd = Command::new("qemu-system-riscv64");
241-
cmd.arg("-nographic")
242-
.arg("-machine")
243-
.arg("virt")
244-
.arg("-cpu")
245-
.arg("rva23s64")
246-
.arg("-m")
247-
.arg("1024")
248-
.arg("-bios")
249-
.arg("/tmp/fw_jump.bin")
250-
.arg("-kernel")
251-
.arg("/tmp/Image")
252-
.arg("-append")
253-
.arg("quiet console=ttyS0 root=/dev/vda rw")
254-
.arg("-netdev")
255-
.arg("user,id=net0,hostfwd=tcp::12345-:12345")
256-
.arg("-device")
257-
.arg("virtio-net-device,netdev=net0,mac=00:00:00:00:00:00")
258-
.arg("-device")
259-
.arg("virtio-blk-device,drive=hd0")
260-
.arg("-drive")
261-
.arg(&format!("file={},format=raw,id=hd0,if=none", &rootfs_img.to_string_lossy()));
262-
t!(cmd.spawn());
263-
}
264237
_ => panic!("cannot start emulator for: {}", target),
265238
}
266239
}

0 commit comments

Comments
 (0)