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

ppc: Move Mac machines to hw/ppc/

Browse Source 
Signed-off-by: Andreas Färber <afaerber@suse.de>
[agraf: squash in MAINTAINERS fix]
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Andreas Färber 2013-01-23 23:03:54 +00:00 committed by Alexander Graf
parent 11c29918be
commit baec19105b
13 changed files with 44 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MAINTAINERS
View File

@ -380,7 +380,7 @@ New World
M: Alexander Graf <agraf@suse.de> M: Alexander Graf <agraf@suse.de>
L: qemu-ppc@nongnu.org L: qemu-ppc@nongnu.org
S: Maintained S: Maintained
F: hw/ppc_newworld.c F: hw/ppc/mac_newworld.c
F: hw/unin_pci.c F: hw/unin_pci.c
F: hw/dec_pci.[hc] F: hw/dec_pci.[hc]
@ -388,7 +388,7 @@ Old World
M: Alexander Graf <agraf@suse.de> M: Alexander Graf <agraf@suse.de>
L: qemu-ppc@nongnu.org L: qemu-ppc@nongnu.org
S: Maintained S: Maintained
F: hw/ppc_oldworld.c F: hw/ppc/mac_oldworld.c
F: hw/grackle_pci.c F: hw/grackle_pci.c
PReP PReP

2
hw/cuda.c
View File

@ -23,7 +23,7 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "hw.h" #include "hw.h"
#include "ppc_mac.h" #include "ppc/mac.h"
#include "adb.h" #include "adb.h"
#include "qemu/timer.h" #include "qemu/timer.h"
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"

2
hw/grackle_pci.c
View File

@ -24,7 +24,7 @@
*/ */
#include "pci/pci_host.h" #include "pci/pci_host.h"
#include "ppc_mac.h" #include "ppc/mac.h"
#include "pci/pci.h" #include "pci/pci.h"
/* debug Grackle */ /* debug Grackle */

2
hw/heathrow_pic.c
View File

@ -23,7 +23,7 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "hw.h" #include "hw.h"
#include "ppc_mac.h" #include "ppc/mac.h"
/* debug PIC */ /* debug PIC */
//#define DEBUG_PIC //#define DEBUG_PIC

6
hw/ide/macio.c
View File

@ -22,9 +22,9 @@
* 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/hw.h> #include "hw/hw.h"
#include <hw/ppc_mac.h> #include "hw/ppc/mac.h"
#include <hw/mac_dbdma.h> #include "hw/mac_dbdma.h"
#include "block/block.h" #include "block/block.h"
#include "sysemu/dma.h" #include "sysemu/dma.h"

2
hw/mac_nvram.c
View File

@ -25,7 +25,7 @@
#include "hw.h" #include "hw.h"
#include "firmware_abi.h" #include "firmware_abi.h"
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"
#include "ppc_mac.h" #include "ppc/mac.h"
/* debug NVR */ /* debug NVR */
//#define DEBUG_NVR //#define DEBUG_NVR

2
hw/macio.c
View File

@ -23,7 +23,7 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "hw.h" #include "hw.h"
#include "ppc_mac.h" #include "ppc/mac.h"
#include "pci/pci.h" #include "pci/pci.h"
#include "escc.h" #include "escc.h"

2
hw/openpic.c
View File

@ -34,7 +34,7 @@
* *
*/ */
#include "hw.h" #include "hw.h"
#include "ppc_mac.h" #include "ppc/mac.h"
#include "pci/pci.h" #include "pci/pci.h"
#include "openpic.h" #include "openpic.h"
#include "sysbus.h" #include "sysbus.h"

9
hw/ppc/Makefile.objs
View File

