diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2013-02-05 12:03:15 +0100 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-03-01 15:01:19 +0100 |
commit | 530182169e897c0e401b245552a4c58dc6846912 (patch) | |
tree | 8c39251d7e89855a89d925359f71639400782cd6 | |
parent | e4c8b28cde12d01ada8fe869567dc5717a2dfcb7 (diff) |
hw: move boards and other isolated files to hw/ARCH
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r-- | hw/Makefile.objs | 1 | ||||
-rw-r--r-- | hw/alpha/Makefile.objs | 4 | ||||
-rw-r--r-- | hw/alpha/dp264.c (renamed from hw/alpha_dp264.c) | 0 | ||||
-rw-r--r-- | hw/alpha/pci.c (renamed from hw/alpha_pci.c) | 0 | ||||
-rw-r--r-- | hw/arm/Makefile.objs | 31 | ||||
-rw-r--r-- | hw/arm/boot.c (renamed from hw/arm_boot.c) | 0 | ||||
-rw-r--r-- | hw/arm/collie.c (renamed from hw/collie.c) | 0 | ||||
-rw-r--r-- | hw/arm/exynos4_boards.c (renamed from hw/exynos4_boards.c) | 0 | ||||
-rw-r--r-- | hw/arm/gumstix.c (renamed from hw/gumstix.c) | 0 | ||||
-rw-r--r-- | hw/arm/highbank.c (renamed from hw/highbank.c) | 0 | ||||
-rw-r--r-- | hw/arm/integratorcp.c (renamed from hw/integratorcp.c) | 0 | ||||
-rw-r--r-- | hw/arm/kzm.c (renamed from hw/kzm.c) | 0 | ||||
-rw-r--r-- | hw/arm/mainstone.c (renamed from hw/mainstone.c) | 0 | ||||
-rw-r--r-- | hw/arm/musicpal.c (renamed from hw/musicpal.c) | 0 | ||||
-rw-r--r-- | hw/arm/nseries.c (renamed from hw/nseries.c) | 0 | ||||
-rw-r--r-- | hw/arm/omap_sx1.c (renamed from hw/omap_sx1.c) | 0 | ||||
-rw-r--r-- | hw/arm/palm.c (renamed from hw/palm.c) | 0 | ||||
-rw-r--r-- | hw/arm/pic_cpu.c (renamed from hw/arm_pic.c) | 0 | ||||
-rw-r--r-- | hw/arm/realview.c (renamed from hw/realview.c) | 0 | ||||
-rw-r--r-- | hw/arm/spitz.c (renamed from hw/spitz.c) | 0 | ||||
-rw-r--r-- | hw/arm/stellaris.c (renamed from hw/stellaris.c) | 0 | ||||
-rw-r--r-- | hw/arm/tosa.c (renamed from hw/tosa.c) | 0 | ||||
-rw-r--r-- | hw/arm/versatilepb.c (renamed from hw/versatilepb.c) | 0 | ||||
-rw-r--r-- | hw/arm/vexpress.c (renamed from hw/vexpress.c) | 0 | ||||
-rw-r--r-- | hw/arm/xilinx_zynq.c (renamed from hw/xilinx_zynq.c) | 0 | ||||
-rw-r--r-- | hw/arm/z2.c (renamed from hw/z2.c) | 0 | ||||
-rw-r--r-- | hw/cris/Makefile.objs | 10 | ||||
-rw-r--r-- | hw/cris/axis_dev88.c (renamed from hw/axis_dev88.c) | 0 | ||||
-rw-r--r-- | hw/cris/boot.c (renamed from hw/cris-boot.c) | 0 | ||||
-rw-r--r-- | hw/cris/pic_cpu.c (renamed from hw/cris_pic_cpu.c) | 0 | ||||
-rw-r--r-- | hw/i386/Makefile.objs | 13 | ||||
-rw-r--r-- | hw/i386/multiboot.c (renamed from hw/multiboot.c) | 0 | ||||
-rw-r--r-- | hw/i386/pc.c (renamed from hw/pc.c) | 0 | ||||
-rw-r--r-- | hw/i386/pc_piix.c (renamed from hw/pc_piix.c) | 0 | ||||
-rw-r--r-- | hw/i386/pc_q35.c (renamed from hw/pc_q35.c) | 0 | ||||
-rw-r--r-- | hw/i386/smbios.c (renamed from hw/smbios.c) | 0 | ||||
-rw-r--r-- | hw/i386/xen_domainbuild.c (renamed from hw/xen_domainbuild.c) | 0 | ||||
-rw-r--r-- | hw/i386/xen_machine_pv.c (renamed from hw/xen_machine_pv.c) | 0 | ||||
-rw-r--r-- | hw/lm32/Makefile.objs | 8 | ||||
-rw-r--r-- | hw/lm32/lm32_boards.c (renamed from hw/lm32_boards.c) | 0 | ||||
-rw-r--r-- | hw/lm32/milkymist.c (renamed from hw/milkymist.c) | 0 | ||||
-rw-r--r-- | hw/m68k/Makefile.objs | 7 | ||||
-rw-r--r-- | hw/m68k/an5206.c (renamed from hw/an5206.c) | 0 | ||||
-rw-r--r-- | hw/m68k/dummy_m68k.c (renamed from hw/dummy_m68k.c) | 0 | ||||
-rw-r--r-- | hw/m68k/mcf5208.c (renamed from hw/mcf5208.c) | 0 | ||||
-rw-r--r-- | hw/microblaze/Makefile.objs | 10 | ||||
-rw-r--r-- | hw/microblaze/boot.c (renamed from hw/microblaze_boot.c) | 0 | ||||
-rw-r--r-- | hw/microblaze/petalogix_ml605_mmu.c (renamed from hw/petalogix_ml605_mmu.c) | 0 | ||||
-rw-r--r-- | hw/microblaze/petalogix_s3adsp1800_mmu.c (renamed from hw/petalogix_s3adsp1800_mmu.c) | 0 | ||||
-rw-r--r-- | hw/microblaze/pic_cpu.c (renamed from hw/microblaze_pic_cpu.c) | 0 | ||||
-rw-r--r-- | hw/mips/Makefile.objs | 8 | ||||
-rw-r--r-- | hw/mips/addr.c (renamed from hw/mips_addr.c) | 0 | ||||
-rw-r--r-- | hw/mips/cputimer.c (renamed from hw/mips_timer.c) | 0 | ||||
-rw-r--r-- | hw/mips/mips_fulong2e.c (renamed from hw/mips_fulong2e.c) | 0 | ||||
-rw-r--r-- | hw/mips/mips_int.c (renamed from hw/mips_int.c) | 0 | ||||
-rw-r--r-- | hw/mips/mips_jazz.c (renamed from hw/mips_jazz.c) | 0 | ||||
-rw-r--r-- | hw/mips/mips_malta.c (renamed from hw/mips_malta.c) | 0 | ||||
-rw-r--r-- | hw/mips/mips_mipssim.c (renamed from hw/mips_mipssim.c) | 0 | ||||
-rw-r--r-- | hw/mips/mips_r4k.c (renamed from hw/mips_r4k.c) | 0 | ||||
-rw-r--r-- | hw/openrisc/Makefile.objs | 5 | ||||
-rw-r--r-- | hw/openrisc/cputimer.c (renamed from hw/openrisc_timer.c) | 0 | ||||
-rw-r--r-- | hw/openrisc/openrisc_sim.c (renamed from hw/openrisc_sim.c) | 0 | ||||
-rw-r--r-- | hw/openrisc/pic_cpu.c (renamed from hw/openrisc_pic.c) | 0 | ||||
-rw-r--r-- | hw/ppc/Makefile.objs | 17 | ||||
-rw-r--r-- | hw/ppc/ppc.c (renamed from hw/ppc.c) | 0 | ||||
-rw-r--r-- | hw/ppc/ppc405_boards.c (renamed from hw/ppc405_boards.c) | 0 | ||||
-rw-r--r-- | hw/ppc/ppc405_uc.c (renamed from hw/ppc405_uc.c) | 0 | ||||
-rw-r--r-- | hw/ppc/ppc440_bamboo.c (renamed from hw/ppc440_bamboo.c) | 0 | ||||
-rw-r--r-- | hw/ppc/ppc_booke.c (renamed from hw/ppc_booke.c) | 0 | ||||
-rw-r--r-- | hw/ppc/spapr.c (renamed from hw/spapr.c) | 0 | ||||
-rw-r--r-- | hw/ppc/virtex_ml507.c (renamed from hw/virtex_ml507.c) | 0 | ||||
-rw-r--r-- | hw/sh4/Makefile.objs | 4 | ||||
-rw-r--r-- | hw/sh4/r2d.c (renamed from hw/r2d.c) | 0 | ||||
-rw-r--r-- | hw/sh4/shix.c (renamed from hw/shix.c) | 0 | ||||
-rw-r--r-- | hw/sparc/Makefile.objs | 6 | ||||
-rw-r--r-- | hw/sparc/leon3.c (renamed from hw/leon3.c) | 0 | ||||
-rw-r--r-- | hw/sparc/sun4m.c (renamed from hw/sun4m.c) | 0 | ||||
-rw-r--r-- | hw/sparc64/Makefile.objs | 4 | ||||
-rw-r--r-- | hw/sparc64/sun4u.c (renamed from hw/sun4u.c) | 0 | ||||
-rw-r--r-- | hw/unicore32/Makefile.objs | 2 | ||||
-rw-r--r-- | hw/unicore32/puv3.c (renamed from hw/puv3.c) | 0 | ||||
-rw-r--r-- | hw/xtensa/Makefile.objs | 4 | ||||
-rw-r--r-- | hw/xtensa/pic_cpu.c (renamed from hw/xtensa_pic.c) | 0 | ||||
-rw-r--r-- | hw/xtensa/xtensa_lx60.c (renamed from hw/xtensa_lx60.c) | 0 | ||||
-rw-r--r-- | hw/xtensa/xtensa_sim.c (renamed from hw/xtensa_sim.c) | 0 |
85 files changed, 72 insertions, 62 deletions
diff --git a/hw/Makefile.objs b/hw/Makefile.objs index 43f467a1e..eb7eb31a1 100644 --- a/hw/Makefile.objs +++ b/hw/Makefile.objs @@ -206,7 +206,6 @@ obj-$(CONFIG_SOFTMMU) += vhost_net.o obj-$(CONFIG_VHOST_NET) += vhost.o obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/ obj-$(CONFIG_VGA) += vga.o -obj-$(CONFIG_XEN) += xen_domainbuild.o xen_machine_pv.o # Inter-VM PCI shared memory & VFIO PCI device assignment ifeq ($(CONFIG_PCI), y) diff --git a/hw/alpha/Makefile.objs b/hw/alpha/Makefile.objs index af1c07fa7..db868d2ea 100644 --- a/hw/alpha/Makefile.objs +++ b/hw/alpha/Makefile.objs @@ -1,4 +1,6 @@ obj-y = mc146818rtc.o -obj-y += alpha_pci.o alpha_dp264.o alpha_typhoon.o +obj-y += alpha_typhoon.o obj-y := $(addprefix ../,$(obj-y)) + +obj-y += dp264.o pci.o diff --git a/hw/alpha_dp264.c b/hw/alpha/dp264.c index 13aaa57b9..13aaa57b9 100644 --- a/hw/alpha_dp264.c +++ b/hw/alpha/dp264.c diff --git a/hw/alpha_pci.c b/hw/alpha/pci.c index 84628686a..84628686a 100644 --- a/hw/alpha_pci.c +++ b/hw/alpha/pci.c diff --git a/hw/arm/Makefile.objs b/hw/arm/Makefile.objs index 3eb1366ae..c09cc3aae 100644 --- a/hw/arm/Makefile.objs +++ b/hw/arm/Makefile.objs @@ -1,35 +1,32 @@ -obj-y = integratorcp.o versatilepb.o arm_pic.o -obj-y += arm_boot.o -obj-y += xilinx_zynq.o zynq_slcr.o +obj-y += zynq_slcr.o obj-y += xilinx_spips.o obj-y += arm_gic.o arm_gic_common.o obj-y += a9scu.o -obj-y += realview_gic.o realview.o arm_sysctl.o arm11mpcore.o a9mpcore.o +obj-y += realview_gic.o arm_sysctl.o arm11mpcore.o a9mpcore.o obj-y += exynos4210_gic.o exynos4210_combiner.o exynos4210.o -obj-y += exynos4_boards.o exynos4210_uart.o exynos4210_pwm.o +obj-y += exynos4210_uart.o exynos4210_pwm.o obj-y += exynos4210_pmu.o exynos4210_mct.o exynos4210_fimd.o obj-y += exynos4210_rtc.o exynos4210_i2c.o obj-y += arm_mptimer.o a15mpcore.o -obj-y += armv7m.o armv7m_nvic.o stellaris.o stellaris_enet.o -obj-y += highbank.o +obj-y += armv7m.o armv7m_nvic.o stellaris_enet.o obj-y += pxa2xx.o pxa2xx_pic.o pxa2xx_gpio.o pxa2xx_timer.o pxa2xx_dma.o obj-y += pxa2xx_lcd.o pxa2xx_mmci.o pxa2xx_pcmcia.o pxa2xx_keypad.o -obj-y += gumstix.o -obj-y += zaurus.o ide/microdrive.o spitz.o tosa.o tc6393xb.o +obj-y += zaurus.o ide/microdrive.o tc6393xb.o obj-y += omap1.o omap_lcdc.o omap_dma.o omap_clk.o omap_mmc.o omap_i2c.o \ omap_gpio.o omap_intc.o omap_uart.o obj-y += omap2.o omap_dss.o soc_dma.o omap_gptimer.o omap_synctimer.o \ omap_gpmc.o omap_sdrc.o omap_spi.o omap_tap.o omap_l4.o -obj-y += omap_sx1.o palm.o tsc210x.o -obj-y += nseries.o blizzard.o onenand.o cbus.o tusb6010.o usb/hcd-musb.o -obj-y += mst_fpga.o mainstone.o -obj-y += z2.o -obj-y += musicpal.o bitbang_i2c.o marvell_88w8618_audio.o +obj-y += tsc210x.o +obj-y += blizzard.o onenand.o cbus.o tusb6010.o usb/hcd-musb.o +obj-y += mst_fpga.o +obj-y += bitbang_i2c.o marvell_88w8618_audio.o obj-y += framebuffer.o -obj-y += vexpress.o obj-y += strongarm.o -obj-y += collie.o obj-y += imx_serial.o imx_ccm.o imx_timer.o imx_avic.o -obj-y += kzm.o obj-y := $(addprefix ../,$(obj-y)) + +obj-y += boot.o collie.o exynos4_boards.o gumstix.o highbank.o +obj-y += integratorcp.o kzm.o mainstone.o musicpal.o nseries.o +obj-y += omap_sx1.o palm.o pic_cpu.o realview.o spitz.o stellaris.o +obj-y += tosa.o versatilepb.o vexpress.o xilinx_zynq.o z2.o diff --git a/hw/arm_boot.c b/hw/arm/boot.c index 43253fd34..43253fd34 100644 --- a/hw/arm_boot.c +++ b/hw/arm/boot.c diff --git a/hw/collie.c b/hw/arm/collie.c index 17fddc8d5..17fddc8d5 100644 --- a/hw/collie.c +++ b/hw/arm/collie.c diff --git a/hw/exynos4_boards.c b/hw/arm/exynos4_boards.c index 473da349b..473da349b 100644 --- a/hw/exynos4_boards.c +++ b/hw/arm/exynos4_boards.c diff --git a/hw/gumstix.c b/hw/arm/gumstix.c index 8859b7392..8859b7392 100644 --- a/hw/gumstix.c +++ b/hw/arm/gumstix.c diff --git a/hw/highbank.c b/hw/arm/highbank.c index a622224dc..a622224dc 100644 --- a/hw/highbank.c +++ b/hw/arm/highbank.c diff --git a/hw/integratorcp.c b/hw/arm/integratorcp.c index e0ba327a5..e0ba327a5 100644 --- a/hw/integratorcp.c +++ b/hw/arm/integratorcp.c diff --git a/hw/kzm.c b/hw/arm/kzm.c index ec50a319a..ec50a319a 100644 --- a/hw/kzm.c +++ b/hw/arm/kzm.c diff --git a/hw/mainstone.c b/hw/arm/mainstone.c index aea908f03..aea908f03 100644 --- a/hw/mainstone.c +++ b/hw/arm/mainstone.c diff --git a/hw/musicpal.c b/hw/arm/musicpal.c index a37dbd796..a37dbd796 100644 --- a/hw/musicpal.c +++ b/hw/arm/musicpal.c diff --git a/hw/nseries.c b/hw/arm/nseries.c index c5bf9f95b..c5bf9f95b 100644 --- a/hw/nseries.c +++ b/hw/arm/nseries.c diff --git a/hw/omap_sx1.c b/hw/arm/omap_sx1.c index 85982334b..85982334b 100644 --- a/hw/omap_sx1.c +++ b/hw/arm/omap_sx1.c diff --git a/hw/palm.c b/hw/arm/palm.c index 91bc74af2..91bc74af2 100644 --- a/hw/palm.c +++ b/hw/arm/palm.c diff --git a/hw/arm_pic.c b/hw/arm/pic_cpu.c index a7ad893cc..a7ad893cc 100644 --- a/hw/arm_pic.c +++ b/hw/arm/pic_cpu.c diff --git a/hw/realview.c b/hw/arm/realview.c index 5fb490c83..5fb490c83 100644 --- a/hw/realview.c +++ b/hw/arm/realview.c diff --git a/hw/spitz.c b/hw/arm/spitz.c index f5832bea9..f5832bea9 100644 --- a/hw/spitz.c +++ b/hw/arm/spitz.c diff --git a/hw/stellaris.c b/hw/arm/stellaris.c index f4ce7945f..f4ce7945f 100644 --- a/hw/stellaris.c +++ b/hw/arm/stellaris.c diff --git a/hw/tosa.c b/hw/arm/tosa.c index 747888c64..747888c64 100644 --- a/hw/tosa.c +++ b/hw/arm/tosa.c diff --git a/hw/versatilepb.c b/hw/arm/versatilepb.c index baaa26588..baaa26588 100644 --- a/hw/versatilepb.c +++ b/hw/arm/versatilepb.c diff --git a/hw/vexpress.c b/hw/arm/vexpress.c index 02922c38b..02922c38b 100644 --- a/hw/vexpress.c +++ b/hw/arm/vexpress.c diff --git a/hw/xilinx_zynq.c b/hw/arm/xilinx_zynq.c index f78c47e43..f78c47e43 100644 --- a/hw/xilinx_zynq.c +++ b/hw/arm/xilinx_zynq.c diff --git a/hw/cris/Makefile.objs b/hw/cris/Makefile.objs index aa9298a0e..a94c62450 100644 --- a/hw/cris/Makefile.objs +++ b/hw/cris/Makefile.objs @@ -1,8 +1,3 @@ -# Boards -obj-y = cris_pic_cpu.o -obj-y += cris-boot.o -obj-y += axis_dev88.o - # IO blocks obj-y += etraxfs_dma.o obj-y += etraxfs_pic.o @@ -11,3 +6,8 @@ obj-y += etraxfs_timer.o obj-y += etraxfs_ser.o obj-y := $(addprefix ../,$(obj-y)) + +# Boards +obj-y += pic_cpu.o +obj-y += boot.o +obj-y += axis_dev88.o diff --git a/hw/axis_dev88.c b/hw/cris/axis_dev88.c index eccd423ab..eccd423ab 100644 --- a/hw/axis_dev88.c +++ b/hw/cris/axis_dev88.c diff --git a/hw/cris-boot.c b/hw/cris/boot.c index c330e22a8..c330e22a8 100644 --- a/hw/cris-boot.c +++ b/hw/cris/boot.c diff --git a/hw/cris_pic_cpu.c b/hw/cris/pic_cpu.c index 7f50471e5..7f50471e5 100644 --- a/hw/cris_pic_cpu.c +++ b/hw/cris/pic_cpu.c diff --git a/hw/i386/Makefile.objs b/hw/i386/Makefile.objs index 025803aa6..5d071f418 100644 --- a/hw/i386/Makefile.objs +++ b/hw/i386/Makefile.objs @@ -1,12 +1,11 @@ -obj-y += mc146818rtc.o pc.o +obj-y += mc146818rtc.o obj-y += apic_common.o apic.o kvmvapic.o obj-y += sga.o ioapic_common.o ioapic.o piix_pci.o obj-y += vmport.o -obj-y += pci/pci-hotplug.o smbios.o wdt_ib700.o -obj-y += debugcon.o debugexit.o multiboot.o -obj-y += pc_piix.o +obj-y += pci/pci-hotplug.o wdt_ib700.o +obj-y += debugcon.o debugexit.o obj-y += pc_sysfw.o -obj-y += lpc_ich9.o q35.o pc_q35.o +obj-y += lpc_ich9.o q35.o obj-$(CONFIG_XEN) += xen_platform.o xen_apic.o obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen-host-pci-device.o obj-$(CONFIG_XEN_PCI_PASSTHROUGH) += xen_pt.o xen_pt_config_init.o xen_pt_msi.o @@ -15,3 +14,7 @@ obj-$(CONFIG_SPICE) += qxl.o qxl-logger.o qxl-render.o obj-y += pc-testdev.o obj-y := $(addprefix ../,$(obj-y)) + +obj-y += multiboot.o smbios.o +obj-y += pc.o pc_piix.o pc_q35.o +obj-$(CONFIG_XEN) += xen_domainbuild.o xen_machine_pv.o diff --git a/hw/multiboot.c b/hw/i386/multiboot.c index 3cb228f0c..3cb228f0c 100644 --- a/hw/multiboot.c +++ b/hw/i386/multiboot.c diff --git a/hw/pc_piix.c b/hw/i386/pc_piix.c index 73a8656df..73a8656df 100644 --- a/hw/pc_piix.c +++ b/hw/i386/pc_piix.c diff --git a/hw/pc_q35.c b/hw/i386/pc_q35.c index 4f5f34730..4f5f34730 100644 --- a/hw/pc_q35.c +++ b/hw/i386/pc_q35.c diff --git a/hw/smbios.c b/hw/i386/smbios.c index 672ee9b0e..672ee9b0e 100644 --- a/hw/smbios.c +++ b/hw/i386/smbios.c diff --git a/hw/xen_domainbuild.c b/hw/i386/xen_domainbuild.c index d47706154..d47706154 100644 --- a/hw/xen_domainbuild.c +++ b/hw/i386/xen_domainbuild.c diff --git a/hw/xen_machine_pv.c b/hw/i386/xen_machine_pv.c index a8177b634..a8177b634 100644 --- a/hw/xen_machine_pv.c +++ b/hw/i386/xen_machine_pv.c diff --git a/hw/lm32/Makefile.objs b/hw/lm32/Makefile.objs index 4e1843c11..4592fe5fc 100644 --- a/hw/lm32/Makefile.objs +++ b/hw/lm32/Makefile.objs @@ -1,7 +1,3 @@ -# LM32 boards -obj-y += lm32_boards.o -obj-y += milkymist.o - # LM32 peripherals obj-y += lm32_pic.o obj-y += lm32_juart.o @@ -21,3 +17,7 @@ obj-y += milkymist-vgafb.o obj-y += framebuffer.o obj-y := $(addprefix ../,$(obj-y)) + +# LM32 boards +obj-y += lm32_boards.o +obj-y += milkymist.o diff --git a/hw/lm32_boards.c b/hw/lm32/lm32_boards.c index 1ce466a1b..1ce466a1b 100644 --- a/hw/lm32_boards.c +++ b/hw/lm32/lm32_boards.c diff --git a/hw/milkymist.c b/hw/lm32/milkymist.c index fd36de57b..fd36de57b 100644 --- a/hw/milkymist.c +++ b/hw/lm32/milkymist.c diff --git a/hw/m68k/Makefile.objs b/hw/m68k/Makefile.objs index 93b6d25ba..7c033a886 100644 --- a/hw/m68k/Makefile.objs +++ b/hw/m68k/Makefile.objs @@ -1,4 +1,7 @@ -obj-y = an5206.o mcf5206.o mcf_uart.o mcf_intc.o mcf5208.o mcf_fec.o -obj-y += dummy_m68k.o +obj-y = mcf5206.o mcf_uart.o mcf_intc.o mcf_fec.o obj-y := $(addprefix ../,$(obj-y)) + +obj-y += an5206.o mcf5208.o +obj-y += dummy_m68k.o + diff --git a/hw/an5206.c b/hw/m68k/an5206.c index 7c21c66cd..7c21c66cd 100644 --- a/hw/an5206.c +++ b/hw/m68k/an5206.c diff --git a/hw/dummy_m68k.c b/hw/m68k/dummy_m68k.c index 544d56b59..544d56b59 100644 --- a/hw/dummy_m68k.c +++ b/hw/m68k/dummy_m68k.c diff --git a/hw/mcf5208.c b/hw/m68k/mcf5208.c index 748bf5698..748bf5698 100644 --- a/hw/mcf5208.c +++ b/hw/m68k/mcf5208.c diff --git a/hw/microblaze/Makefile.objs b/hw/microblaze/Makefile.objs index 2ff8048a9..9e7f24994 100644 --- a/hw/microblaze/Makefile.objs +++ b/hw/microblaze/Makefile.objs @@ -1,9 +1,9 @@ -obj-y = petalogix_s3adsp1800_mmu.o -obj-y += petalogix_ml605_mmu.o -obj-y += microblaze_boot.o obj-y += xilinx_spi.o - -obj-y += microblaze_pic_cpu.o obj-y += xilinx_ethlite.o obj-y := $(addprefix ../,$(obj-y)) + +obj-y += petalogix_s3adsp1800_mmu.o +obj-y += petalogix_ml605_mmu.o +obj-y += boot.o +obj-y += pic_cpu.o diff --git a/hw/microblaze_boot.c b/hw/microblaze/boot.c index e13b3e13b..e13b3e13b 100644 --- a/hw/microblaze_boot.c +++ b/hw/microblaze/boot.c diff --git a/hw/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c index cfc02207a..cfc02207a 100644 --- a/hw/petalogix_ml605_mmu.c +++ b/hw/microblaze/petalogix_ml605_mmu.c diff --git a/hw/petalogix_s3adsp1800_mmu.c b/hw/microblaze/petalogix_s3adsp1800_mmu.c index 24983621e..24983621e 100644 --- a/hw/petalogix_s3adsp1800_mmu.c +++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c diff --git a/hw/microblaze_pic_cpu.c b/hw/microblaze/pic_cpu.c index d4743ab39..d4743ab39 100644 --- a/hw/microblaze_pic_cpu.c +++ b/hw/microblaze/pic_cpu.c diff --git a/hw/mips/Makefile.objs b/hw/mips/Makefile.objs index 29a5d0db0..1e3bca1c3 100644 --- a/hw/mips/Makefile.objs +++ b/hw/mips/Makefile.objs @@ -1,6 +1,8 @@ -obj-y = mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o -obj-y += mips_addr.o mips_timer.o mips_int.o obj-y += gt64xxx.o mc146818rtc.o -obj-$(CONFIG_FULONG) += bonito.o vt82c686.o mips_fulong2e.o +obj-$(CONFIG_FULONG) += bonito.o vt82c686.o obj-y := $(addprefix ../,$(obj-y)) + +obj-y += mips_r4k.o mips_jazz.o mips_malta.o mips_mipssim.o +obj-y += addr.o cputimer.o mips_int.o +obj-$(CONFIG_FULONG) += mips_fulong2e.o diff --git a/hw/mips_addr.c b/hw/mips/addr.c index cddc25cf3..cddc25cf3 100644 --- a/hw/mips_addr.c +++ b/hw/mips/addr.c diff --git a/hw/mips_timer.c b/hw/mips/cputimer.c index 9ad13f392..9ad13f392 100644 --- a/hw/mips_timer.c +++ b/hw/mips/cputimer.c diff --git a/hw/mips_fulong2e.c b/hw/mips/mips_fulong2e.c index 766aa9dfb..766aa9dfb 100644 --- a/hw/mips_fulong2e.c +++ b/hw/mips/mips_fulong2e.c diff --git a/hw/mips_int.c b/hw/mips/mips_int.c index ddd3b1bb0..ddd3b1bb0 100644 --- a/hw/mips_int.c +++ b/hw/mips/mips_int.c diff --git a/hw/mips_jazz.c b/hw/mips/mips_jazz.c index daeb985b1..daeb985b1 100644 --- a/hw/mips_jazz.c +++ b/hw/mips/mips_jazz.c diff --git a/hw/mips_malta.c b/hw/mips/mips_malta.c index 9a67dce20..9a67dce20 100644 --- a/hw/mips_malta.c +++ b/hw/mips/mips_malta.c diff --git a/hw/mips_mipssim.c b/hw/mips/mips_mipssim.c index 4935c78c0..4935c78c0 100644 --- a/hw/mips_mipssim.c +++ b/hw/mips/mips_mipssim.c diff --git a/hw/mips_r4k.c b/hw/mips/mips_r4k.c index 539a56262..539a56262 100644 --- a/hw/mips_r4k.c +++ b/hw/mips/mips_r4k.c diff --git a/hw/openrisc/Makefile.objs b/hw/openrisc/Makefile.objs index 38ff8f5d6..61246b149 100644 --- a/hw/openrisc/Makefile.objs +++ b/hw/openrisc/Makefile.objs @@ -1,3 +1,2 @@ -obj-y = openrisc_pic.o openrisc_sim.o openrisc_timer.o - -obj-y := $(addprefix ../,$(obj-y)) +obj-y = pic_cpu.o cputimer.o +obj-y += openrisc_sim.o diff --git a/hw/openrisc_timer.c b/hw/openrisc/cputimer.c index f6c877f42..f6c877f42 100644 --- a/hw/openrisc_timer.c +++ b/hw/openrisc/cputimer.c diff --git a/hw/openrisc_sim.c b/hw/openrisc/openrisc_sim.c index db2aac8cf..db2aac8cf 100644 --- a/hw/openrisc_sim.c +++ b/hw/openrisc/openrisc_sim.c diff --git a/hw/openrisc_pic.c b/hw/openrisc/pic_cpu.c index 931511ec0..931511ec0 100644 --- a/hw/openrisc_pic.c +++ b/hw/openrisc/pic_cpu.c diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs index 9141373f4..294d0de21 100644 --- a/hw/ppc/Makefile.objs +++ b/hw/ppc/Makefile.objs @@ -1,19 +1,14 @@ -# shared objects -obj-y = ppc.o ppc_booke.o # PREP target obj-y += mc146818rtc.o # IBM pSeries (sPAPR) -obj-$(CONFIG_PSERIES) += spapr.o spapr_hcall.o spapr_rtas.o spapr_vio.o +obj-$(CONFIG_PSERIES) += spapr_hcall.o spapr_rtas.o spapr_vio.o obj-$(CONFIG_PSERIES) += xics.o spapr_vty.o spapr_llan.o spapr_vscsi.o obj-$(CONFIG_PSERIES) += spapr_pci.o pci/pci-hotplug.o spapr_iommu.o obj-$(CONFIG_PSERIES) += spapr_events.o spapr_nvram.o # PowerPC 4xx boards -obj-y += ppc4xx_devs.o ppc4xx_pci.o ppc405_uc.o ppc405_boards.o -obj-y += ppc440_bamboo.o +obj-y += ppc4xx_devs.o ppc4xx_pci.o # PowerPC E500 boards obj-$(CONFIG_E500) += mpc8544_guts.o ppce500_spin.o -# PowerPC 440 Xilinx ML507 reference board. -obj-y += virtex_ml507.o # PowerPC OpenPIC obj-y += openpic.o @@ -22,6 +17,12 @@ obj-y += xilinx_ethlite.o obj-y := $(addprefix ../,$(obj-y)) +# shared objects +obj-y += ppc.o ppc_booke.o +# IBM pSeries (sPAPR) +obj-$(CONFIG_PSERIES) += spapr.o +# PowerPC 4xx boards +obj-y += ppc405_boards.o ppc405_uc.o ppc440_bamboo.o # PReP obj-y += prep.o # OldWorld PowerMac @@ -30,3 +31,5 @@ obj-y += mac_oldworld.o obj-y += mac_newworld.o # e500 obj-$(CONFIG_E500) += e500.o mpc8544ds.o e500plat.o +# PowerPC 440 Xilinx ML507 reference board. +obj-y += virtex_ml507.o diff --git a/hw/ppc.c b/hw/ppc/ppc.c index c9437fc6a..c9437fc6a 100644 --- a/hw/ppc.c +++ b/hw/ppc/ppc.c diff --git a/hw/ppc405_boards.c b/hw/ppc/ppc405_boards.c index ba443cf8e..ba443cf8e 100644 --- a/hw/ppc405_boards.c +++ b/hw/ppc/ppc405_boards.c diff --git a/hw/ppc405_uc.c b/hw/ppc/ppc405_uc.c index 8465f6dcd..8465f6dcd 100644 --- a/hw/ppc405_uc.c +++ b/hw/ppc/ppc405_uc.c diff --git a/hw/ppc440_bamboo.c b/hw/ppc/ppc440_bamboo.c index 66911b58c..66911b58c 100644 --- a/hw/ppc440_bamboo.c +++ b/hw/ppc/ppc440_bamboo.c diff --git a/hw/ppc_booke.c b/hw/ppc/ppc_booke.c index 30375c0c4..30375c0c4 100644 --- a/hw/ppc_booke.c +++ b/hw/ppc/ppc_booke.c diff --git a/hw/spapr.c b/hw/ppc/spapr.c index 2709c660c..2709c660c 100644 --- a/hw/spapr.c +++ b/hw/ppc/spapr.c diff --git a/hw/virtex_ml507.c b/hw/ppc/virtex_ml507.c index 41eab1697..41eab1697 100644 --- a/hw/virtex_ml507.c +++ b/hw/ppc/virtex_ml507.c diff --git a/hw/sh4/Makefile.objs b/hw/sh4/Makefile.objs index 68c592179..b2e1f1e04 100644 --- a/hw/sh4/Makefile.objs +++ b/hw/sh4/Makefile.objs @@ -1,5 +1,7 @@ -obj-y = shix.o r2d.o sh7750.o sh7750_regnames.o tc58128.o +obj-y = sh7750.o sh7750_regnames.o tc58128.o obj-y += sh_timer.o sh_serial.o sh_intc.o sh_pci.o sm501.o obj-y += ide/mmio.o obj-y := $(addprefix ../,$(obj-y)) + +obj-y += shix.o r2d.o diff --git a/hw/r2d.c b/hw/sh4/r2d.c index faa03d206..faa03d206 100644 --- a/hw/r2d.c +++ b/hw/sh4/r2d.c diff --git a/hw/shix.c b/hw/sh4/shix.c index 192579d06..192579d06 100644 --- a/hw/shix.c +++ b/hw/sh4/shix.c diff --git a/hw/sparc/Makefile.objs b/hw/sparc/Makefile.objs index a39a511c5..71bbddf8c 100644 --- a/hw/sparc/Makefile.objs +++ b/hw/sparc/Makefile.objs @@ -1,8 +1,10 @@ -obj-y = sun4m.o lance.o tcx.o sun4m_iommu.o slavio_intctl.o +obj-y = lance.o tcx.o sun4m_iommu.o slavio_intctl.o obj-y += slavio_timer.o slavio_misc.o sparc32_dma.o -obj-y += cs4231.o eccmemctl.o sbi.o sun4c_intctl.o leon3.o +obj-y += cs4231.o eccmemctl.o sbi.o sun4c_intctl.o # GRLIB obj-y += grlib_gptimer.o grlib_irqmp.o grlib_apbuart.o obj-y := $(addprefix ../,$(obj-y)) + +obj-y += sun4m.o leon3.o diff --git a/hw/leon3.c b/hw/sparc/leon3.c index f58061f8e..f58061f8e 100644 --- a/hw/leon3.c +++ b/hw/sparc/leon3.c diff --git a/hw/sun4m.c b/hw/sparc/sun4m.c index 37bd04108..37bd04108 100644 --- a/hw/sun4m.c +++ b/hw/sparc/sun4m.c diff --git a/hw/sparc64/Makefile.objs b/hw/sparc64/Makefile.objs index 8c65fc421..4df0d90ec 100644 --- a/hw/sparc64/Makefile.objs +++ b/hw/sparc64/Makefile.objs @@ -1,4 +1,6 @@ -obj-y = sun4u.o apb_pci.o +obj-y = apb_pci.o obj-y += mc146818rtc.o obj-y := $(addprefix ../,$(obj-y)) + +obj-y += sun4u.o diff --git a/hw/sun4u.c b/hw/sparc64/sun4u.c index 51ffa1c09..51ffa1c09 100644 --- a/hw/sun4u.c +++ b/hw/sparc64/sun4u.c diff --git a/hw/unicore32/Makefile.objs b/hw/unicore32/Makefile.objs index 0725ce3ca..e0fd62852 100644 --- a/hw/unicore32/Makefile.objs +++ b/hw/unicore32/Makefile.objs @@ -2,5 +2,3 @@ # PKUnity-v3 SoC and board information obj-${CONFIG_PUV3} += puv3.o - -obj-y := $(addprefix ../,$(obj-y)) diff --git a/hw/puv3.c b/hw/unicore32/puv3.c index f9d0c2bab..f9d0c2bab 100644 --- a/hw/puv3.c +++ b/hw/unicore32/puv3.c diff --git a/hw/xtensa/Makefile.objs b/hw/xtensa/Makefile.objs index 79698e903..6ead7820c 100644 --- a/hw/xtensa/Makefile.objs +++ b/hw/xtensa/Makefile.objs @@ -1,5 +1,3 @@ -obj-y += xtensa_pic.o +obj-y += pic_cpu.o obj-y += xtensa_sim.o obj-y += xtensa_lx60.o - -obj-y := $(addprefix ../,$(obj-y)) diff --git a/hw/xtensa_pic.c b/hw/xtensa/pic_cpu.c index f485a1465..f485a1465 100644 --- a/hw/xtensa_pic.c +++ b/hw/xtensa/pic_cpu.c diff --git a/hw/xtensa_lx60.c b/hw/xtensa/xtensa_lx60.c index f2a63d82d..f2a63d82d 100644 --- a/hw/xtensa_lx60.c +++ b/hw/xtensa/xtensa_lx60.c diff --git a/hw/xtensa_sim.c b/hw/xtensa/xtensa_sim.c index 5241f8d73..5241f8d73 100644 --- a/hw/xtensa_sim.c +++ b/hw/xtensa/xtensa_sim.c |