[v2] Support Kconfig in QEMU

[Qemu-devel] [RFC PATCH v2 06/37] hw/mips/Makefile.objs: Create CONFIG_* for r4k, malta, mipssim boards

Posted by Yang Zhong 6 years, 9 months ago

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

Add the new configs to default-configs/mips*-sofmmu.mak.

Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Yang Zhong <yang.zhong@intel.com>
---
 default-configs/mips-softmmu-common.mak | 4 ++++
 default-configs/mips64el-softmmu.mak    | 1 -
 hw/mips/Makefile.objs                   | 6 ++++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak
index fae2347ee7..77b40ec7d1 100644
--- a/default-configs/mips-softmmu-common.mak
+++ b/default-configs/mips-softmmu-common.mak
@@ -36,3 +36,7 @@ CONFIG_EMPTY_SLOT=y
 CONFIG_MIPS_CPS=y
 CONFIG_MIPS_ITU=y
 CONFIG_I2C=y
+CONFIG_R4K=y
+CONFIG_MALTA=y
+CONFIG_MIPSSIM=y
+CONFIG_VT82C686=y
diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak
index c2ae313f47..8244efb39c 100644
--- a/default-configs/mips64el-softmmu.mak
+++ b/default-configs/mips64el-softmmu.mak
@@ -9,7 +9,6 @@ CONFIG_FULONG=y
 CONFIG_JAZZ=y
 CONFIG_G364FB=y
 CONFIG_JAZZ_LED=y
-CONFIG_VT82C686=y
 CONFIG_MIPS_BOSTON=y
 CONFIG_FITLOADER=y
 CONFIG_PCI_XILINX=y
diff --git a/hw/mips/Makefile.objs b/hw/mips/Makefile.objs
index 17a311aaba..230866ae91 100644
--- a/hw/mips/Makefile.objs
+++ b/hw/mips/Makefile.objs
@@ -1,7 +1,9 @@
-obj-y += mips_r4k.o mips_malta.o mips_mipssim.o
 obj-y += addr.o mips_int.o
+obj-y += gt64xxx_pci.o
+obj-$(CONFIG_R4K) += mips_r4k.o
+obj-$(CONFIG_MALTA) += mips_malta.o
+obj-$(CONFIG_MIPSSIM) += mips_mipssim.o
 obj-$(CONFIG_JAZZ) += mips_jazz.o
 obj-$(CONFIG_FULONG) += mips_fulong2e.o
-obj-y += gt64xxx_pci.o
 obj-$(CONFIG_MIPS_CPS) += cps.o
 obj-$(CONFIG_MIPS_BOSTON) += boston.o
-- 
2.17.1

Re: [Qemu-devel] [RFC PATCH v2 06/37] hw/mips/Makefile.objs: Create CONFIG_* for r4k, malta, mipssim boards

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>
> 
> Add the new configs to default-configs/mips*-sofmmu.mak.
> 
> Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> Signed-off-by: Yang Zhong <yang.zhong@intel.com>
> ---
>  default-configs/mips-softmmu-common.mak | 4 ++++
>  default-configs/mips64el-softmmu.mak    | 1 -
>  hw/mips/Makefile.objs                   | 6 ++++--
>  3 files changed, 8 insertions(+), 3 deletions(-)
> 
> diff --git a/default-configs/mips-softmmu-common.mak b/default-configs/mips-softmmu-common.mak
> index fae2347ee7..77b40ec7d1 100644
> --- a/default-configs/mips-softmmu-common.mak
> +++ b/default-configs/mips-softmmu-common.mak
> @@ -36,3 +36,7 @@ CONFIG_EMPTY_SLOT=y
>  CONFIG_MIPS_CPS=y
>  CONFIG_MIPS_ITU=y
>  CONFIG_I2C=y
> +CONFIG_R4K=y
> +CONFIG_MALTA=y
> +CONFIG_MIPSSIM=y
> +CONFIG_VT82C686=y
> diff --git a/default-configs/mips64el-softmmu.mak b/default-configs/mips64el-softmmu.mak
> index c2ae313f47..8244efb39c 100644
> --- a/default-configs/mips64el-softmmu.mak
> +++ b/default-configs/mips64el-softmmu.mak
> @@ -9,7 +9,6 @@ CONFIG_FULONG=y
>  CONFIG_JAZZ=y
>  CONFIG_G364FB=y
>  CONFIG_JAZZ_LED=y
> -CONFIG_VT82C686=y

I think that change to the CONFIG_VT82C686 is unrelated and should not
be part of this patch. Also looking at commit

 dff4021730b112ca00522d4c98c24a15feeef5a0
 mips: Remove CONFIG_VT82C686 from non-Fulong configs

it seems like it should stay in mips64el-softmmu.mak and not be moved to
mips-softmmu-common.mak.

>  CONFIG_MIPS_BOSTON=y
>  CONFIG_FITLOADER=y
>  CONFIG_PCI_XILINX=y
> diff --git a/hw/mips/Makefile.objs b/hw/mips/Makefile.objs
> index 17a311aaba..230866ae91 100644
> --- a/hw/mips/Makefile.objs
> +++ b/hw/mips/Makefile.objs
> @@ -1,7 +1,9 @@
> -obj-y += mips_r4k.o mips_malta.o mips_mipssim.o
>  obj-y += addr.o mips_int.o
> +obj-y += gt64xxx_pci.o
> +obj-$(CONFIG_R4K) += mips_r4k.o
> +obj-$(CONFIG_MALTA) += mips_malta.o
> +obj-$(CONFIG_MIPSSIM) += mips_mipssim.o
>  obj-$(CONFIG_JAZZ) += mips_jazz.o
>  obj-$(CONFIG_FULONG) += mips_fulong2e.o
> -obj-y += gt64xxx_pci.o
>  obj-$(CONFIG_MIPS_CPS) += cps.o
>  obj-$(CONFIG_MIPS_BOSTON) += boston.o
> 

 Thomas

Re: [Qemu-devel] [RFC PATCH v2 06/37] hw/mips/Makefile.objs: Create CONFIG_* for r4k, malta, mipssim boards

Posted by Yang Zhong 6 years, 9 months ago

On Wed, Jan 16, 2019 at 09:34:15AM +0100, Thomas Huth wrote:
> On 2019-01-15 15:10, Yang Zhong wrote:
[...] 
> I think that change to the CONFIG_VT82C686 is unrelated and should not
> be part of this patch. Also looking at commit
> 
>  dff4021730b112ca00522d4c98c24a15feeef5a0
>  mips: Remove CONFIG_VT82C686 from non-Fulong configs
> 
> it seems like it should stay in mips64el-softmmu.mak and not be moved to
> mips-softmmu-common.mak.
> 
  Hello Thomas,

  Wow, you can find this corner case, and thanks for you detailed review.

  Regards,

  Yang

>  Thomas