Move hw/arm related sources
hw/boards.h, hw/devices.h -> include/hw/
hw/arm_pic.c -> hw/arm/pic.c
Change-Id: If2a0ac71e44b13e792704ff36885667709ac331a
diff --git a/Makefile.target b/Makefile.target
index c69791e..b8a3e4c 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -91,13 +91,14 @@
ifeq ($(EMULATOR_TARGET_ARCH),arm)
-HW_SOURCES += android_arm.c \
- arm_pic.c \
+HW_SOURCES += \
+ android_arm.c \
+ arm/pic.c \
+ arm/boot.c \
goldfish_interrupt.c \
goldfish_switch.c \
goldfish_timer.c \
goldfish_trace.c \
- arm/boot.c
# The following sources must be compiled with the final executables
# because they contain device_init() or machine_init() statements.
diff --git a/hw/android_arm.c b/hw/android_arm.c
index 9f8006f..ac39626 100644
--- a/hw/android_arm.c
+++ b/hw/android_arm.c
@@ -10,8 +10,8 @@
** GNU General Public License for more details.
*/
#include "hw/hw.h"
-#include "boards.h"
-#include "devices.h"
+#include "hw/boards.h"
+#include "hw/devices.h"
#include "net/net.h"
#include "hw/arm/pic.h"
#include "sysemu/sysemu.h"
diff --git a/hw/android_mips.c b/hw/android_mips.c
index 160c682..fee4ec9 100644
--- a/hw/android_mips.c
+++ b/hw/android_mips.c
@@ -10,8 +10,8 @@
** GNU General Public License for more details.
*/
#include "hw/hw.h"
-#include "boards.h"
-#include "devices.h"
+#include "hw/boards.h"
+#include "hw/devices.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
#include "mips.h"
diff --git a/hw/arm_pic.c b/hw/arm/pic.c
similarity index 100%
rename from hw/arm_pic.c
rename to hw/arm/pic.c
diff --git a/hw/mips_r4k.c b/hw/mips_r4k.c
index 5132e1f..acb2638 100644
--- a/hw/mips_r4k.c
+++ b/hw/mips_r4k.c
@@ -13,7 +13,7 @@
#include "hw/isa/isa.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
-#include "boards.h"
+#include "hw/boards.h"
#include "flash.h"
#include "qemu/log.h"
#include "mips-bios.h"
diff --git a/hw/pc.c b/hw/pc.c
index fa85eb6..8897898 100644
--- a/hw/pc.c
+++ b/hw/pc.c
@@ -31,7 +31,7 @@
#include "audio/audio.h"
#include "net/net.h"
//#include "smbus.h"
-#include "boards.h"
+#include "hw/boards.h"
#include "android/globals.h"
#include "monitor/monitor.h"
#include "fw_cfg.h"
diff --git a/hw/smc91c111.c b/hw/smc91c111.c
index bb67619..3ba10ca 100644
--- a/hw/smc91c111.c
+++ b/hw/smc91c111.c
@@ -9,7 +9,7 @@
#include "hw/sysbus.h"
#include "net/net.h"
-#include "devices.h"
+#include "hw/devices.h"
#include "hw/hw.h"
/* For crc32 */
#include <zlib.h>
diff --git a/hw/usb-ohci.c b/hw/usb-ohci.c
index d1dfd82..ca801bd 100644
--- a/hw/usb-ohci.c
+++ b/hw/usb-ohci.c
@@ -31,7 +31,7 @@
#include "usb.h"
#include "pci.h"
#include "pxa.h"
-#include "devices.h"
+#include "hw/devices.h"
//#define DEBUG_OHCI
/* Dump packet contents. */
diff --git a/hw/boards.h b/include/hw/boards.h
similarity index 100%
rename from hw/boards.h
rename to include/hw/boards.h
diff --git a/hw/devices.h b/include/hw/devices.h
similarity index 100%
rename from hw/devices.h
rename to include/hw/devices.h