Message ID | 1599129623-68957-12-git-send-email-bmeng.cn@gmail.com |
---|---|
State | New |
Headers | show |
Series | hw/riscv: Clean up the directory | expand |
On Thu, Sep 3, 2020 at 3:49 AM Bin Meng <bmeng.cn@gmail.com> wrote: > > From: Bin Meng <bin.meng@windriver.com> > > The name SIFIVE is too vague to convey the required component of > MSI_NONBROKEN. Let's drop the option, and select MSI_NONBROKEN in > each machine instead. > > Signed-off-by: Bin Meng <bin.meng@windriver.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > > hw/riscv/Kconfig | 14 +++++--------- > 1 file changed, 5 insertions(+), 9 deletions(-) > > diff --git a/hw/riscv/Kconfig b/hw/riscv/Kconfig > index 7d017bc..e152fdc 100644 > --- a/hw/riscv/Kconfig > +++ b/hw/riscv/Kconfig > @@ -1,13 +1,9 @@ > config IBEX > bool > > -config SIFIVE > - bool > - select MSI_NONBROKEN > - > config SIFIVE_E > bool > - select SIFIVE > + select MSI_NONBROKEN > select SIFIVE_CLINT > select SIFIVE_GPIO > select SIFIVE_PLIC > @@ -18,7 +14,7 @@ config SIFIVE_E > config SIFIVE_U > bool > select CADENCE > - select SIFIVE > + select MSI_NONBROKEN > select SIFIVE_CLINT > select SIFIVE_GPIO > select SIFIVE_PDMA > @@ -31,7 +27,7 @@ config SIFIVE_U > config SPIKE > bool > select HTIF > - select SIFIVE > + select MSI_NONBROKEN > select SIFIVE_CLINT > select SIFIVE_PLIC > > @@ -44,20 +40,20 @@ config RISCV_VIRT > bool > imply PCI_DEVICES > imply TEST_DEVICES > + select MSI_NONBROKEN > select PCI > select SERIAL > select GOLDFISH_RTC > select VIRTIO_MMIO > select PCI_EXPRESS_GENERIC_BRIDGE > select PFLASH_CFI01 > - select SIFIVE > select SIFIVE_CLINT > select SIFIVE_PLIC > select SIFIVE_TEST > > config MICROCHIP_PFSOC > bool > - select SIFIVE > + select MSI_NONBROKEN > select SIFIVE_CLINT > select UNIMP > select MCHP_PFSOC_MMUART > -- > 2.7.4 > >
diff --git a/hw/riscv/Kconfig b/hw/riscv/Kconfig index 7d017bc..e152fdc 100644 --- a/hw/riscv/Kconfig +++ b/hw/riscv/Kconfig @@ -1,13 +1,9 @@ config IBEX bool -config SIFIVE - bool - select MSI_NONBROKEN - config SIFIVE_E bool - select SIFIVE + select MSI_NONBROKEN select SIFIVE_CLINT select SIFIVE_GPIO select SIFIVE_PLIC @@ -18,7 +14,7 @@ config SIFIVE_E config SIFIVE_U bool select CADENCE - select SIFIVE + select MSI_NONBROKEN select SIFIVE_CLINT select SIFIVE_GPIO select SIFIVE_PDMA @@ -31,7 +27,7 @@ config SIFIVE_U config SPIKE bool select HTIF - select SIFIVE + select MSI_NONBROKEN select SIFIVE_CLINT select SIFIVE_PLIC @@ -44,20 +40,20 @@ config RISCV_VIRT bool imply PCI_DEVICES imply TEST_DEVICES + select MSI_NONBROKEN select PCI select SERIAL select GOLDFISH_RTC select VIRTIO_MMIO select PCI_EXPRESS_GENERIC_BRIDGE select PFLASH_CFI01 - select SIFIVE select SIFIVE_CLINT select SIFIVE_PLIC select SIFIVE_TEST config MICROCHIP_PFSOC bool - select SIFIVE + select MSI_NONBROKEN select SIFIVE_CLINT select UNIMP select MCHP_PFSOC_MMUART