@@ -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