diff options
| author | Andreas Färber <andreas.faerber@web.de> | 2013-01-26 20:41:58 +0100 |
|---|---|---|
| committer | Andreas Färber <andreas.faerber@web.de> | 2013-01-30 10:42:29 +0100 |
| commit | 75610155562bd480356a7a5018e5de4c44ec7884 (patch) | |
| tree | 877bdb898ddcd50c3573ee2fb0e0ee0e1a076eb6 | |
| parent | 8d5ce2e5643f4055b67ea012d91e812f1e607a83 (diff) | |
prep: Move PReP machine to hw/ppc/
Signed-off-by: Andreas Färber <andreas.faerber@web.de>
| -rw-r--r-- | MAINTAINERS | 2 | ||||
| -rw-r--r-- | hw/ppc/Makefile.objs | 3 | ||||
| -rw-r--r-- | hw/ppc/prep.c (renamed from hw/ppc_prep.c) | 28 |
3 files changed, 17 insertions, 16 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 9dd4c20798..21043e4b4a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -395,7 +395,7 @@ PReP M: Andreas Färber <andreas.faerber@web.de> L: qemu-ppc@nongnu.org S: Odd Fixes -F: hw/ppc_prep.c +F: hw/ppc/prep.c F: hw/prep_pci.[hc] F: hw/pc87312.[hc] diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs index 462146b0b0..f7620509a9 100644 --- a/hw/ppc/Makefile.objs +++ b/hw/ppc/Makefile.objs @@ -2,7 +2,6 @@ obj-y = ppc.o ppc_booke.o # PREP target obj-y += mc146818rtc.o -obj-y += ppc_prep.o # IBM pSeries (sPAPR) 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 @@ -24,6 +23,8 @@ obj-y += xilinx_ethlite.o obj-y := $(addprefix ../,$(obj-y)) +# PReP +obj-y += prep.o # OldWorld PowerMac obj-y += mac_oldworld.o # NewWorld PowerMac diff --git a/hw/ppc_prep.c b/hw/ppc/prep.c index a35fbedbdc..e06dded003 100644 --- a/hw/ppc_prep.c +++ b/hw/ppc/prep.c @@ -21,23 +21,23 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN * THE SOFTWARE. */ -#include "hw.h" -#include "nvram.h" -#include "pc.h" -#include "serial.h" -#include "fdc.h" +#include "hw/hw.h" +#include "hw/nvram.h" +#include "hw/pc.h" +#include "hw/serial.h" +#include "hw/fdc.h" #include "net/net.h" #include "sysemu/sysemu.h" -#include "isa.h" -#include "pci/pci.h" -#include "pci/pci_host.h" -#include "ppc.h" -#include "boards.h" +#include "hw/isa.h" +#include "hw/pci/pci.h" +#include "hw/pci/pci_host.h" +#include "hw/ppc.h" +#include "hw/boards.h" #include "qemu/log.h" -#include "ide.h" -#include "loader.h" -#include "mc146818rtc.h" -#include "pc87312.h" +#include "hw/ide.h" +#include "hw/loader.h" +#include "hw/mc146818rtc.h" +#include "hw/pc87312.h" #include "sysemu/blockdev.h" #include "sysemu/arch_init.h" #include "exec/address-spaces.h" |