| Message ID | 20181020212443.4935-2-mark.corbin@embecosm.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/2] arch: add support for RISC-V 32-bit (riscv32) architecture | expand |
Le 20/10/2018 à 23:24, Mark Corbin a écrit : > Add RISC-V 32-bit defconfig for QEMU virt machine. > > Tested with QEMU 2.12.1 > Reviewed-by: Romain Naour <romain.naour@gmail.com> Tested-by: Romain Naour <romain.naour@gmail.com> Best regards, Romain > Signed-off-by: Mark Corbin <mark.corbin@embecosm.com> > --- > board/qemu/riscv32-virt/linux.config | 23 +++++++++++++++++++++++ > board/qemu/riscv32-virt/readme.txt | 7 +++++++ > configs/qemu_riscv32_virt_defconfig | 24 ++++++++++++++++++++++++ > 3 files changed, 54 insertions(+) > create mode 100644 board/qemu/riscv32-virt/linux.config > create mode 100644 board/qemu/riscv32-virt/readme.txt > create mode 100644 configs/qemu_riscv32_virt_defconfig > > diff --git a/board/qemu/riscv32-virt/linux.config b/board/qemu/riscv32-virt/linux.config > new file mode 100644 > index 0000000000..c25583f768 > --- /dev/null > +++ b/board/qemu/riscv32-virt/linux.config > @@ -0,0 +1,23 @@ > +CONFIG_ARCH_RV32I=y > +CONFIG_SMP=y > +CONFIG_NR_CPUS=8 > +CONFIG_PCI=y > +CONFIG_SYSVIPC=y > +CONFIG_NET=y > +CONFIG_PACKET=y > +CONFIG_UNIX=y > +CONFIG_INET=y > +# CONFIG_WIRELESS is not set > +CONFIG_VIRTIO_BLK=y > +CONFIG_NETDEVICES=y > +CONFIG_VIRTIO_NET=y > +# CONFIG_ETHERNET is not set > +# CONFIG_WLAN is not set > +CONFIG_SERIAL_8250=y > +CONFIG_SERIAL_8250_CONSOLE=y > +CONFIG_SERIAL_OF_PLATFORM=y > +CONFIG_VIRT_DRIVERS=y > +CONFIG_VIRTIO_MMIO=y > +CONFIG_EXT2_FS=y > +CONFIG_EXT4_FS=y > +CONFIG_TMPFS=y > diff --git a/board/qemu/riscv32-virt/readme.txt b/board/qemu/riscv32-virt/readme.txt > new file mode 100644 > index 0000000000..2da99580e5 > --- /dev/null > +++ b/board/qemu/riscv32-virt/readme.txt > @@ -0,0 +1,7 @@ > +Run the emulation with: > + > + qemu-system-riscv32 -M virt -kernel output/images/bbl -append "root=/dev/vda ro console=ttyS0" -drive file=output/images/rootfs.ext2,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 -netdev user,id=net0 -device virtio-net-device,netdev=net0 -nographic > + > +The login prompt will appear in the terminal that started Qemu. > + > +Tested with QEMU 2.12.1 > diff --git a/configs/qemu_riscv32_virt_defconfig b/configs/qemu_riscv32_virt_defconfig > new file mode 100644 > index 0000000000..aec85e4639 > --- /dev/null > +++ b/configs/qemu_riscv32_virt_defconfig > @@ -0,0 +1,24 @@ > +# Architecture > +BR2_riscv=y > + > +# System > +BR2_SYSTEM_DHCP="eth0" > + > +# Filesystem > +BR2_TARGET_ROOTFS_EXT2=y > +BR2_TARGET_GENERIC_GETTY=y > +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" > + > +# Linux headers same as kernel, a 4.15 series > +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y > + > +# Kernel > +BR2_LINUX_KERNEL=y > +BR2_LINUX_KERNEL_CUSTOM_GIT=y > +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/riscv/riscv-linux.git" > +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="fe92d7905c6ea0ebeabeb725b8040754ede7c220" > +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y > +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/riscv32-virt/linux.config" > + > +# Bootloader > +BR2_TARGET_RISCV_PK=y >
diff --git a/board/qemu/riscv32-virt/linux.config b/board/qemu/riscv32-virt/linux.config new file mode 100644 index 0000000000..c25583f768 --- /dev/null +++ b/board/qemu/riscv32-virt/linux.config @@ -0,0 +1,23 @@ +CONFIG_ARCH_RV32I=y +CONFIG_SMP=y +CONFIG_NR_CPUS=8 +CONFIG_PCI=y +CONFIG_SYSVIPC=y +CONFIG_NET=y +CONFIG_PACKET=y +CONFIG_UNIX=y +CONFIG_INET=y +# CONFIG_WIRELESS is not set +CONFIG_VIRTIO_BLK=y +CONFIG_NETDEVICES=y +CONFIG_VIRTIO_NET=y +# CONFIG_ETHERNET is not set +# CONFIG_WLAN is not set +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_OF_PLATFORM=y +CONFIG_VIRT_DRIVERS=y +CONFIG_VIRTIO_MMIO=y +CONFIG_EXT2_FS=y +CONFIG_EXT4_FS=y +CONFIG_TMPFS=y diff --git a/board/qemu/riscv32-virt/readme.txt b/board/qemu/riscv32-virt/readme.txt new file mode 100644 index 0000000000..2da99580e5 --- /dev/null +++ b/board/qemu/riscv32-virt/readme.txt @@ -0,0 +1,7 @@ +Run the emulation with: + + qemu-system-riscv32 -M virt -kernel output/images/bbl -append "root=/dev/vda ro console=ttyS0" -drive file=output/images/rootfs.ext2,format=raw,id=hd0 -device virtio-blk-device,drive=hd0 -netdev user,id=net0 -device virtio-net-device,netdev=net0 -nographic + +The login prompt will appear in the terminal that started Qemu. + +Tested with QEMU 2.12.1 diff --git a/configs/qemu_riscv32_virt_defconfig b/configs/qemu_riscv32_virt_defconfig new file mode 100644 index 0000000000..aec85e4639 --- /dev/null +++ b/configs/qemu_riscv32_virt_defconfig @@ -0,0 +1,24 @@ +# Architecture +BR2_riscv=y + +# System +BR2_SYSTEM_DHCP="eth0" + +# Filesystem +BR2_TARGET_ROOTFS_EXT2=y +BR2_TARGET_GENERIC_GETTY=y +BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" + +# Linux headers same as kernel, a 4.15 series +BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y + +# Kernel +BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_GIT=y +BR2_LINUX_KERNEL_CUSTOM_REPO_URL="https://github.com/riscv/riscv-linux.git" +BR2_LINUX_KERNEL_CUSTOM_REPO_VERSION="fe92d7905c6ea0ebeabeb725b8040754ede7c220" +BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/riscv32-virt/linux.config" + +# Bootloader +BR2_TARGET_RISCV_PK=y
Add RISC-V 32-bit defconfig for QEMU virt machine. Tested with QEMU 2.12.1 Signed-off-by: Mark Corbin <mark.corbin@embecosm.com> --- board/qemu/riscv32-virt/linux.config | 23 +++++++++++++++++++++++ board/qemu/riscv32-virt/readme.txt | 7 +++++++ configs/qemu_riscv32_virt_defconfig | 24 ++++++++++++++++++++++++ 3 files changed, 54 insertions(+) create mode 100644 board/qemu/riscv32-virt/linux.config create mode 100644 board/qemu/riscv32-virt/readme.txt create mode 100644 configs/qemu_riscv32_virt_defconfig