[v2] Support Kconfig in QEMU

[Qemu-devel] [RFC PATCH v2 08/37] hw/sh4/Makefile.objs: New CONFIG_* varibales created for sh4 boards and device

Posted by Yang Zhong 6 years, 9 months ago

From: Ákos Kovács <akoskovacs@gmx.com>

Make hw/sh4 configurable and add new CONFIG_* to the default-configs/sh4*-softmmu.mak.

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 default-configs/sh4-softmmu.mak   | 3 +++
 default-configs/sh4eb-softmmu.mak | 3 +++
 hw/sh4/Makefile.objs              | 6 +++---
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.mak
index caeccd55be..4b65489624 100644
--- a/default-configs/sh4-softmmu.mak
+++ b/default-configs/sh4-softmmu.mak
@@ -19,3 +19,6 @@ CONFIG_PCSPK=y
 CONFIG_I82374=y
 CONFIG_I8257=y
 CONFIG_MC146818RTC=y
+CONFIG_R2D=y
+CONFIG_SHIX=y
+CONFIG_SH7750=y
diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-softmmu.mak
index 53b9cd7b5a..af71aa7f42 100644
--- a/default-configs/sh4eb-softmmu.mak
+++ b/default-configs/sh4eb-softmmu.mak
@@ -19,3 +19,6 @@ CONFIG_PCSPK=y
 CONFIG_I82374=y
 CONFIG_I8257=y
 CONFIG_MC146818RTC=y
+CONFIG_R2D=y
+CONFIG_SHIX=y
+CONFIG_SH7750=y
diff --git a/hw/sh4/Makefile.objs b/hw/sh4/Makefile.objs
index 2393702c57..70903d79a9 100644
--- a/hw/sh4/Makefile.objs
+++ b/hw/sh4/Makefile.objs
@@ -1,4 +1,4 @@
-obj-y += shix.o r2d.o
-
-obj-y += sh7750.o sh7750_regnames.o
+obj-$(CONFIG_R2D) +=  r2d.o
+obj-$(CONFIG_SHIX) += shix.o
+obj-$(CONFIG_SH7750) += sh7750.o sh7750_regnames.o
 obj-y += sh_pci.o
-- 
2.17.1

Re: [Qemu-devel] [RFC PATCH v2 08/37] hw/sh4/Makefile.objs: New CONFIG_* varibales created for sh4 boards and device

Posted by Thomas Huth 6 years, 9 months ago

On 2019-01-15 15:10, Yang Zhong wrote:
> From: Ákos Kovács <akoskovacs@gmx.com>
> 
> Make hw/sh4 configurable and add new CONFIG_* to the default-configs/sh4*-softmmu.mak.
> 
> Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  default-configs/sh4-softmmu.mak   | 3 +++
>  default-configs/sh4eb-softmmu.mak | 3 +++
>  hw/sh4/Makefile.objs              | 6 +++---
>  3 files changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/default-configs/sh4-softmmu.mak b/default-configs/sh4-softmmu.mak
> index caeccd55be..4b65489624 100644
> --- a/default-configs/sh4-softmmu.mak
> +++ b/default-configs/sh4-softmmu.mak
> @@ -19,3 +19,6 @@ CONFIG_PCSPK=y
>  CONFIG_I82374=y
>  CONFIG_I8257=y
>  CONFIG_MC146818RTC=y
> +CONFIG_R2D=y
> +CONFIG_SHIX=y
> +CONFIG_SH7750=y
> diff --git a/default-configs/sh4eb-softmmu.mak b/default-configs/sh4eb-softmmu.mak
> index 53b9cd7b5a..af71aa7f42 100644
> --- a/default-configs/sh4eb-softmmu.mak
> +++ b/default-configs/sh4eb-softmmu.mak
> @@ -19,3 +19,6 @@ CONFIG_PCSPK=y
>  CONFIG_I82374=y
>  CONFIG_I8257=y
>  CONFIG_MC146818RTC=y
> +CONFIG_R2D=y
> +CONFIG_SHIX=y
> +CONFIG_SH7750=y
> diff --git a/hw/sh4/Makefile.objs b/hw/sh4/Makefile.objs
> index 2393702c57..70903d79a9 100644
> --- a/hw/sh4/Makefile.objs
> +++ b/hw/sh4/Makefile.objs
> @@ -1,4 +1,4 @@
> -obj-y += shix.o r2d.o
> -
> -obj-y += sh7750.o sh7750_regnames.o
> +obj-$(CONFIG_R2D) +=  r2d.o
> +obj-$(CONFIG_SHIX) += shix.o
> +obj-$(CONFIG_SH7750) += sh7750.o sh7750_regnames.o
>  obj-y += sh_pci.o
> 

sh7750.o and sh7750_regnames.o are "common" code of the r2d and shix
machine, and do not define a separate machine ... not sure whether we
need a separate CONFIG_SH7750 switch for this? I'd rather treat these
two file like sh_pci.o instead, and always include them unconditionally,
I think... Or do I miss something?

 Thomas

Re: [Qemu-devel] [RFC PATCH v2 08/37] hw/sh4/Makefile.objs: New CONFIG_* varibales created for sh4 boards and device

Posted by Yang Zhong 6 years, 9 months ago

On Wed, Jan 16, 2019 at 09:48:16AM +0100, Thomas Huth wrote:

> sh7750.o and sh7750_regnames.o are "common" code of the r2d and shix
> machine, and do not define a separate machine ... not sure whether we
> need a separate CONFIG_SH7750 switch for this? I'd rather treat these
> two file like sh_pci.o instead, and always include them unconditionally,
> I think... Or do I miss something?
a>
  Thanks Thomas, exactly, r2d_init() and shix_init all call sh7750_init().

  Regards,

  Yang
>  Thomas