From: "Andreas Färber" <afaerber@suse.de>
To: qemu-devel@nongnu.org
Cc: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>,
"Peter A. G. Crosthwaite" <peter.crothwaite@petalogix.com>,
"Andreas Färber" <afaerber@suse.de>,
"Paolo Bonzini" <pbonzini@redhat.com>
Subject: [Qemu-devel] [PATCH 1/3] hw/xilinx_*: Share Xilinx devices between ppc and microblaze
Date: Sat, 9 Jun 2012 03:54:29 +0200 [thread overview]
Message-ID: <1339206871-4706-2-git-send-email-afaerber@suse.de> (raw)
In-Reply-To: <1339206871-4706-1-git-send-email-afaerber@suse.de>
Speeds up the build.
xilinx_ethlite uses tswap32() and is thus target-dependent.
Signed-off-by: Andreas Färber <afaerber@suse.de>
---
default-configs/microblaze-softmmu.mak | 1 +
default-configs/microblazeel-softmmu.mak | 1 +
default-configs/ppc-softmmu.mak | 1 +
default-configs/ppc64-softmmu.mak | 1 +
default-configs/ppcemb-softmmu.mak | 1 +
hw/Makefile.objs | 5 +++++
hw/microblaze/Makefile.objs | 3 ---
hw/ppc/Makefile.objs | 3 ---
8 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/default-configs/microblaze-softmmu.mak b/default-configs/microblaze-softmmu.mak
index 613edab..08e7449 100644
--- a/default-configs/microblaze-softmmu.mak
+++ b/default-configs/microblaze-softmmu.mak
@@ -3,3 +3,4 @@
CONFIG_PTIMER=y
CONFIG_PFLASH_CFI01=y
CONFIG_SERIAL=y
+CONFIG_XILINX=y
diff --git a/default-configs/microblazeel-softmmu.mak b/default-configs/microblazeel-softmmu.mak
index 4b40fb2..a9578e1 100644
--- a/default-configs/microblazeel-softmmu.mak
+++ b/default-configs/microblazeel-softmmu.mak
@@ -3,3 +3,4 @@
CONFIG_PTIMER=y
CONFIG_PFLASH_CFI01=y
CONFIG_SERIAL=y
+CONFIG_XILINX=y
diff --git a/default-configs/ppc-softmmu.mak b/default-configs/ppc-softmmu.mak
index 1a768fc..d0fde7b 100644
--- a/default-configs/ppc-softmmu.mak
+++ b/default-configs/ppc-softmmu.mak
@@ -36,3 +36,4 @@ CONFIG_PFLASH_CFI01=y
CONFIG_PFLASH_CFI02=y
CONFIG_PTIMER=y
CONFIG_I8259=y
+CONFIG_XILINX=y
diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak
index f490368..e4265b4 100644
--- a/default-configs/ppc64-softmmu.mak
+++ b/default-configs/ppc64-softmmu.mak
@@ -33,3 +33,4 @@ CONFIG_PFLASH_CFI01=y
CONFIG_PFLASH_CFI02=y
CONFIG_PTIMER=y
CONFIG_I8259=y
+CONFIG_XILINX=y
diff --git a/default-configs/ppcemb-softmmu.mak b/default-configs/ppcemb-softmmu.mak
index 829f462..aaa9cdc 100644
--- a/default-configs/ppcemb-softmmu.mak
+++ b/default-configs/ppcemb-softmmu.mak
@@ -33,3 +33,4 @@ CONFIG_PFLASH_CFI01=y
CONFIG_PFLASH_CFI02=y
CONFIG_PTIMER=y
CONFIG_I8259=y
+CONFIG_XILINX=y
diff --git a/hw/Makefile.objs b/hw/Makefile.objs
index 7e17504..102ebcf 100644
--- a/hw/Makefile.objs
+++ b/hw/Makefile.objs
@@ -59,6 +59,11 @@ hw-obj-$(CONFIG_PIIX4) += piix4.o
hw-obj-$(CONFIG_G364FB) += g364fb.o
hw-obj-$(CONFIG_JAZZ_LED) += jazz_led.o
+# Xilinx devices
+hw-obj-$(CONFIG_XILINX) += xilinx_intc.o
+hw-obj-$(CONFIG_XILINX) += xilinx_timer.o
+hw-obj-$(CONFIG_XILINX) += xilinx_uartlite.o
+
# PCI watchdog devices
hw-obj-$(CONFIG_PCI) += wdt_i6300esb.o
diff --git a/hw/microblaze/Makefile.objs b/hw/microblaze/Makefile.objs
index 020f7b6..59ea20f 100644
--- a/hw/microblaze/Makefile.objs
+++ b/hw/microblaze/Makefile.objs
@@ -3,9 +3,6 @@ obj-y += petalogix_ml605_mmu.o
obj-y += microblaze_boot.o
obj-y += microblaze_pic_cpu.o
-obj-y += xilinx_intc.o
-obj-y += xilinx_timer.o
-obj-y += xilinx_uartlite.o
obj-y += xilinx_ethlite.o
obj-y += xilinx_axidma.o
obj-y += xilinx_axienet.o
diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs
index 842e7b9..6f5757f 100644
--- a/hw/ppc/Makefile.objs
+++ b/hw/ppc/Makefile.objs
@@ -24,9 +24,6 @@ obj-y += openpic.o
obj-$(CONFIG_FDT) += ../device_tree.o
# Xilinx PPC peripherals
-obj-y += xilinx_intc.o
-obj-y += xilinx_timer.o
-obj-y += xilinx_uartlite.o
obj-y += xilinx_ethlite.o
obj-y := $(addprefix ../,$(obj-y))
--
1.7.7
next prev parent reply other threads:[~2012-06-09 1:54 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-09 1:54 [Qemu-devel] [PATCH 0/3] xilinx: Speed up the build Andreas Färber
2012-06-09 1:54 ` Andreas Färber [this message]
2012-06-09 2:15 ` [Qemu-devel] [PATCH 1/3] hw/xilinx_*: Share Xilinx devices between ppc and microblaze Peter Crosthwaite
2012-06-09 2:31 ` Andreas Färber
2012-06-09 2:36 ` Peter Crosthwaite
2012-06-09 1:54 ` [Qemu-devel] [PATCH 2/3] qemu-log: Allow usage in libhw Andreas Färber
2012-06-09 1:54 ` [Qemu-devel] [PATCH 3/3] xilinx_axi*: Share devices between microblaze and microblazeel Andreas Färber
2012-06-09 2:16 ` Peter Crosthwaite
2012-06-09 2:06 ` [Qemu-devel] [PATCH 0/3] xilinx: Speed up the build Peter Crosthwaite
2012-06-09 15:20 ` Edgar E. Iglesias
2012-06-09 15:31 ` Andreas Färber
2012-06-09 21:23 ` Edgar E. Iglesias
2012-06-15 11:13 ` Edgar E. Iglesias
2012-06-15 14:52 ` Andreas Färber
2012-06-16 4:15 ` Peter Crosthwaite
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1339206871-4706-2-git-send-email-afaerber@suse.de \
--to=afaerber@suse.de \
--cc=edgar.iglesias@gmail.com \
--cc=pbonzini@redhat.com \
--cc=peter.crothwaite@petalogix.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).