* [Qemu-devel] [PATCH 3/3] default-configs/: CONFIG_GDBSTUB_XML removed
@ 2013-06-22 2:23 akoskovacs0
0 siblings, 0 replies; 2+ messages in thread
From: akoskovacs0 @ 2013-06-22 2:23 UTC (permalink / raw)
To: qemu-devel; +Cc: pbonzini, Ákos Kovács
From: Ákos Kovács <akoskovacs@gmx.com>
Makefile.target: Build gdbstub-xml.o only when
TARGET_XML_FILES is not empty
Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
---
Makefile.target | 2 +-
default-configs/arm-linux-user.mak | 2 --
default-configs/arm-softmmu.mak | 1 -
default-configs/armeb-linux-user.mak | 2 --
default-configs/m68k-linux-user.mak | 2 --
default-configs/m68k-softmmu.mak | 1 -
default-configs/ppc-linux-user.mak | 2 --
default-configs/ppc-softmmu.mak | 1 -
default-configs/ppc64-linux-user.mak | 2 --
default-configs/ppc64-softmmu.mak | 1 -
default-configs/ppc64abi32-linux-user.mak | 2 --
default-configs/ppcemb-softmmu.mak | 1 -
12 files changed, 1 insertions(+), 18 deletions(-)
diff --git a/Makefile.target b/Makefile.target
index 180f1ec..94ecd1e 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -69,7 +69,7 @@ obj-$(CONFIG_TCG_INTERPRETER) += disas/tci.o
obj-y += fpu/softfloat.o
obj-y += target-$(TARGET_BASE_ARCH)/
obj-y += disas.o
-obj-$(CONFIG_GDBSTUB_XML) += gdbstub-xml.o
+obj-$(call notempty,$(TARGET_XML_FILES)) += gdbstub-xml.o
obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o
#########################################################
diff --git a/default-configs/arm-linux-user.mak b/default-configs/arm-linux-user.mak
index 46d4aa2..413361a 100644
--- a/default-configs/arm-linux-user.mak
+++ b/default-configs/arm-linux-user.mak
@@ -1,3 +1 @@
# Default configuration for arm-linux-user
-
-CONFIG_GDBSTUB_XML=y
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index 27cbe3d..fc6fbce 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -2,7 +2,6 @@
include pci.mak
include usb.mak
-CONFIG_GDBSTUB_XML=y
CONFIG_VGA=y
CONFIG_ISA_MMIO=y
CONFIG_NAND=y
diff --git a/default-configs/armeb-linux-user.mak b/default-configs/armeb-linux-user.mak
index 41d0cc4..bf2ffe7 100644
--- a/default-configs/armeb-linux-user.mak
+++ b/default-configs/armeb-linux-user.mak
@@ -1,3 +1 @@
# Default configuration for armeb-linux-user
-
-CONFIG_GDBSTUB_XML=y
diff --git a/default-configs/m68k-linux-user.mak b/default-configs/m68k-linux-user.mak
index f3487aa..06cd5ed 100644
--- a/default-configs/m68k-linux-user.mak
+++ b/default-configs/m68k-linux-user.mak
@@ -1,3 +1 @@
# Default configuration for m68k-linux-user
-
-CONFIG_GDBSTUB_XML=y
diff --git a/default-configs/m68k-softmmu.mak b/default-configs/m68k-softmmu.mak
index 51fe5bb..d9552df 100644
--- a/default-configs/m68k-softmmu.mak
+++ b/default-configs/m68k-softmmu.mak
@@ -3,5 +3,4 @@
include pci.mak
include usb.mak
CONFIG_COLDFIRE=y
-CONFIG_GDBSTUB_XML=y
CONFIG_PTIMER=y
diff --git a/default-configs/ppc-linux-user.mak b/default-configs/ppc-linux-user.mak
index 681a945..6273df2 100644
--- a/default-configs/ppc-linux-user.mak
+++ b/default-configs/ppc-linux-user.mak
@@ -1,3 +1 @@
# Default configuration for ppc-linux-user
-
-CONFIG_GDBSTUB_XML=y
diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
index cc3587f..9f77f0f 100644
--- a/default-configs/ppc-softmmu.mak
+++ b/default-configs/ppc-softmmu.mak
@@ -3,7 +3,6 @@
include pci.mak
include sound.mak
include usb.mak
-CONFIG_GDBSTUB_XML=y
CONFIG_ISA_MMIO=y
CONFIG_ESCC=y
CONFIG_M48T59=y
diff --git a/default-configs/ppc64-linux-user.mak b/default-configs/ppc64-linux-user.mak
index 089c08f..422d3fb 100644
--- a/default-configs/ppc64-linux-user.mak
+++ b/default-configs/ppc64-linux-user.mak
@@ -1,3 +1 @@
# Default configuration for ppc64-linux-user
-
-CONFIG_GDBSTUB_XML=y
diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak
index 884ea8a..328b47c 100644
--- a/default-configs/ppc64-softmmu.mak
+++ b/default-configs/ppc64-softmmu.mak
@@ -3,7 +3,6 @@
include pci.mak
include sound.mak
include usb.mak
-CONFIG_GDBSTUB_XML=y
CONFIG_ISA_MMIO=y
CONFIG_ESCC=y
CONFIG_M48T59=y
diff --git a/default-configs/ppc64abi32-linux-user.mak b/default-configs/ppc64abi32-linux-user.mak
index f038ffd..1c657ec 100644
--- a/default-configs/ppc64abi32-linux-user.mak
+++ b/default-configs/ppc64abi32-linux-user.mak
@@ -1,3 +1 @@
# Default configuration for ppc64abi32-linux-user
-
-CONFIG_GDBSTUB_XML=y
diff --git a/default-configs/ppcemb-softmmu.mak b/default-configs/ppcemb-softmmu.mak
index be93e03..ccb403e 100644
--- a/default-configs/ppcemb-softmmu.mak
+++ b/default-configs/ppcemb-softmmu.mak
@@ -3,7 +3,6 @@
include pci.mak
include sound.mak
include usb.mak
-CONFIG_GDBSTUB_XML=y
CONFIG_ISA_MMIO=y
CONFIG_ESCC=y
CONFIG_M48T59=y
--
1.7.2.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [Qemu-devel] [PATCH 0/3] avoid CONFIG_NO_* using rules.mak logical functions
@ 2013-09-13 14:19 Peter Maydell
2013-09-13 14:19 ` [Qemu-devel] [PATCH 3/3] default-configs/: CONFIG_GDBSTUB_XML removed Peter Maydell
0 siblings, 1 reply; 2+ messages in thread
From: Peter Maydell @ 2013-09-13 14:19 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini, Ákos Kovács, Anthony Liguori, patches
This is based on a set of patches by Ákos Kovács which were
lurking at the beginning of his KConfig patchset but which
I think make a nice standalone cleanup. Since I basically
rewrote all of patch 1 in review comments I figured it was
easier to just write it as a new patch. Patch 2 and 3
are Ákos', though I fixed a few missed conversions in patch 2.
Peter Maydell (1):
rules.mak: New logical functions for handling y/n values
Ákos Kovács (2):
Makefile.target: CONFIG_NO_* variables removed
default-configs/: CONFIG_GDBSTUB_XML removed
Makefile.target | 10 +++-------
default-configs/arm-linux-user.mak | 2 --
default-configs/arm-softmmu.mak | 1 -
default-configs/armeb-linux-user.mak | 2 --
default-configs/m68k-linux-user.mak | 2 --
default-configs/m68k-softmmu.mak | 1 -
default-configs/ppc-linux-user.mak | 2 --
default-configs/ppc-softmmu.mak | 1 -
default-configs/ppc64-linux-user.mak | 2 --
default-configs/ppc64-softmmu.mak | 1 -
default-configs/ppc64abi32-linux-user.mak | 2 --
default-configs/ppcemb-softmmu.mak | 1 -
hw/pci/Makefile.objs | 2 +-
rules.mak | 18 ++++++++++++++++++
target-arm/Makefile.objs | 2 +-
target-i386/Makefile.objs | 2 +-
target-ppc/Makefile.objs | 2 +-
17 files changed, 25 insertions(+), 28 deletions(-)
--
1.7.9.5
^ permalink raw reply [flat|nested] 2+ messages in thread
* [Qemu-devel] [PATCH 3/3] default-configs/: CONFIG_GDBSTUB_XML removed
2013-09-13 14:19 [Qemu-devel] [PATCH 0/3] avoid CONFIG_NO_* using rules.mak logical functions Peter Maydell
@ 2013-09-13 14:19 ` Peter Maydell
0 siblings, 0 replies; 2+ messages in thread
From: Peter Maydell @ 2013-09-13 14:19 UTC (permalink / raw)
To: qemu-devel; +Cc: Paolo Bonzini, Ákos Kovács, Anthony Liguori, patches
From: Ákos Kovács <akoskovacs@gmx.com>
Makefile.target: Build gdbstub-xml.o only when
TARGET_XML_FILES is not empty.
Signed-off-by: Ákos Kovács <akoskovacs@gmx.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
---
Makefile.target | 2 +-
default-configs/arm-linux-user.mak | 2 --
default-configs/arm-softmmu.mak | 1 -
default-configs/armeb-linux-user.mak | 2 --
default-configs/m68k-linux-user.mak | 2 --
default-configs/m68k-softmmu.mak | 1 -
default-configs/ppc-linux-user.mak | 2 --
default-configs/ppc-softmmu.mak | 1 -
default-configs/ppc64-linux-user.mak | 2 --
default-configs/ppc64-softmmu.mak | 1 -
default-configs/ppc64abi32-linux-user.mak | 2 --
default-configs/ppcemb-softmmu.mak | 1 -
12 files changed, 1 insertion(+), 18 deletions(-)
diff --git a/Makefile.target b/Makefile.target
index bbc668b..af6ac7e 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -79,7 +79,7 @@ obj-$(CONFIG_TCG_INTERPRETER) += disas/tci.o
obj-y += fpu/softfloat.o
obj-y += target-$(TARGET_BASE_ARCH)/
obj-y += disas.o
-obj-$(CONFIG_GDBSTUB_XML) += gdbstub-xml.o
+obj-$(call notempty,$(TARGET_XML_FILES)) += gdbstub-xml.o
obj-$(call lnot,$(CONFIG_KVM)) += kvm-stub.o
#########################################################
diff --git a/default-configs/arm-linux-user.mak b/default-configs/arm-linux-user.mak
index 46d4aa2..413361a 100644
--- a/default-configs/arm-linux-user.mak
+++ b/default-configs/arm-linux-user.mak
@@ -1,3 +1 @@
# Default configuration for arm-linux-user
-
-CONFIG_GDBSTUB_XML=y
diff --git a/default-configs/arm-softmmu.mak b/default-configs/arm-softmmu.mak
index ac0815d..d13bc2b 100644
--- a/default-configs/arm-softmmu.mak
+++ b/default-configs/arm-softmmu.mak
@@ -2,7 +2,6 @@
include pci.mak
include usb.mak
-CONFIG_GDBSTUB_XML=y
CONFIG_VGA=y
CONFIG_ISA_MMIO=y
CONFIG_NAND=y
diff --git a/default-configs/armeb-linux-user.mak b/default-configs/armeb-linux-user.mak
index 41d0cc4..bf2ffe7 100644
--- a/default-configs/armeb-linux-user.mak
+++ b/default-configs/armeb-linux-user.mak
@@ -1,3 +1 @@
# Default configuration for armeb-linux-user
-
-CONFIG_GDBSTUB_XML=y
diff --git a/default-configs/m68k-linux-user.mak b/default-configs/m68k-linux-user.mak
index f3487aa..06cd5ed 100644
--- a/default-configs/m68k-linux-user.mak
+++ b/default-configs/m68k-linux-user.mak
@@ -1,3 +1 @@
# Default configuration for m68k-linux-user
-
-CONFIG_GDBSTUB_XML=y
diff --git a/default-configs/m68k-softmmu.mak b/default-configs/m68k-softmmu.mak
index 51fe5bb..d9552df 100644
--- a/default-configs/m68k-softmmu.mak
+++ b/default-configs/m68k-softmmu.mak
@@ -3,5 +3,4 @@
include pci.mak
include usb.mak
CONFIG_COLDFIRE=y
-CONFIG_GDBSTUB_XML=y
CONFIG_PTIMER=y
diff --git a/default-configs/ppc-linux-user.mak b/default-configs/ppc-linux-user.mak
index 681a945..6273df2 100644
--- a/default-configs/ppc-linux-user.mak
+++ b/default-configs/ppc-linux-user.mak
@@ -1,3 +1 @@
# Default configuration for ppc-linux-user
-
-CONFIG_GDBSTUB_XML=y
diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
index eac0b28..f5cd0bd 100644
--- a/default-configs/ppc-softmmu.mak
+++ b/default-configs/ppc-softmmu.mak
@@ -3,7 +3,6 @@
include pci.mak
include sound.mak
include usb.mak
-CONFIG_GDBSTUB_XML=y
CONFIG_ISA_MMIO=y
CONFIG_ESCC=y
CONFIG_M48T59=y
diff --git a/default-configs/ppc64-linux-user.mak b/default-configs/ppc64-linux-user.mak
index 089c08f..422d3fb 100644
--- a/default-configs/ppc64-linux-user.mak
+++ b/default-configs/ppc64-linux-user.mak
@@ -1,3 +1 @@
# Default configuration for ppc64-linux-user
-
-CONFIG_GDBSTUB_XML=y
diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak
index 7831c2b..975112a 100644
--- a/default-configs/ppc64-softmmu.mak
+++ b/default-configs/ppc64-softmmu.mak
@@ -3,7 +3,6 @@
include pci.mak
include sound.mak
include usb.mak
-CONFIG_GDBSTUB_XML=y
CONFIG_ISA_MMIO=y
CONFIG_ESCC=y
CONFIG_M48T59=y
diff --git a/default-configs/ppc64abi32-linux-user.mak b/default-configs/ppc64abi32-linux-user.mak
index f038ffd..1c657ec 100644
--- a/default-configs/ppc64abi32-linux-user.mak
+++ b/default-configs/ppc64abi32-linux-user.mak
@@ -1,3 +1 @@
# Default configuration for ppc64abi32-linux-user
-
-CONFIG_GDBSTUB_XML=y
diff --git a/default-configs/ppcemb-softmmu.mak b/default-configs/ppcemb-softmmu.mak
index 86080a7..4411203 100644
--- a/default-configs/ppcemb-softmmu.mak
+++ b/default-configs/ppcemb-softmmu.mak
@@ -3,7 +3,6 @@
include pci.mak
include sound.mak
include usb.mak
-CONFIG_GDBSTUB_XML=y
CONFIG_ISA_MMIO=y
CONFIG_ESCC=y
CONFIG_M48T59=y
--
1.7.9.5
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-09-13 14:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-06-22 2:23 [Qemu-devel] [PATCH 3/3] default-configs/: CONFIG_GDBSTUB_XML removed akoskovacs0
-- strict thread matches above, loose matches on Subject: below --
2013-09-13 14:19 [Qemu-devel] [PATCH 0/3] avoid CONFIG_NO_* using rules.mak logical functions Peter Maydell
2013-09-13 14:19 ` [Qemu-devel] [PATCH 3/3] default-configs/: CONFIG_GDBSTUB_XML removed Peter Maydell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).