xemu-project/xemu
1
0
Fork 0
mirror of https://github.com/xemu-project/xemu.git synced 2024-11-26 21:10:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
6e72a00f90
xemu/hw/ppc
History
Anthony Liguori 6e72a00f90 Merge remote-tracking branch 'bonzini/hw-dirs' into staging 
* bonzini/hw-dirs:
  sh: move files referencing CPU to hw/sh4/
  ppc: move more files to hw/ppc
  ppc: move files referencing CPU to hw/ppc/
  m68k: move files referencing CPU to hw/m68k/
  i386: move files referencing CPU to hw/i386/
  arm: move files referencing CPU to hw/arm/
  hw: move boards and other isolated files to hw/ARCH
  ppc: express FDT dependency of pSeries and e500 boards via default-configs/
  build: always link device_tree.o into emulators if libfdt available
  hw: include hw header files with full paths
  ppc: do not use ../ in include files
  vt82c686: vt82c686 is not a PCI host bridge
  virtio-9p: remove PCI dependencies from hw/9pfs/
  virtio-9p: use CONFIG_VIRTFS, not CONFIG_LINUX
  hw: move device-hotplug.o to toplevel, compile it once
  hw: move qdev-monitor.o to toplevel directory
  hw: move fifo.[ch] to libqemuutil
  hw: move char backends to backends/

Conflicts:
	backends/baum.c
	backends/msmouse.c
	hw/a15mpcore.c
	hw/arm/Makefile.objs
	hw/arm/pic_cpu.c
	hw/dataplane/event-poll.c
	hw/dataplane/virtio-blk.c
	include/char/baum.h
	include/char/msmouse.h
	qemu-char.c
	vl.c

Resolve conflicts caused by header movements.

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
2013-03-10 19:56:35 -05:00
..
e500-ccsr.h ppc: do not use ../ in include files 2013-03-01 13:57:33 +01:00
e500.c e500: Replace open-coded loop with qemu_get_cpu() 2013-02-16 14:51:00 +01:00
e500.h PPC: e500: Select MPIC v4.2 on ppce500 platform 2013-01-25 22:02:56 +01:00
e500plat.c ppc: do not use ../ in include files 2013-03-01 13:57:33 +01:00
mac_newworld.c fw_cfg: Remove FW_CFG_MAX_CPUS from fw_cfg_init() 2013-01-27 14:34:27 +01:00
mac_oldworld.c fw_cfg: Remove FW_CFG_MAX_CPUS from fw_cfg_init() 2013-01-27 14:34:27 +01:00
mac.h cuda: Move ADB bus into CUDA state 2013-01-25 22:02:55 +01:00
Makefile.objs ppc: move more files to hw/ppc 2013-03-01 15:01:19 +01:00
mpc8544_guts.c ppc: move files referencing CPU to hw/ppc/ 2013-03-01 15:01:19 +01:00
mpc8544ds.c ppc: do not use ../ in include files 2013-03-01 13:57:33 +01:00
ppc4xx_devs.c ppc: move files referencing CPU to hw/ppc/ 2013-03-01 15:01:19 +01:00
ppc405_boards.c hw: move boards and other isolated files to hw/ARCH 2013-03-01 15:01:19 +01:00
ppc405_uc.c hw: move boards and other isolated files to hw/ARCH 2013-03-01 15:01:19 +01:00
ppc440_bamboo.c hw: move boards and other isolated files to hw/ARCH 2013-03-01 15:01:19 +01:00
ppc_booke.c hw: move boards and other isolated files to hw/ARCH 2013-03-01 15:01:19 +01:00
ppc.c hw: move boards and other isolated files to hw/ARCH 2013-03-01 15:01:19 +01:00
ppce500_spin.c ppc: move files referencing CPU to hw/ppc/ 2013-03-01 15:01:19 +01:00
prep.c pci_host: Drop write-only address_space field 2013-03-08 13:15:27 +01:00
spapr_events.c ppc: move more files to hw/ppc 2013-03-01 15:01:19 +01:00
spapr_hcall.c ppc: move more files to hw/ppc 2013-03-01 15:01:19 +01:00
spapr_iommu.c ppc: move more files to hw/ppc 2013-03-01 15:01:19 +01:00
spapr_rtas.c ppc: move more files to hw/ppc 2013-03-01 15:01:19 +01:00
spapr_vio.c ppc: move files referencing CPU to hw/ppc/ 2013-03-01 15:01:19 +01:00
spapr.c hw: move boards and other isolated files to hw/ARCH 2013-03-01 15:01:19 +01:00
virtex_ml507.c hw: move boards and other isolated files to hw/ARCH 2013-03-01 15:01:19 +01:00
xics.c ppc: move files referencing CPU to hw/ppc/ 2013-03-01 15:01:19 +01:00