Patchwork [17/18] ppc: move more files to hw/ppc

login
register
mail settings
Submitter Paolo Bonzini
Date March 1, 2013, 1:33 p.m.
Message ID <1362144829-26979-18-git-send-email-pbonzini@redhat.com>
Download mbox | patch
Permalink /patch/224355/
State New
Headers show

Comments

Paolo Bonzini - March 1, 2013, 1:33 p.m.
These sPAPR files do not implement devices, move them over.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 hw/ppc/Makefile.objs        | 8 ++++----
 hw/{ => ppc}/spapr_events.c | 0
 hw/{ => ppc}/spapr_hcall.c  | 0
 hw/{ => ppc}/spapr_iommu.c  | 0
 hw/{ => ppc}/spapr_rtas.c   | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename hw/{ => ppc}/spapr_events.c (100%)
 rename hw/{ => ppc}/spapr_hcall.c (100%)
 rename hw/{ => ppc}/spapr_iommu.c (100%)
 rename hw/{ => ppc}/spapr_rtas.c (100%)

diff --git a/hw/spapr_events.c b/hw/ppc/spapr_events.c
similarity index 100%
rename from hw/spapr_events.c
rename to hw/ppc/spapr_events.c
diff --git a/hw/spapr_hcall.c b/hw/ppc/spapr_hcall.c
similarity index 100%
rename from hw/spapr_hcall.c
rename to hw/ppc/spapr_hcall.c
diff --git a/hw/spapr_iommu.c b/hw/ppc/spapr_iommu.c
similarity index 100%
rename from hw/spapr_iommu.c
rename to hw/ppc/spapr_iommu.c
diff --git a/hw/spapr_rtas.c b/hw/ppc/spapr_rtas.c
similarity index 100%
rename from hw/spapr_rtas.c
rename to hw/ppc/spapr_rtas.c

Patch

diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs
index acc9961..4de0209 100644
--- a/hw/ppc/Makefile.objs
+++ b/hw/ppc/Makefile.objs
@@ -1,10 +1,9 @@ 
 # PREP target
 obj-y += mc146818rtc.o
 # IBM pSeries (sPAPR)
-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
+obj-$(CONFIG_PSERIES) += spapr_pci.o pci/pci-hotplug.o
+obj-$(CONFIG_PSERIES) += spapr_nvram.o
 # PowerPC 4xx boards
 obj-y += ppc4xx_pci.o
 # PowerPC OpenPIC
@@ -18,7 +17,8 @@  obj-y := $(addprefix ../,$(obj-y))
 # shared objects
 obj-y += ppc.o ppc_booke.o
 # IBM pSeries (sPAPR)
-obj-$(CONFIG_PSERIES) += spapr.o xics.o spapr_vio.o
+obj-$(CONFIG_PSERIES) += spapr.o xics.o spapr_vio.o spapr_events.o
+obj-$(CONFIG_PSERIES) += spapr_hcall.o spapr_iommu.o spapr_rtas.o
 # PowerPC 4xx boards
 obj-y += ppc405_boards.o ppc4xx_devs.o ppc405_uc.o ppc440_bamboo.o
 # PReP