@ -3,10 +3,6 @@ obj-y = ppc.o ppc_booke.o
# PREP target # PREP target
obj-y += mc146818rtc.o obj-y += mc146818rtc.o
obj-y += ppc_prep.o obj-y += ppc_prep.o
# OldWorld PowerMac
obj-y += ppc_oldworld.o
# NewWorld PowerMac
obj-y += ppc_newworld.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
@ -28,4 +24,9 @@ obj-y += xilinx_ethlite.o
obj-y := $(addprefix ../,$(obj-y)) obj-y := $(addprefix ../,$(obj-y))
# OldWorld PowerMac
obj-y += mac_oldworld.o
# NewWorld PowerMac
obj-y += mac_newworld.o
# e500
obj-$(CONFIG_FDT) += e500.o mpc8544ds.o e500plat.o obj-$(CONFIG_FDT) += e500.o mpc8544ds.o e500plat.o

0
hw/ppc_mac.h → hw/ppc/mac.h
View File

28
hw/ppc_newworld.c → hw/ppc/mac_newworld.c
View File

@ -46,28 +46,28 @@
* 0001:05:0c.0 IDE interface [0101]: Broadcom K2 SATA [1166:0240] * 0001:05:0c.0 IDE interface [0101]: Broadcom K2 SATA [1166:0240]
* *
*/ */
#include "hw.h" #include "hw/hw.h"
#include "ppc.h" #include "hw/ppc.h"
#include "ppc_mac.h" #include "hw/ppc/mac.h"
#include "adb.h" #include "hw/adb.h"
#include "mac_dbdma.h" #include "hw/mac_dbdma.h"
#include "nvram.h" #include "hw/nvram.h"
#include "pci/pci.h" #include "hw/pci/pci.h"
#include "net/net.h" #include "net/net.h"
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"
#include "boards.h" #include "hw/boards.h"
#include "fw_cfg.h" #include "hw/fw_cfg.h"
#include "escc.h" #include "hw/escc.h"
#include "openpic.h" #include "hw/openpic.h"
#include "ide.h" #include "hw/ide.h"
#include "loader.h" #include "hw/loader.h"
#include "elf.h" #include "elf.h"
#include "sysemu/kvm.h" #include "sysemu/kvm.h"
#include "kvm_ppc.h" #include "kvm_ppc.h"
#include "hw/usb.h" #include "hw/usb.h"
#include "sysemu/blockdev.h" #include "sysemu/blockdev.h"
#include "exec/address-spaces.h" #include "exec/address-spaces.h"
#include "sysbus.h" #include "hw/sysbus.h"
#define MAX_IDE_BUS 2 #define MAX_IDE_BUS 2
#define CFG_ADDR 0xf0000510 #define CFG_ADDR 0xf0000510

26
hw/ppc_oldworld.c → hw/ppc/mac_oldworld.c
View File

@ -23,21 +23,21 @@
* 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 "ppc.h" #include "hw/ppc.h"
#include "ppc_mac.h" #include "mac.h"
#include "adb.h" #include "hw/adb.h"
#include "mac_dbdma.h" #include "hw/mac_dbdma.h"
#include "nvram.h" #include "hw/nvram.h"
#include "sysemu/sysemu.h" #include "sysemu/sysemu.h"
#include "net/net.h" #include "net/net.h"
#include "isa.h" #include "hw/isa.h"
#include "pci/pci.h" #include "hw/pci/pci.h"
#include "boards.h" #include "hw/boards.h"
#include "fw_cfg.h" #include "hw/fw_cfg.h"
#include "escc.h" #include "hw/escc.h"
#include "ide.h" #include "hw/ide.h"
#include "loader.h" #include "hw/loader.h"
#include "elf.h" #include "elf.h"
#include "sysemu/kvm.h" #include "sysemu/kvm.h"
#include "kvm_ppc.h" #include "kvm_ppc.h"

2
hw/unin_pci.c
View File

@ -22,7 +22,7 @@
* THE SOFTWARE. * THE SOFTWARE.
*/ */
#include "hw.h" #include "hw.h"
#include "ppc_mac.h" #include "ppc/mac.h"
#include "pci/pci.h" #include "pci/pci.h"
#include "pci/pci_host.h" #include "pci/pci_host.h"