hw/riscv: Move sifive_test model to hw/misc
This is an effort to clean up the hw/riscv directory. Ideally it should only contain the RISC-V SoC / machine codes plus generic codes. Let's move sifive_test model to hw/misc directory. Signed-off-by: Bin Meng <bin.meng@windriver.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Message-Id: <1599129623-68957-10-git-send-email-bmeng.cn@gmail.com> Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
This commit is contained in:
parent
b609b7e319
commit
a4b84608ba
|
@ -134,6 +134,9 @@ config MAC_VIA
|
||||||
config AVR_POWER
|
config AVR_POWER
|
||||||
bool
|
bool
|
||||||
|
|
||||||
|
config SIFIVE_TEST
|
||||||
|
bool
|
||||||
|
|
||||||
config SIFIVE_E_PRCI
|
config SIFIVE_E_PRCI
|
||||||
bool
|
bool
|
||||||
|
|
||||||
|
|
|
@ -22,6 +22,7 @@ softmmu_ss.add(when: 'CONFIG_ARM11SCU', if_true: files('arm11scu.c'))
|
||||||
softmmu_ss.add(when: 'CONFIG_MOS6522', if_true: files('mos6522.c'))
|
softmmu_ss.add(when: 'CONFIG_MOS6522', if_true: files('mos6522.c'))
|
||||||
|
|
||||||
# RISC-V devices
|
# RISC-V devices
|
||||||
|
softmmu_ss.add(when: 'CONFIG_SIFIVE_TEST', if_true: files('sifive_test.c'))
|
||||||
softmmu_ss.add(when: 'CONFIG_SIFIVE_E_PRCI', if_true: files('sifive_e_prci.c'))
|
softmmu_ss.add(when: 'CONFIG_SIFIVE_E_PRCI', if_true: files('sifive_e_prci.c'))
|
||||||
softmmu_ss.add(when: 'CONFIG_SIFIVE_U_OTP', if_true: files('sifive_u_otp.c'))
|
softmmu_ss.add(when: 'CONFIG_SIFIVE_U_OTP', if_true: files('sifive_u_otp.c'))
|
||||||
softmmu_ss.add(when: 'CONFIG_SIFIVE_U_PRCI', if_true: files('sifive_u_prci.c'))
|
softmmu_ss.add(when: 'CONFIG_SIFIVE_U_PRCI', if_true: files('sifive_u_prci.c'))
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
#include "qemu/module.h"
|
#include "qemu/module.h"
|
||||||
#include "sysemu/runstate.h"
|
#include "sysemu/runstate.h"
|
||||||
#include "hw/hw.h"
|
#include "hw/hw.h"
|
||||||
#include "hw/riscv/sifive_test.h"
|
#include "hw/misc/sifive_test.h"
|
||||||
|
|
||||||
static uint64_t sifive_test_read(void *opaque, hwaddr addr, unsigned int size)
|
static uint64_t sifive_test_read(void *opaque, hwaddr addr, unsigned int size)
|
||||||
{
|
{
|
|
@ -61,6 +61,7 @@ config RISCV_VIRT
|
||||||
select SIFIVE
|
select SIFIVE
|
||||||
select SIFIVE_CLINT
|
select SIFIVE_CLINT
|
||||||
select SIFIVE_PLIC
|
select SIFIVE_PLIC
|
||||||
|
select SIFIVE_TEST
|
||||||
|
|
||||||
config MICROCHIP_PFSOC
|
config MICROCHIP_PFSOC
|
||||||
bool
|
bool
|
||||||
|
|
|
@ -4,7 +4,6 @@ riscv_ss.add(files('numa.c'))
|
||||||
riscv_ss.add(when: 'CONFIG_HART', if_true: files('riscv_hart.c'))
|
riscv_ss.add(when: 'CONFIG_HART', if_true: files('riscv_hart.c'))
|
||||||
riscv_ss.add(when: 'CONFIG_OPENTITAN', if_true: files('opentitan.c'))
|
riscv_ss.add(when: 'CONFIG_OPENTITAN', if_true: files('opentitan.c'))
|
||||||
riscv_ss.add(when: 'CONFIG_RISCV_VIRT', if_true: files('virt.c'))
|
riscv_ss.add(when: 'CONFIG_RISCV_VIRT', if_true: files('virt.c'))
|
||||||
riscv_ss.add(when: 'CONFIG_SIFIVE', if_true: files('sifive_test.c'))
|
|
||||||
riscv_ss.add(when: 'CONFIG_SIFIVE_E', if_true: files('sifive_e.c'))
|
riscv_ss.add(when: 'CONFIG_SIFIVE_E', if_true: files('sifive_e.c'))
|
||||||
riscv_ss.add(when: 'CONFIG_SIFIVE_U', if_true: files('sifive_u.c'))
|
riscv_ss.add(when: 'CONFIG_SIFIVE_U', if_true: files('sifive_u.c'))
|
||||||
riscv_ss.add(when: 'CONFIG_SPIKE', if_true: files('spike.c'))
|
riscv_ss.add(when: 'CONFIG_SPIKE', if_true: files('spike.c'))
|
||||||
|
|
|
@ -30,12 +30,12 @@
|
||||||
#include "hw/char/serial.h"
|
#include "hw/char/serial.h"
|
||||||
#include "target/riscv/cpu.h"
|
#include "target/riscv/cpu.h"
|
||||||
#include "hw/riscv/riscv_hart.h"
|
#include "hw/riscv/riscv_hart.h"
|
||||||
#include "hw/riscv/sifive_test.h"
|
|
||||||
#include "hw/riscv/virt.h"
|
#include "hw/riscv/virt.h"
|
||||||
#include "hw/riscv/boot.h"
|
#include "hw/riscv/boot.h"
|
||||||
#include "hw/riscv/numa.h"
|
#include "hw/riscv/numa.h"
|
||||||
#include "hw/intc/sifive_clint.h"
|
#include "hw/intc/sifive_clint.h"
|
||||||
#include "hw/intc/sifive_plic.h"
|
#include "hw/intc/sifive_plic.h"
|
||||||
|
#include "hw/misc/sifive_test.h"
|
||||||
#include "chardev/char.h"
|
#include "chardev/char.h"
|
||||||
#include "sysemu/arch_init.h"
|
#include "sysemu/arch_init.h"
|
||||||
#include "sysemu/device_tree.h"
|
#include "sysemu/device_tree.h"
|
||||||
|
|
Loading…
Reference in a new issue