hw/char/Kconfig | 3 +++ hw/char/meson.build | 2 +- hw/riscv/Kconfig | 5 +---- 3 files changed, 5 insertions(+), 5 deletions(-)
Use a dedicated UART config(CONFIG_SHAKTI_UART) to select
shakti uart.
Signed-off-by: Vijai Kumar K <vijai@behindbytes.com>
---
hw/char/Kconfig | 3 +++
hw/char/meson.build | 2 +-
hw/riscv/Kconfig | 5 +----
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/hw/char/Kconfig b/hw/char/Kconfig
index 2e4f620b13..6b6cf2fc1d 100644
--- a/hw/char/Kconfig
+++ b/hw/char/Kconfig
@@ -68,3 +68,6 @@ config SIFIVE_UART
config GOLDFISH_TTY
bool
+
+config SHAKTI_UART
+ bool
diff --git a/hw/char/meson.build b/hw/char/meson.build
index 8361d0ab28..7b594f51b8 100644
--- a/hw/char/meson.build
+++ b/hw/char/meson.build
@@ -16,7 +16,7 @@ softmmu_ss.add(when: 'CONFIG_SERIAL', if_true: files('serial.c'))
softmmu_ss.add(when: 'CONFIG_SERIAL_ISA', if_true: files('serial-isa.c'))
softmmu_ss.add(when: 'CONFIG_SERIAL_PCI', if_true: files('serial-pci.c'))
softmmu_ss.add(when: 'CONFIG_SERIAL_PCI_MULTI', if_true: files('serial-pci-multi.c'))
-softmmu_ss.add(when: 'CONFIG_SHAKTI', if_true: files('shakti_uart.c'))
+softmmu_ss.add(when: 'CONFIG_SHAKTI_UART', if_true: files('shakti_uart.c'))
softmmu_ss.add(when: 'CONFIG_VIRTIO_SERIAL', if_true: files('virtio-console.c'))
softmmu_ss.add(when: 'CONFIG_XEN', if_true: files('xen_console.c'))
softmmu_ss.add(when: 'CONFIG_XILINX', if_true: files('xilinx_uartlite.c'))
diff --git a/hw/riscv/Kconfig b/hw/riscv/Kconfig
index 0590f443fd..ff75add6f3 100644
--- a/hw/riscv/Kconfig
+++ b/hw/riscv/Kconfig
@@ -22,13 +22,10 @@ config OPENTITAN
select IBEX
select UNIMP
-config SHAKTI
- bool
-
config SHAKTI_C
bool
select UNIMP
- select SHAKTI
+ select SHAKTI_UART
select SIFIVE_CLINT
select SIFIVE_PLIC
--
2.25.1
On Sun, Aug 1, 2021 at 5:03 AM Vijai Kumar K <vijai@behindbytes.com> wrote: > > Use a dedicated UART config(CONFIG_SHAKTI_UART) to select > shakti uart. > > Signed-off-by: Vijai Kumar K <vijai@behindbytes.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > hw/char/Kconfig | 3 +++ > hw/char/meson.build | 2 +- > hw/riscv/Kconfig | 5 +---- > 3 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/hw/char/Kconfig b/hw/char/Kconfig > index 2e4f620b13..6b6cf2fc1d 100644 > --- a/hw/char/Kconfig > +++ b/hw/char/Kconfig > @@ -68,3 +68,6 @@ config SIFIVE_UART > > config GOLDFISH_TTY > bool > + > +config SHAKTI_UART > + bool > diff --git a/hw/char/meson.build b/hw/char/meson.build > index 8361d0ab28..7b594f51b8 100644 > --- a/hw/char/meson.build > +++ b/hw/char/meson.build > @@ -16,7 +16,7 @@ softmmu_ss.add(when: 'CONFIG_SERIAL', if_true: files('serial.c')) > softmmu_ss.add(when: 'CONFIG_SERIAL_ISA', if_true: files('serial-isa.c')) > softmmu_ss.add(when: 'CONFIG_SERIAL_PCI', if_true: files('serial-pci.c')) > softmmu_ss.add(when: 'CONFIG_SERIAL_PCI_MULTI', if_true: files('serial-pci-multi.c')) > -softmmu_ss.add(when: 'CONFIG_SHAKTI', if_true: files('shakti_uart.c')) > +softmmu_ss.add(when: 'CONFIG_SHAKTI_UART', if_true: files('shakti_uart.c')) > softmmu_ss.add(when: 'CONFIG_VIRTIO_SERIAL', if_true: files('virtio-console.c')) > softmmu_ss.add(when: 'CONFIG_XEN', if_true: files('xen_console.c')) > softmmu_ss.add(when: 'CONFIG_XILINX', if_true: files('xilinx_uartlite.c')) > diff --git a/hw/riscv/Kconfig b/hw/riscv/Kconfig > index 0590f443fd..ff75add6f3 100644 > --- a/hw/riscv/Kconfig > +++ b/hw/riscv/Kconfig > @@ -22,13 +22,10 @@ config OPENTITAN > select IBEX > select UNIMP > > -config SHAKTI > - bool > - > config SHAKTI_C > bool > select UNIMP > - select SHAKTI > + select SHAKTI_UART > select SIFIVE_CLINT > select SIFIVE_PLIC > > -- > 2.25.1 > > >
On Mon, Aug 2, 2021 at 8:36 AM Alistair Francis <alistair23@gmail.com> wrote: > > On Sun, Aug 1, 2021 at 5:03 AM Vijai Kumar K <vijai@behindbytes.com> wrote: > > > > Use a dedicated UART config(CONFIG_SHAKTI_UART) to select > > shakti uart. > > > > Signed-off-by: Vijai Kumar K <vijai@behindbytes.com> Thanks! Applied to riscv-to-apply.next Alistair > > Reviewed-by: Alistair Francis <alistair.francis@wdc.com> > > Alistair > > > --- > > hw/char/Kconfig | 3 +++ > > hw/char/meson.build | 2 +- > > hw/riscv/Kconfig | 5 +---- > > 3 files changed, 5 insertions(+), 5 deletions(-) > > > > diff --git a/hw/char/Kconfig b/hw/char/Kconfig > > index 2e4f620b13..6b6cf2fc1d 100644 > > --- a/hw/char/Kconfig > > +++ b/hw/char/Kconfig > > @@ -68,3 +68,6 @@ config SIFIVE_UART > > > > config GOLDFISH_TTY > > bool > > + > > +config SHAKTI_UART > > + bool > > diff --git a/hw/char/meson.build b/hw/char/meson.build > > index 8361d0ab28..7b594f51b8 100644 > > --- a/hw/char/meson.build > > +++ b/hw/char/meson.build > > @@ -16,7 +16,7 @@ softmmu_ss.add(when: 'CONFIG_SERIAL', if_true: files('serial.c')) > > softmmu_ss.add(when: 'CONFIG_SERIAL_ISA', if_true: files('serial-isa.c')) > > softmmu_ss.add(when: 'CONFIG_SERIAL_PCI', if_true: files('serial-pci.c')) > > softmmu_ss.add(when: 'CONFIG_SERIAL_PCI_MULTI', if_true: files('serial-pci-multi.c')) > > -softmmu_ss.add(when: 'CONFIG_SHAKTI', if_true: files('shakti_uart.c')) > > +softmmu_ss.add(when: 'CONFIG_SHAKTI_UART', if_true: files('shakti_uart.c')) > > softmmu_ss.add(when: 'CONFIG_VIRTIO_SERIAL', if_true: files('virtio-console.c')) > > softmmu_ss.add(when: 'CONFIG_XEN', if_true: files('xen_console.c')) > > softmmu_ss.add(when: 'CONFIG_XILINX', if_true: files('xilinx_uartlite.c')) > > diff --git a/hw/riscv/Kconfig b/hw/riscv/Kconfig > > index 0590f443fd..ff75add6f3 100644 > > --- a/hw/riscv/Kconfig > > +++ b/hw/riscv/Kconfig > > @@ -22,13 +22,10 @@ config OPENTITAN > > select IBEX > > select UNIMP > > > > -config SHAKTI > > - bool > > - > > config SHAKTI_C > > bool > > select UNIMP > > - select SHAKTI > > + select SHAKTI_UART > > select SIFIVE_CLINT > > select SIFIVE_PLIC > > > > -- > > 2.25.1 > > > > > >
© 2016 - 2024 Red Hat, Inc.