diff mbox series

[RFC,v2,04/37] hw/m68k/Makefile.objs: Conditionally build boards

Message ID 20190115141108.934-5-yang.zhong@intel.com
State New
Headers show
Series Support Kconfig in QEMU | expand

Commit Message

Yang Zhong Jan. 15, 2019, 2:10 p.m. UTC
From: Ákos Kovács <akoskovacs@gmx.com>

CONFIG_AN5206, CONFIG_MCF5206 and CONFIG_MCF5208 make
variables created for m68k boards, and added to
default-configs/m86k-softmmu.mak.

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

Comments

Thomas Huth Jan. 16, 2019, 7:15 a.m. UTC | #1
On 2019-01-15 15:10, Yang Zhong wrote:
> From: Ákos Kovács <akoskovacs@gmx.com>
> 
> CONFIG_AN5206, CONFIG_MCF5206 and CONFIG_MCF5208 make
> variables created for m68k boards, and added to
> default-configs/m86k-softmmu.mak.
> 
> Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  default-configs/m68k-softmmu.mak | 3 +++
>  hw/m68k/Makefile.objs            | 5 +++--
>  2 files changed, 6 insertions(+), 2 deletions(-)
> 
> diff --git a/default-configs/m68k-softmmu.mak b/default-configs/m68k-softmmu.mak
> index 60f7cdfbf2..a179da9077 100644
> --- a/default-configs/m68k-softmmu.mak
> +++ b/default-configs/m68k-softmmu.mak
> @@ -2,3 +2,6 @@
>  
>  CONFIG_COLDFIRE=y
>  CONFIG_PTIMER=y
> +CONFIG_AN5206=y
> +CONFIG_MCF5206=y
> +CONFIG_MCF5208=y
> diff --git a/hw/m68k/Makefile.objs b/hw/m68k/Makefile.objs
> index d1f089c08a..fa287edd0b 100644
> --- a/hw/m68k/Makefile.objs
> +++ b/hw/m68k/Makefile.objs
> @@ -1,2 +1,3 @@
> -obj-y += an5206.o mcf5208.o
> -obj-y += mcf5206.o mcf_intc.o
> +obj-$(CONFIG_AN5206) += an5206.o
> +obj-$(CONFIG_MCF5206) += mcf5206.o
> +obj-$(CONFIG_MCF5208) += mcf5208.o mcf_intc.o

The naming of the files is a little bit unfortunate, but
there are only two Coldfire boards: an5206 and mcf5208evb.
mcf5206.c belongs to the an5206 board.
So may I suggest to only use two CONFIG switches like this:

obj-$(CONFIG_AN5206) += an5206.o mcf5206.o
obj-$(CONFIG_MCF5208EVB) += mcf5208.o mcf_intc.o

?

 Thanks,
  Thomas
Yang Zhong Jan. 17, 2019, 11:33 a.m. UTC | #2
On Wed, Jan 16, 2019 at 08:15:23AM +0100, Thomas Huth wrote:
> On 2019-01-15 15:10, Yang Zhong wrote:
[...] 
> The naming of the files is a little bit unfortunate, but
> there are only two Coldfire boards: an5206 and mcf5208evb.
> mcf5206.c belongs to the an5206 board.
> So may I suggest to only use two CONFIG switches like this:
> 
> obj-$(CONFIG_AN5206) += an5206.o mcf5206.o
> obj-$(CONFIG_MCF5208EVB) += mcf5208.o mcf_intc.o
> 
  Yes, thanks Thomas, i will change this.  
  
  Regards,
  Yang
> ?
> 
>  Thanks,
>   Thomas
diff mbox series

Patch

diff --git a/default-configs/m68k-softmmu.mak b/default-configs/m68k-softmmu.mak
index 60f7cdfbf2..a179da9077 100644
--- a/default-configs/m68k-softmmu.mak
+++ b/default-configs/m68k-softmmu.mak
@@ -2,3 +2,6 @@ 
 
 CONFIG_COLDFIRE=y
 CONFIG_PTIMER=y
+CONFIG_AN5206=y
+CONFIG_MCF5206=y
+CONFIG_MCF5208=y
diff --git a/hw/m68k/Makefile.objs b/hw/m68k/Makefile.objs
index d1f089c08a..fa287edd0b 100644
--- a/hw/m68k/Makefile.objs
+++ b/hw/m68k/Makefile.objs
@@ -1,2 +1,3 @@ 
-obj-y += an5206.o mcf5208.o
-obj-y += mcf5206.o mcf_intc.o
+obj-$(CONFIG_AN5206) += an5206.o
+obj-$(CONFIG_MCF5206) += mcf5206.o
+obj-$(CONFIG_MCF5208) += mcf5208.o mcf_intc.o