diff mbox

[prep,for-1.4] prep: Move PReP machine to hw/ppc/

Message ID 1359229767-29007-1-git-send-email-andreas.faerber@web.de
State New
Headers show

Commit Message

Andreas Färber Jan. 26, 2013, 7:49 p.m. UTC 
Signed-off-by: Andreas Färber <andreas.faerber@web.de>
---
 hw/ppc/Makefile.objs          |    3 ++-
 hw/{ppc_prep.c => ppc/prep.c} |   28 ++++++++++++++--------------
 2 Dateien geändert, 16 Zeilen hinzugefügt(+), 15 Zeilen entfernt(-)
 rename hw/{ppc_prep.c => ppc/prep.c} (98%)

Comments

Andreas Färber Jan. 30, 2013, 7:59 a.m. UTC | #1 
Am 26.01.2013 20:49, schrieb Andreas Färber:
> Signed-off-by: Andreas Färber <andreas.faerber@web.de>
> ---
>  hw/ppc/Makefile.objs          |    3 ++-
>  hw/{ppc_prep.c => ppc/prep.c} |   28 ++++++++++++++--------------
>  2 Dateien geändert, 16 Zeilen hinzugefügt(+), 15 Zeilen entfernt(-)
>  rename hw/{ppc_prep.c => ppc/prep.c} (98%)

Applied to prep-up:
http://repo.or.cz/w/qemu/afaerber.git/shortlog/refs/heads/prep-up

Andreas
diff mbox

Patch

diff --git a/hw/ppc/Makefile.objs b/hw/ppc/Makefile.objs
index 462146b..f762050 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
similarity index 98%
rename from hw/ppc_prep.c
rename to hw/ppc/prep.c
index a35fbed..e06dded 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"