Skip to content

Commit 171199f

Browse files
committed
Merge remote-tracking branch 'remotes/alistair/tags/pull-riscv-to-apply-20200619-3' into staging
This is a range of patches for RISC-V. Some key points are: - Generalise the CPU init functions - Support the SiFive revB machine - Improvements to the Hypervisor implementation and error checking - Connect some OpenTitan devices - Changes to the sifive_u machine to support U-boot v2: - Fix missing realise assert # gpg: Signature made Fri 19 Jun 2020 17:34:34 BST # gpg: using RSA key F6C4AC46D4934868D3B8CE8F21E10D29DF977054 # gpg: Good signature from "Alistair Francis <[email protected]>" [full] # Primary key fingerprint: F6C4 AC46 D493 4868 D3B8 CE8F 21E1 0D29 DF97 7054 * remotes/alistair/tags/pull-riscv-to-apply-20200619-3: (32 commits) hw/riscv: sifive_u: Add a dummy DDR memory controller device hw/riscv: sifive_u: Sort the SoC memmap table entries hw/riscv: sifive_u: Support different boot source per MSEL pin state hw/riscv: sifive: Change SiFive E/U CPU reset vector to 0x1004 target/riscv: Rename IBEX CPU init routine hw/riscv: sifive_u: Add a new property msel for MSEL pin state hw/riscv: sifive_u: Rename serial property get/set functions to a generic name hw/riscv: sifive_u: Add reset functionality hw/riscv: sifive_gpio: Do not blindly trigger output IRQs hw/riscv: sifive_u: Hook a GPIO controller hw/riscv: sifive_gpio: Add a new 'ngpio' property hw/riscv: sifive_gpio: Clean up the codes hw/riscv: sifive_u: Generate device tree node for OTP hw/riscv: sifive_u: Simplify the GEM IRQ connect code a little bit hw/riscv: opentitan: Remove the riscv_ prefix of the machine* and soc* functions hw/riscv: sifive_e: Remove the riscv_ prefix of the machine* and soc* functions target/riscv: Use a smaller guess size for no-MMU PMP riscv/opentitan: Connect the UART device riscv/opentitan: Connect the PLIC device hw/intc: Initial commit of lowRISC Ibex PLIC ... Signed-off-by: Peter Maydell <[email protected]>
2 parents bae31bf + 3eaea6e commit 171199f

26 files changed

+1350
-182
lines changed

MAINTAINERS

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1250,7 +1250,11 @@ M: Alistair Francis <[email protected]>
12501250
12511251
S: Supported
12521252
F: hw/riscv/opentitan.c
1253+
F: hw/char/ibex_uart.c
1254+
F: hw/intc/ibex_plic.c
12531255
F: include/hw/riscv/opentitan.h
1256+
F: include/hw/char/ibex_uart.h
1257+
F: include/hw/intc/ibex_plic.h
12541258

12551259
SH4 Machines
12561260
------------

hw/char/Makefile.objs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ common-obj-$(CONFIG_VIRTIO_SERIAL) += virtio-console.o
1212
common-obj-$(CONFIG_XILINX) += xilinx_uartlite.o
1313
common-obj-$(CONFIG_XEN) += xen_console.o
1414
common-obj-$(CONFIG_CADENCE) += cadence_uart.o
15+
common-obj-$(CONFIG_IBEX) += ibex_uart.o
1516

1617
common-obj-$(CONFIG_EXYNOS4) += exynos4210_uart.o
1718
common-obj-$(CONFIG_COLDFIRE) += mcf_uart.o

0 commit comments

Comments
 (0)