hw/riscv: Clean up the directory

[PATCH 12/12] hw/riscv: Sort the Kconfig options in alphabetical order

Posted by Bin Meng 5 years, 2 months ago

From: Bin Meng <bin.meng@windriver.com>

At present the Kconfig file is in disorder. Let's sort the options.

Signed-off-by: Bin Meng <bin.meng@windriver.com>

---

 hw/riscv/Kconfig | 58 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/hw/riscv/Kconfig b/hw/riscv/Kconfig
index e152fdc..2df978f 100644
--- a/hw/riscv/Kconfig
+++ b/hw/riscv/Kconfig
@@ -1,36 +1,16 @@
 config IBEX
     bool
 
-config SIFIVE_E
-    bool
-    select MSI_NONBROKEN
-    select SIFIVE_CLINT
-    select SIFIVE_GPIO
-    select SIFIVE_PLIC
-    select SIFIVE_UART
-    select SIFIVE_E_PRCI
-    select UNIMP
-
-config SIFIVE_U
+config MICROCHIP_PFSOC
     bool
-    select CADENCE
+    select CADENCE_SDHCI
+    select MCHP_PFSOC_MMUART
     select MSI_NONBROKEN
     select SIFIVE_CLINT
-    select SIFIVE_GPIO
     select SIFIVE_PDMA
     select SIFIVE_PLIC
-    select SIFIVE_UART
-    select SIFIVE_U_OTP
-    select SIFIVE_U_PRCI
     select UNIMP
 
-config SPIKE
-    bool
-    select HTIF
-    select MSI_NONBROKEN
-    select SIFIVE_CLINT
-    select SIFIVE_PLIC
-
 config OPENTITAN
     bool
     select IBEX
@@ -40,23 +20,43 @@ config RISCV_VIRT
     bool
     imply PCI_DEVICES
     imply TEST_DEVICES
+    select GOLDFISH_RTC
     select MSI_NONBROKEN
     select PCI
-    select SERIAL
-    select GOLDFISH_RTC
-    select VIRTIO_MMIO
     select PCI_EXPRESS_GENERIC_BRIDGE
     select PFLASH_CFI01
+    select SERIAL
     select SIFIVE_CLINT
     select SIFIVE_PLIC
     select SIFIVE_TEST
+    select VIRTIO_MMIO
 
-config MICROCHIP_PFSOC
+config SIFIVE_E
     bool
     select MSI_NONBROKEN
     select SIFIVE_CLINT
+    select SIFIVE_GPIO
+    select SIFIVE_PLIC
+    select SIFIVE_UART
+    select SIFIVE_E_PRCI
     select UNIMP
-    select MCHP_PFSOC_MMUART
+
+config SIFIVE_U
+    bool
+    select CADENCE
+    select MSI_NONBROKEN
+    select SIFIVE_CLINT
+    select SIFIVE_GPIO
     select SIFIVE_PDMA
     select SIFIVE_PLIC
-    select CADENCE_SDHCI
+    select SIFIVE_UART
+    select SIFIVE_U_OTP
+    select SIFIVE_U_PRCI
+    select UNIMP
+
+config SPIKE
+    bool
+    select HTIF
+    select MSI_NONBROKEN
+    select SIFIVE_CLINT
+    select SIFIVE_PLIC
-- 
2.7.4

Re: [PATCH 12/12] hw/riscv: Sort the Kconfig options in alphabetical order

Posted by Alistair Francis 5 years, 2 months ago

On Thu, Sep 3, 2020 at 3:43 AM Bin Meng <bmeng.cn@gmail.com> wrote:
>
> From: Bin Meng <bin.meng@windriver.com>
>
> At present the Kconfig file is in disorder. Let's sort the options.
>
> Signed-off-by: Bin Meng <bin.meng@windriver.com>

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>

Alistair

>
> ---
>
>  hw/riscv/Kconfig | 58 ++++++++++++++++++++++++++++----------------------------
>  1 file changed, 29 insertions(+), 29 deletions(-)
>
> diff --git a/hw/riscv/Kconfig b/hw/riscv/Kconfig
> index e152fdc..2df978f 100644
> --- a/hw/riscv/Kconfig
> +++ b/hw/riscv/Kconfig
> @@ -1,36 +1,16 @@
>  config IBEX
>      bool
>
> -config SIFIVE_E
> -    bool
> -    select MSI_NONBROKEN
> -    select SIFIVE_CLINT
> -    select SIFIVE_GPIO
> -    select SIFIVE_PLIC
> -    select SIFIVE_UART
> -    select SIFIVE_E_PRCI
> -    select UNIMP
> -
> -config SIFIVE_U
> +config MICROCHIP_PFSOC
>      bool
> -    select CADENCE
> +    select CADENCE_SDHCI
> +    select MCHP_PFSOC_MMUART
>      select MSI_NONBROKEN
>      select SIFIVE_CLINT
> -    select SIFIVE_GPIO
>      select SIFIVE_PDMA
>      select SIFIVE_PLIC
> -    select SIFIVE_UART
> -    select SIFIVE_U_OTP
> -    select SIFIVE_U_PRCI
>      select UNIMP
>
> -config SPIKE
> -    bool
> -    select HTIF
> -    select MSI_NONBROKEN
> -    select SIFIVE_CLINT
> -    select SIFIVE_PLIC
> -
>  config OPENTITAN
>      bool
>      select IBEX
> @@ -40,23 +20,43 @@ config RISCV_VIRT
>      bool
>      imply PCI_DEVICES
>      imply TEST_DEVICES
> +    select GOLDFISH_RTC
>      select MSI_NONBROKEN
>      select PCI
> -    select SERIAL
> -    select GOLDFISH_RTC
> -    select VIRTIO_MMIO
>      select PCI_EXPRESS_GENERIC_BRIDGE
>      select PFLASH_CFI01
> +    select SERIAL
>      select SIFIVE_CLINT
>      select SIFIVE_PLIC
>      select SIFIVE_TEST
> +    select VIRTIO_MMIO
>
> -config MICROCHIP_PFSOC
> +config SIFIVE_E
>      bool
>      select MSI_NONBROKEN
>      select SIFIVE_CLINT
> +    select SIFIVE_GPIO
> +    select SIFIVE_PLIC
> +    select SIFIVE_UART
> +    select SIFIVE_E_PRCI
>      select UNIMP
> -    select MCHP_PFSOC_MMUART
> +
> +config SIFIVE_U
> +    bool
> +    select CADENCE
> +    select MSI_NONBROKEN
> +    select SIFIVE_CLINT
> +    select SIFIVE_GPIO
>      select SIFIVE_PDMA
>      select SIFIVE_PLIC
> -    select CADENCE_SDHCI
> +    select SIFIVE_UART
> +    select SIFIVE_U_OTP
> +    select SIFIVE_U_PRCI
> +    select UNIMP
> +
> +config SPIKE
> +    bool
> +    select HTIF
> +    select MSI_NONBROKEN
> +    select SIFIVE_CLINT
> +    select SIFIVE_PLIC
> --
> 2.7.4
>
>