diff mbox series

[RFC,v2,11/37] hw/xtensa/Makefile.objs: Build xtensa_sim and xtensa_fpga conditionally

Message ID 20190115141108.934-12-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>

Add the new CONFIG_* values to default-config/xtensa*-softmmu.mak.

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

Comments

Thomas Huth Jan. 16, 2019, 9:31 a.m. UTC | #1 
On 2019-01-15 15:10, Yang Zhong wrote:
> From: Ákos Kovács <akoskovacs@gmx.com>
> 
> Add the new CONFIG_* values to default-config/xtensa*-softmmu.mak.
> 
> Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  default-configs/xtensa-softmmu.mak   | 3 +++
>  default-configs/xtensaeb-softmmu.mak | 3 +++
>  hw/xtensa/Makefile.objs              | 4 ++--
>  3 files changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/default-configs/xtensa-softmmu.mak b/default-configs/xtensa-softmmu.mak
> index 9d8899cde7..baf90ca162 100644
> --- a/default-configs/xtensa-softmmu.mak
> +++ b/default-configs/xtensa-softmmu.mak
> @@ -3,3 +3,6 @@
>  CONFIG_SERIAL=y
>  CONFIG_OPENCORES_ETH=y
>  CONFIG_PFLASH_CFI01=y
> +
> +CONFIG_XTENSA_SIM=y
> +CONFIG_XTENSA_FPGA=y
> diff --git a/default-configs/xtensaeb-softmmu.mak b/default-configs/xtensaeb-softmmu.mak
> index 9d8899cde7..baf90ca162 100644
> --- a/default-configs/xtensaeb-softmmu.mak
> +++ b/default-configs/xtensaeb-softmmu.mak
> @@ -3,3 +3,6 @@
>  CONFIG_SERIAL=y
>  CONFIG_OPENCORES_ETH=y
>  CONFIG_PFLASH_CFI01=y
> +
> +CONFIG_XTENSA_SIM=y
> +CONFIG_XTENSA_FPGA=y
> diff --git a/hw/xtensa/Makefile.objs b/hw/xtensa/Makefile.objs
> index cb4998d2bf..62e244fa53 100644
> --- a/hw/xtensa/Makefile.objs
> +++ b/hw/xtensa/Makefile.objs
> @@ -1,4 +1,4 @@
>  obj-y += pic_cpu.o
> -obj-y += sim.o
>  obj-y += xtensa_memory.o
> -obj-y += xtfpga.o
> +obj-$(CONFIG_XTENSA_SIM) += sim.o
> +obj-$(CONFIG_XTENSA_FPGA) += xtfpga.o
> 

Reviewed-by: Thomas Huth <thuth@redhat.com>
Max Filippov Jan. 16, 2019, 6:43 p.m. UTC | #2 
On Tue, Jan 15, 2019 at 6:38 AM Yang Zhong <yang.zhong@intel.com> wrote:
>
> From: Ákos Kovács <akoskovacs@gmx.com>
>
> Add the new CONFIG_* values to default-config/xtensa*-softmmu.mak.
>
> Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  default-configs/xtensa-softmmu.mak   | 3 +++
>  default-configs/xtensaeb-softmmu.mak | 3 +++
>  hw/xtensa/Makefile.objs              | 4 ++--
>  3 files changed, 8 insertions(+), 2 deletions(-)

Acked-by: Max Filippov <jcmvbkbc@gmail.com>
diff mbox series

Patch

diff --git a/default-configs/xtensa-softmmu.mak b/default-configs/xtensa-softmmu.mak
index 9d8899cde7..baf90ca162 100644
--- a/default-configs/xtensa-softmmu.mak
+++ b/default-configs/xtensa-softmmu.mak
@@ -3,3 +3,6 @@ 
 CONFIG_SERIAL=y
 CONFIG_OPENCORES_ETH=y
 CONFIG_PFLASH_CFI01=y
+
+CONFIG_XTENSA_SIM=y
+CONFIG_XTENSA_FPGA=y
diff --git a/default-configs/xtensaeb-softmmu.mak b/default-configs/xtensaeb-softmmu.mak
index 9d8899cde7..baf90ca162 100644
--- a/default-configs/xtensaeb-softmmu.mak
+++ b/default-configs/xtensaeb-softmmu.mak
@@ -3,3 +3,6 @@ 
 CONFIG_SERIAL=y
 CONFIG_OPENCORES_ETH=y
 CONFIG_PFLASH_CFI01=y
+
+CONFIG_XTENSA_SIM=y
+CONFIG_XTENSA_FPGA=y
diff --git a/hw/xtensa/Makefile.objs b/hw/xtensa/Makefile.objs
index cb4998d2bf..62e244fa53 100644
--- a/hw/xtensa/Makefile.objs
+++ b/hw/xtensa/Makefile.objs
@@ -1,4 +1,4 @@ 
 obj-y += pic_cpu.o
-obj-y += sim.o
 obj-y += xtensa_memory.o
-obj-y += xtfpga.o
+obj-$(CONFIG_XTENSA_SIM) += sim.o
+obj-$(CONFIG_XTENSA_FPGA) += xtfpga.o