[Qemu-devel] [PATCH 16/47] hw/xtensa/Makefile.objs: Build xtensa_sim and xtensa_lx60 conditionally

[Ákos Kovács]

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

Signed-off-by: Ákos Kovács <address@hidden>
---
 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 9d8899c..0ca02cf 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_LX60=y
diff --git a/default-configs/xtensaeb-softmmu.mak 
b/default-configs/xtensaeb-softmmu.mak
index 9d8899c..0ca02cf 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_LX60=y
diff --git a/hw/xtensa/Makefile.objs b/hw/xtensa/Makefile.objs
index 6ead782..d85af3b 100644
--- a/hw/xtensa/Makefile.objs
+++ b/hw/xtensa/Makefile.objs
@@ -1,3 +1,3 @@
 obj-y += pic_cpu.o
-obj-y += xtensa_sim.o
-obj-y += xtensa_lx60.o
+obj-$(CONFIG_XTENSA_SIM) += xtensa_sim.o
+obj-$(CONFIG_XTENSA_LX60) += xtensa_lx60.o
-- 
1.7.10.4