diff options
| author | Andreas Färber <afaerber@suse.de> | 2012-06-09 03:54:31 +0200 |
|---|---|---|
| committer | Edgar E. Iglesias <edgar.iglesias@gmail.com> | 2012-06-15 12:44:27 +0200 |
| commit | 07f9fd4864900349d0b3adb2c8403450bade21b7 (patch) | |
| tree | b1cf3d24c7b57274872d4ff4e04862d0f9c7a63b | |
| parent | 3b82321090743b238978024037dbdf878e701f9c (diff) | |
| download | qemu-07f9fd4864900349d0b3adb2c8403450bade21b7.tar.gz | |
xilinx_axi*: Share devices between microblaze and microblazeel
Speeds up the build.
Signed-off-by: Andreas Färber <afaerber@suse.de>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
| -rw-r--r-- | default-configs/microblaze-softmmu.mak | 1 | ||||
| -rw-r--r-- | default-configs/microblazeel-softmmu.mak | 1 | ||||
| -rw-r--r-- | hw/Makefile.objs | 2 | ||||
| -rw-r--r-- | hw/microblaze/Makefile.objs | 2 |
4 files changed, 4 insertions, 2 deletions
diff --git a/default-configs/microblaze-softmmu.mak b/default-configs/microblaze-softmmu.mak index 08e74494d1..64c9485de4 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 a9578e1db4..a9622760c9 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 102ebcf5a6..3d7725934f 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 59ea20f289..274d2c543e 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)) |