diff options
author | Paolo Bonzini <pbonzini@redhat.com> | 2013-02-05 15:22:56 +0100 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-03-01 15:01:19 +0100 |
commit | c68c4a56e93f54b374c5207f0185f8e9fa2aec3b (patch) | |
tree | aa9fd275d0a1335f9da17af6840f467955593768 | |
parent | 9743b581a819a05668e6a1f60e3ee6486d25f141 (diff) |
ppc: move files referencing CPU to hw/ppc/
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
-rw-r--r-- | hw/ppc/Makefile.objs | 13 | ||||
-rw-r--r-- | hw/ppc/mpc8544_guts.c (renamed from hw/mpc8544_guts.c) | 0 | ||||
-rw-r--r-- | hw/ppc/ppc4xx_devs.c (renamed from hw/ppc4xx_devs.c) | 0 | ||||
-rw-r--r-- | hw/ppc/ppce500_spin.c (renamed from hw/ppce500_spin.c) | 0 | ||||
-rw-r--r-- | hw/ppc/spapr_vio.c (renamed from hw/spapr_vio.c) | 0 | ||||
-rw-r--r-- | hw/ppc/xics.c (renamed from hw/xics.c) | 0 |
6 files changed, 6 insertions, 7 deletions
diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs index 294d0de211..acc9961ab0 100644 --- a/hw/ppc/Makefile.objs +++ b/hw/ppc/Makefile.objs @@ -1,14 +1,12 @@ # PREP target obj-y += mc146818rtc.o # IBM pSeries (sPAPR) -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_hcall.o spapr_rtas.o +obj-$(CONFIG_PSERIES) += 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 -# PowerPC E500 boards -obj-$(CONFIG_E500) += mpc8544_guts.o ppce500_spin.o +obj-y += ppc4xx_pci.o # PowerPC OpenPIC obj-y += openpic.o @@ -20,9 +18,9 @@ obj-y := $(addprefix ../,$(obj-y)) # shared objects obj-y += ppc.o ppc_booke.o # IBM pSeries (sPAPR) -obj-$(CONFIG_PSERIES) += spapr.o +obj-$(CONFIG_PSERIES) += spapr.o xics.o spapr_vio.o # PowerPC 4xx boards -obj-y += ppc405_boards.o ppc405_uc.o ppc440_bamboo.o +obj-y += ppc405_boards.o ppc4xx_devs.o ppc405_uc.o ppc440_bamboo.o # PReP obj-y += prep.o # OldWorld PowerMac @@ -31,5 +29,6 @@ obj-y += mac_oldworld.o obj-y += mac_newworld.o # e500 obj-$(CONFIG_E500) += e500.o mpc8544ds.o e500plat.o +obj-$(CONFIG_E500) += mpc8544_guts.o ppce500_spin.o # PowerPC 440 Xilinx ML507 reference board. obj-y += virtex_ml507.o diff --git a/hw/mpc8544_guts.c b/hw/ppc/mpc8544_guts.c index 193beab2c2..193beab2c2 100644 --- a/hw/mpc8544_guts.c +++ b/hw/ppc/mpc8544_guts.c diff --git a/hw/ppc4xx_devs.c b/hw/ppc/ppc4xx_devs.c index 49ec728a7b..49ec728a7b 100644 --- a/hw/ppc4xx_devs.c +++ b/hw/ppc/ppc4xx_devs.c diff --git a/hw/ppce500_spin.c b/hw/ppc/ppce500_spin.c index d904fbe176..d904fbe176 100644 --- a/hw/ppce500_spin.c +++ b/hw/ppc/ppce500_spin.c diff --git a/hw/spapr_vio.c b/hw/ppc/spapr_vio.c index 6eb3ab5482..6eb3ab5482 100644 --- a/hw/spapr_vio.c +++ b/hw/ppc/spapr_vio.c diff --git a/hw/xics.c b/hw/ppc/xics.c index c3ef12fff4..c3ef12fff4 100644 --- a/hw/xics.c +++ b/hw/ppc/xics.c |