From 6d56e39649808696b2321cbd200dd7ccaa7ef7fe Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Tue, 11 Dec 2018 22:37:36 +0000 Subject: hw/riscv/virt: Connect the gpex PCIe Connect the gpex PCIe device based on the device tree included in the HiFive Unleashed ROM. Signed-off-by: Alistair Francis Signed-off-by: Logan Gunthorpe Reviewed-by: Logan Gunthorpe Tested-by: Guenter Roeck Tested-by: Andrea Bolognani Signed-off-by: Palmer Dabbelt --- default-configs/riscv32-softmmu.mak | 5 ++++- default-configs/riscv64-softmmu.mak | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) (limited to 'default-configs') diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-softmmu.mak index 7937c69e22..c5ea36cba5 100644 --- a/default-configs/riscv32-softmmu.mak +++ b/default-configs/riscv32-softmmu.mak @@ -1,7 +1,10 @@ # Default configuration for riscv-softmmu +include pci.mak + CONFIG_SERIAL=y CONFIG_VIRTIO_MMIO=y -include virtio.mak CONFIG_CADENCE=y + +CONFIG_PCI_GENERIC=y diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/riscv64-softmmu.mak index 7937c69e22..c5ea36cba5 100644 --- a/default-configs/riscv64-softmmu.mak +++ b/default-configs/riscv64-softmmu.mak @@ -1,7 +1,10 @@ # Default configuration for riscv-softmmu +include pci.mak + CONFIG_SERIAL=y CONFIG_VIRTIO_MMIO=y -include virtio.mak CONFIG_CADENCE=y + +CONFIG_PCI_GENERIC=y -- cgit v1.2.3-55-g7522 From a9a0c2d1235a25049ceddb666dec66ba3f59a791 Mon Sep 17 00:00:00 2001 From: Alistair Francis Date: Tue, 11 Dec 2018 22:37:46 +0000 Subject: riscv: Enable VGA and PCIE_VGA Enable compile support for VGA devices. This allows the user to conenct a display by adding '-device bochs-display -display sdl' to their command line argument. Signed-off-by: Alistair Francis Reviewed-by: Logan Gunthorpe Tested-by: Andrea Bolognani Signed-off-by: Palmer Dabbelt --- default-configs/riscv32-softmmu.mak | 3 +++ default-configs/riscv64-softmmu.mak | 3 +++ 2 files changed, 6 insertions(+) (limited to 'default-configs') diff --git a/default-configs/riscv32-softmmu.mak b/default-configs/riscv32-softmmu.mak index c5ea36cba5..dbc9398284 100644 --- a/default-configs/riscv32-softmmu.mak +++ b/default-configs/riscv32-softmmu.mak @@ -8,3 +8,6 @@ CONFIG_VIRTIO_MMIO=y CONFIG_CADENCE=y CONFIG_PCI_GENERIC=y + +CONFIG_VGA=y +CONFIG_VGA_PCI=y diff --git a/default-configs/riscv64-softmmu.mak b/default-configs/riscv64-softmmu.mak index c5ea36cba5..dbc9398284 100644 --- a/default-configs/riscv64-softmmu.mak +++ b/default-configs/riscv64-softmmu.mak @@ -8,3 +8,6 @@ CONFIG_VIRTIO_MMIO=y CONFIG_CADENCE=y CONFIG_PCI_GENERIC=y + +CONFIG_VGA=y +CONFIG_VGA_PCI=y -- cgit v1.2.3-55-g7522