Parcourir la source

hw/riscv: Always build riscv_hart.c

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>
Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
Message-Id: <1599129623-68957-11-git-send-email-bmeng.cn@gmail.com>
Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Bin Meng il y a 5 ans
Parent
commit
30a4af1664
2 fichiers modifiés avec 1 ajouts et 10 suppressions
  1. 0 9
      hw/riscv/Kconfig
  2. 1 1
      hw/riscv/meson.build

+ 0 - 9
hw/riscv/Kconfig

@@ -1,6 +1,3 @@
-config HART
-    bool
-
 config IBEX
 config IBEX
     bool
     bool
 
 
@@ -10,7 +7,6 @@ config SIFIVE
 
 
 config SIFIVE_E
 config SIFIVE_E
     bool
     bool
-    select HART
     select SIFIVE
     select SIFIVE
     select SIFIVE_CLINT
     select SIFIVE_CLINT
     select SIFIVE_GPIO
     select SIFIVE_GPIO
@@ -22,7 +18,6 @@ config SIFIVE_E
 config SIFIVE_U
 config SIFIVE_U
     bool
     bool
     select CADENCE
     select CADENCE
-    select HART
     select SIFIVE
     select SIFIVE
     select SIFIVE_CLINT
     select SIFIVE_CLINT
     select SIFIVE_GPIO
     select SIFIVE_GPIO
@@ -35,7 +30,6 @@ config SIFIVE_U
 
 
 config SPIKE
 config SPIKE
     bool
     bool
-    select HART
     select HTIF
     select HTIF
     select SIFIVE
     select SIFIVE
     select SIFIVE_CLINT
     select SIFIVE_CLINT
@@ -44,7 +38,6 @@ config SPIKE
 config OPENTITAN
 config OPENTITAN
     bool
     bool
     select IBEX
     select IBEX
-    select HART
     select UNIMP
     select UNIMP
 
 
 config RISCV_VIRT
 config RISCV_VIRT
@@ -52,7 +45,6 @@ config RISCV_VIRT
     imply PCI_DEVICES
     imply PCI_DEVICES
     imply TEST_DEVICES
     imply TEST_DEVICES
     select PCI
     select PCI
-    select HART
     select SERIAL
     select SERIAL
     select GOLDFISH_RTC
     select GOLDFISH_RTC
     select VIRTIO_MMIO
     select VIRTIO_MMIO
@@ -65,7 +57,6 @@ config RISCV_VIRT
 
 
 config MICROCHIP_PFSOC
 config MICROCHIP_PFSOC
     bool
     bool
-    select HART
     select SIFIVE
     select SIFIVE
     select SIFIVE_CLINT
     select SIFIVE_CLINT
     select UNIMP
     select UNIMP

+ 1 - 1
hw/riscv/meson.build

@@ -1,7 +1,7 @@
 riscv_ss = ss.source_set()
 riscv_ss = ss.source_set()
 riscv_ss.add(files('boot.c'), fdt)
 riscv_ss.add(files('boot.c'), fdt)
 riscv_ss.add(files('numa.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_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_E', if_true: files('sifive_e.c'))
 riscv_ss.add(when: 'CONFIG_SIFIVE_E', if_true: files('sifive_e.c'))