mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

prep: Move PReP machine to hw/ppc/

Browse Source 
Signed-off-by: Andreas Färber <andreas.faerber@web.de>
This commit is contained in:
Andreas Färber 2013-01-26 20:41:58 +01:00
parent 8d5ce2e564
commit 7561015556
3 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
MAINTAINERS
View File

@ -395,7 +395,7 @@ PReP
M: Andreas Färber <andreas.faerber@web.de> M: Andreas Färber <andreas.faerber@web.de>
L: qemu-ppc@nongnu.org L: qemu-ppc@nongnu.org
S: Odd Fixes S: Odd Fixes
F: hw/ppc_prep.c F: hw/ppc/prep.c
F: hw/prep_pci.[hc] F: hw/prep_pci.[hc]
F: hw/pc87312.[hc] F: hw/pc87312.[hc]

3
hw/ppc/Makefile.objs
View File

@ -2,7 +2,6 @@
obj-y = ppc.o ppc_booke.o obj-y = ppc.o ppc_booke.o
# PREP target # PREP target
obj-y += mc146818rtc.o obj-y += mc146818rtc.o
obj-y += ppc_prep.o
# IBM pSeries (sPAPR) # IBM pSeries (sPAPR)
obj-$(CONFIG_PSERIES) += spapr.o spapr_hcall.o spapr_rtas.o spapr_vio.o obj-$(CONFIG_PSERIES) += spapr.o 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) += xics.o spapr_vty.o spapr_llan.o spapr_vscsi.o
@ -24,6 +23,8 @@ obj-y += xilinx_ethlite.o
obj-y := $(addprefix ../,$(obj-y)) obj-y := $(addprefix ../,$(obj-y))
# PReP
obj-y += prep.o
# OldWorld PowerMac # OldWorld PowerMac
obj-y += mac_oldworld.o obj-y += mac_oldworld.o
# NewWorld PowerMac # NewWorld PowerMac

28
hw/ppc_prep.c → hw/ppc/prep.c
View File

@ -21,23 +21,23 @@
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "hw.h" #include "hw/hw.h"
#include "nvram.h" #include "hw/nvram.h"
#include "pc.h" #include "hw/pc.h"
#include "serial.h" #include "hw/serial.h"
#include "fdc.h" #include "hw/fdc.h"
#include "net/net.h" #include "net/net.h"
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"
#include "isa.h" #include "hw/isa.h"
#include "pci/pci.h" #include "hw/pci/pci.h"
#include "pci/pci_host.h" #include "hw/pci/pci_host.h"
#include "ppc.h" #include "hw/ppc.h"
#include "boards.h" #include "hw/boards.h"
#include "qemu/log.h" #include "qemu/log.h"
#include "ide.h" #include "hw/ide.h"
#include "loader.h" #include "hw/loader.h"
#include "mc146818rtc.h" #include "hw/mc146818rtc.h"
#include "pc87312.h" #include "hw/pc87312.h"
#include "sysemu/blockdev.h" #include "sysemu/blockdev.h"
#include "sysemu/arch_init.h" #include "sysemu/arch_init.h"
#include "exec/address-spaces.h" #include "exec/address-spaces.h"