[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 10/12] hw/riscv: Always build riscv_hart.c
|
From: |
Bin Meng |
|
Subject: |
[PATCH 10/12] hw/riscv: Always build riscv_hart.c |
|
Date: |
Thu, 3 Sep 2020 18:40:21 +0800 |
From: Bin Meng <bin.meng@windriver.com>
Every RISC-V machine needs riscv_hart hence there is no need to
have a dedicated Kconfig option for it. Drop the Kconfig option
and always build riscv_hart.c.
Signed-off-by: Bin Meng <bin.meng@windriver.com>
---
hw/riscv/Kconfig | 9 ---------
hw/riscv/meson.build | 2 +-
2 files changed, 1 insertion(+), 10 deletions(-)
diff --git a/hw/riscv/Kconfig b/hw/riscv/Kconfig
index 8e07100..7d017bc 100644
--- a/hw/riscv/Kconfig
+++ b/hw/riscv/Kconfig
@@ -1,6 +1,3 @@
-config HART
- bool
-
config IBEX
bool
@@ -10,7 +7,6 @@ config SIFIVE
config SIFIVE_E
bool
- select HART
select SIFIVE
select SIFIVE_CLINT
select SIFIVE_GPIO
@@ -22,7 +18,6 @@ config SIFIVE_E
config SIFIVE_U
bool
select CADENCE
- select HART
select SIFIVE
select SIFIVE_CLINT
select SIFIVE_GPIO
@@ -35,7 +30,6 @@ config SIFIVE_U
config SPIKE
bool
- select HART
select HTIF
select SIFIVE
select SIFIVE_CLINT
@@ -44,7 +38,6 @@ config SPIKE
config OPENTITAN
bool
select IBEX
- select HART
select UNIMP
config RISCV_VIRT
@@ -52,7 +45,6 @@ config RISCV_VIRT
imply PCI_DEVICES
imply TEST_DEVICES
select PCI
- select HART
select SERIAL
select GOLDFISH_RTC
select VIRTIO_MMIO
@@ -65,7 +57,6 @@ config RISCV_VIRT
config MICROCHIP_PFSOC
bool
- select HART
select SIFIVE
select SIFIVE_CLINT
select UNIMP
diff --git a/hw/riscv/meson.build b/hw/riscv/meson.build
index 3cf9380..dbedf9b 100644
--- a/hw/riscv/meson.build
+++ b/hw/riscv/meson.build
@@ -1,7 +1,7 @@
riscv_ss = ss.source_set()
riscv_ss.add(files('boot.c'))
riscv_ss.add(files('numa.c'))
-riscv_ss.add(when: 'CONFIG_HART', if_true: files('riscv_hart.c'))
+riscv_ss.add(files('riscv_hart.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_SIFIVE_E', if_true: files('sifive_e.c'))
--
2.7.4
- [PATCH 06/12] hw/riscv: Move sifive_plic model to hw/intc, (continued)
- [PATCH 06/12] hw/riscv: Move sifive_plic model to hw/intc, Bin Meng, 2020/09/03
- [PATCH 05/12] hw/riscv: Move sifive_clint model to hw/intc, Bin Meng, 2020/09/03
- [PATCH 07/12] hw/riscv: Move riscv_htif model to hw/char, Bin Meng, 2020/09/03
- [PATCH 08/12] hw/riscv: Move sifive_uart model to hw/char, Bin Meng, 2020/09/03
- [PATCH 09/12] hw/riscv: Move sifive_test model to hw/misc, Bin Meng, 2020/09/03
- [PATCH 10/12] hw/riscv: Always build riscv_hart.c,
Bin Meng <=
- [PATCH 11/12] hw/riscv: Drop CONFIG_SIFIVE, Bin Meng, 2020/09/03
- [PATCH 12/12] hw/riscv: Sort the Kconfig options in alphabetical order, Bin Meng, 2020/09/03
- Re: [PATCH 00/12] hw/riscv: Clean up the directory, Peter Maydell, 2020/09/03
- Re: [PATCH 00/12] hw/riscv: Clean up the directory, Alistair Francis, 2020/09/06