Skip to content
  • Peter Maydell's avatar
    f00f57f3
    Merge remote-tracking branch 'remotes/alistair/tags/pull-riscv-to-apply-20200910' into staging · f00f57f3
    Peter Maydell authored
    
    
    This PR includes multiple fixes and features for RISC-V:
     - Fixes a bug in printing trap causes
     - Allows 16-bit writes to the SiFive test device. This fixes the
       failure to reboot the RISC-V virt machine
     - Support for the Microchip PolarFire SoC and Icicle Kit
     - A reafactor of RISC-V code out of hw/riscv
    
    # gpg: Signature made Thu 10 Sep 2020 19:08:06 BST
    # gpg:                using RSA key F6C4AC46D4934868D3B8CE8F21E10D29DF977054
    # gpg: Good signature from "Alistair Francis <alistair@alistair23.me>" [full]
    # Primary key fingerprint: F6C4 AC46 D493 4868 D3B8  CE8F 21E1 0D29 DF97 7054
    
    * remotes/alistair/tags/pull-riscv-to-apply-20200910: (30 commits)
      hw/riscv: Sort the Kconfig options in alphabetical order
      hw/riscv: Drop CONFIG_SIFIVE
      hw/riscv: Always build riscv_hart.c
      hw/riscv: Move sifive_test model to hw/misc
      hw/riscv: Move sifive_uart model to hw/char
      hw/riscv: Move riscv_htif model to hw/char
      hw/riscv: Move sifive_plic model to hw/intc
      hw/riscv: Move sifive_clint model to hw/intc
      hw/riscv: Move sifive_gpio model to hw/gpio
      hw/riscv: Move sifive_u_otp model to hw/misc
      hw/riscv: Move sifive_u_prci model to hw/misc
      hw/riscv: Move sifive_e_prci model to hw/misc
      hw/riscv: sifive_u: Connect a DMA controller
      hw/riscv: clint: Avoid using hard-coded timebase frequency
      hw/riscv: microchip_pfsoc: Hook GPIO controllers
      hw/riscv: microchip_pfsoc: Connect 2 Cadence GEMs
      hw/arm: xlnx: Set all boards' GEM 'phy-addr' property value to 23
      hw/net: cadence_gem: Add a new 'phy-addr' property
      hw/riscv: microchip_pfsoc: Connect a DMA controller
      hw/dma: Add SiFive platform DMA controller emulation
      ...
    
    Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
    
    # Conflicts:
    #	hw/riscv/trace-events
    f00f57f3
    Merge remote-tracking branch 'remotes/alistair/tags/pull-riscv-to-apply-20200910' into staging
    Peter Maydell authored
    
    
    This PR includes multiple fixes and features for RISC-V:
     - Fixes a bug in printing trap causes
     - Allows 16-bit writes to the SiFive test device. This fixes the
       failure to reboot the RISC-V virt machine
     - Support for the Microchip PolarFire SoC and Icicle Kit
     - A reafactor of RISC-V code out of hw/riscv
    
    # gpg: Signature made Thu 10 Sep 2020 19:08:06 BST
    # gpg:                using RSA key F6C4AC46D4934868D3B8CE8F21E10D29DF977054
    # gpg: Good signature from "Alistair Francis <alistair@alistair23.me>" [full]
    # Primary key fingerprint: F6C4 AC46 D493 4868 D3B8  CE8F 21E1 0D29 DF97 7054
    
    * remotes/alistair/tags/pull-riscv-to-apply-20200910: (30 commits)
      hw/riscv: Sort the Kconfig options in alphabetical order
      hw/riscv: Drop CONFIG_SIFIVE
      hw/riscv: Always build riscv_hart.c
      hw/riscv: Move sifive_test model to hw/misc
      hw/riscv: Move sifive_uart model to hw/char
      hw/riscv: Move riscv_htif model to hw/char
      hw/riscv: Move sifive_plic model to hw/intc
      hw/riscv: Move sifive_clint model to hw/intc
      hw/riscv: Move sifive_gpio model to hw/gpio
      hw/riscv: Move sifive_u_otp model to hw/misc
      hw/riscv: Move sifive_u_prci model to hw/misc
      hw/riscv: Move sifive_e_prci model to hw/misc
      hw/riscv: sifive_u: Connect a DMA controller
      hw/riscv: clint: Avoid using hard-coded timebase frequency
      hw/riscv: microchip_pfsoc: Hook GPIO controllers
      hw/riscv: microchip_pfsoc: Connect 2 Cadence GEMs
      hw/arm: xlnx: Set all boards' GEM 'phy-addr' property value to 23
      hw/net: cadence_gem: Add a new 'phy-addr' property
      hw/riscv: microchip_pfsoc: Connect a DMA controller
      hw/dma: Add SiFive platform DMA controller emulation
      ...
    
    Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
    
    # Conflicts:
    #	hw/riscv/trace-events
Loading