From 9bbfbb61afab2e54e476da6f46ef8f7ee25ad750 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20F=C3=A4rber?= Date: Sat, 9 Jun 2012 03:54:29 +0200 Subject: [PATCH] hw/xilinx_*: Share Xilinx devices between ppc and microblaze MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Speeds up the build. xilinx_ethlite uses tswap32() and is thus target-dependent. Signed-off-by: Andreas Färber Signed-off-by: Edgar E. Iglesias --- 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 613edab742..08e74494d1 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 4b40fb21a5..a9578e1db4 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 1a768fc519..d0fde7b93d 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 f490368c64..e4265b4978 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 829f462105..aaa9cdc1f7 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 7e17504278..102ebcf5a6 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 020f7b6e9b..59ea20f289 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 d0ef8a26cf..44a1e8cdab 100644 --- a/hw/ppc/Makefile.objs +++ b/hw/ppc/Makefile.objs @@ -23,9 +23,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))