From: Andreas Färber Date: Sat, 9 Jun 2012 01:54:31 +0000 (+0200) Subject: xilinx_axi*: Share devices between microblaze and microblazeel X-Git-Tag: qemu-xen-4.3.0-rc1~1003 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=07f9fd4864900349d0b3adb2c8403450bade21b7;p=qemu-upstream-4.4-testing.git xilinx_axi*: Share devices between microblaze and microblazeel Speeds up the build. Signed-off-by: Andreas Färber Signed-off-by: Edgar E. Iglesias --- diff --git a/default-configs/microblaze-softmmu.mak b/default-configs/microblaze-softmmu.mak index 08e74494d..64c9485de 100644 --- a/default-configs/microblaze-softmmu.mak +++ b/default-configs/microblaze-softmmu.mak @@ -4,3 +4,4 @@ CONFIG_PTIMER=y CONFIG_PFLASH_CFI01=y CONFIG_SERIAL=y CONFIG_XILINX=y +CONFIG_XILINX_AXI=y diff --git a/default-configs/microblazeel-softmmu.mak b/default-configs/microblazeel-softmmu.mak index a9578e1db..a9622760c 100644 --- a/default-configs/microblazeel-softmmu.mak +++ b/default-configs/microblazeel-softmmu.mak @@ -4,3 +4,4 @@ CONFIG_PTIMER=y CONFIG_PFLASH_CFI01=y CONFIG_SERIAL=y CONFIG_XILINX=y +CONFIG_XILINX_AXI=y diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 102ebcf5a..3d7725934 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -63,6 +63,8 @@ hw-obj-$(CONFIG_JAZZ_LED) += jazz_led.o hw-obj-$(CONFIG_XILINX) += xilinx_intc.o hw-obj-$(CONFIG_XILINX) += xilinx_timer.o hw-obj-$(CONFIG_XILINX) += xilinx_uartlite.o +hw-obj-$(CONFIG_XILINX_AXI) += xilinx_axidma.o +hw-obj-$(CONFIG_XILINX_AXI) += xilinx_axienet.o # PCI watchdog devices hw-obj-$(CONFIG_PCI) += wdt_i6300esb.o diff --git a/hw/microblaze/Makefile.objs b/hw/microblaze/Makefile.objs index 59ea20f28..274d2c543 100644 --- a/hw/microblaze/Makefile.objs +++ b/hw/microblaze/Makefile.objs @@ -4,8 +4,6 @@ obj-y += microblaze_boot.o obj-y += microblaze_pic_cpu.o obj-y += xilinx_ethlite.o -obj-y += xilinx_axidma.o -obj-y += xilinx_axienet.o obj-$(CONFIG_FDT) += ../device_tree.o obj-y := $(addprefix ../,$(obj-y))