Commit bd2be150 authored by Peter Maydell's avatar Peter Maydell Committed by Paolo Bonzini
Browse files

arm: fix location of some include files



The recent rearrangement of include files had some minor errors:
 devices.h is not ARM specific and should not be in arm/
 arm.h should be in arm/

Move these two headers to correct this.
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent e2ec3f97
......@@ -9,7 +9,7 @@
#include "cpu.h"
#include "exec/exec-all.h"
#include "hw/hw.h"
#include "hw/arm/devices.h"
#include "hw/devices.h"
#include "sysemu/sysemu.h"
#include "alpha_sys.h"
#include "exec/address-spaces.h"
......
......@@ -8,7 +8,7 @@
*/
#include "hw/sysbus.h"
#include "hw/arm.h"
#include "hw/arm/arm.h"
#include "hw/loader.h"
#include "elf.h"
......
......@@ -9,7 +9,7 @@
#include "config.h"
#include "hw/hw.h"
#include "hw/arm.h"
#include "hw/arm/arm.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"
#include "hw/loader.h"
......
......@@ -11,9 +11,9 @@
#include "hw/hw.h"
#include "hw/sysbus.h"
#include "hw/boards.h"
#include "hw/arm/devices.h"
#include "hw/devices.h"
#include "strongarm.h"
#include "hw/arm.h"
#include "hw/arm/arm.h"
#include "hw/block/flash.h"
#include "sysemu/blockdev.h"
#include "exec/address-spaces.h"
......
......@@ -24,7 +24,7 @@
#include "hw/boards.h"
#include "sysemu/sysemu.h"
#include "hw/sysbus.h"
#include "hw/arm.h"
#include "hw/arm/arm.h"
#include "hw/loader.h"
#include "hw/arm/exynos4210.h"
#include "hw/usb/hcd-ehci.h"
......
......@@ -24,7 +24,7 @@
#include "sysemu/sysemu.h"
#include "hw/sysbus.h"
#include "net/net.h"
#include "hw/arm.h"
#include "hw/arm/arm.h"
#include "exec/address-spaces.h"
#include "hw/arm/exynos4210.h"
#include "hw/boards.h"
......
......@@ -38,7 +38,7 @@
#include "hw/arm/pxa.h"
#include "net/net.h"
#include "hw/block/flash.h"
#include "hw/arm/devices.h"
#include "hw/devices.h"
#include "hw/boards.h"
#include "sysemu/blockdev.h"
#include "exec/address-spaces.h"
......
......@@ -18,8 +18,8 @@
*/
#include "hw/sysbus.h"
#include "hw/arm.h"
#include "hw/arm/devices.h"
#include "hw/arm/arm.h"
#include "hw/devices.h"
#include "hw/loader.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
......
......@@ -8,9 +8,9 @@
*/
#include "hw/sysbus.h"
#include "hw/arm/devices.h"
#include "hw/devices.h"
#include "hw/boards.h"
#include "hw/arm.h"
#include "hw/arm/arm.h"
#include "net/net.h"
#include "exec/address-spaces.h"
#include "sysemu/sysemu.h"
......
......@@ -16,8 +16,8 @@
#include "hw/sysbus.h"
#include "exec/address-spaces.h"
#include "hw/hw.h"
#include "hw/arm.h"
#include "hw/arm/devices.h"
#include "hw/arm/arm.h"
#include "hw/devices.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"
......
......@@ -13,9 +13,9 @@
*/
#include "hw/hw.h"
#include "hw/arm/pxa.h"
#include "hw/arm.h"
#include "hw/arm/arm.h"
#include "net/net.h"
#include "hw/arm/devices.h"
#include "hw/devices.h"
#include "hw/boards.h"
#include "hw/block/flash.h"
#include "sysemu/blockdev.h"
......
......@@ -10,8 +10,8 @@
*/
#include "hw/sysbus.h"
#include "hw/arm.h"
#include "hw/arm/devices.h"
#include "hw/arm/arm.h"
#include "hw/devices.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"
......
......@@ -21,12 +21,12 @@
#include "qemu-common.h"
#include "sysemu/sysemu.h"
#include "hw/arm/omap.h"
#include "hw/arm.h"
#include "hw/arm/arm.h"
#include "hw/irq.h"
#include "ui/console.h"
#include "hw/boards.h"
#include "hw/i2c/i2c.h"
#include "hw/arm/devices.h"
#include "hw/devices.h"
#include "hw/block/flash.h"
#include "hw/hw.h"
#include "hw/bt.h"
......
......@@ -17,7 +17,7 @@
* with this program; if not, see <http://www.gnu.org/licenses/>.
*/
#include "hw/hw.h"
#include "hw/arm.h"
#include "hw/arm/arm.h"
#include "hw/arm/omap.h"
#include "sysemu/sysemu.h"
#include "hw/arm/soc_dma.h"
......
......@@ -20,7 +20,7 @@
#include "sysemu/blockdev.h"
#include "hw/hw.h"
#include "hw/arm.h"
#include "hw/arm/arm.h"
#include "hw/arm/omap.h"
#include "sysemu/sysemu.h"
#include "qemu/timer.h"
......
......@@ -29,7 +29,7 @@
#include "ui/console.h"
#include "hw/arm/omap.h"
#include "hw/boards.h"
#include "hw/arm.h"
#include "hw/arm/arm.h"
#include "hw/block/flash.h"
#include "sysemu/blockdev.h"
#include "exec/address-spaces.h"
......
......@@ -22,8 +22,8 @@
#include "ui/console.h"
#include "hw/arm/omap.h"
#include "hw/boards.h"
#include "hw/arm.h"
#include "hw/arm/devices.h"
#include "hw/arm/arm.h"
#include "hw/devices.h"
#include "hw/loader.h"
#include "exec/address-spaces.h"
......
......@@ -8,7 +8,7 @@
*/
#include "hw/hw.h"
#include "hw/arm.h"
#include "hw/arm/arm.h"
#include "sysemu/kvm.h"
/* Input 0 is IRQ and input 1 is FIQ. */
......
......@@ -8,9 +8,9 @@
*/
#include "hw/sysbus.h"
#include "hw/arm.h"
#include "hw/arm/arm.h"
#include "hw/arm/primecell.h"
#include "hw/arm/devices.h"
#include "hw/devices.h"
#include "hw/pci/pci.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
......
......@@ -12,14 +12,14 @@
#include "hw/hw.h"
#include "hw/arm/pxa.h"
#include "hw/arm.h"
#include "hw/arm/arm.h"
#include "sysemu/sysemu.h"
#include "hw/pcmcia.h"
#include "hw/i2c/i2c.h"
#include "hw/ssi.h"
#include "hw/block/flash.h"
#include "qemu/timer.h"
#include "hw/arm/devices.h"
#include "hw/devices.h"
#include "hw/arm/sharpsl.h"
#include "ui/console.h"
#include "block/block.h"
......
......@@ -9,8 +9,8 @@
#include "hw/sysbus.h"
#include "hw/ssi.h"
#include "hw/arm.h"
#include "hw/arm/devices.h"
#include "hw/arm/arm.h"
#include "hw/devices.h"
#include "qemu/timer.h"
#include "hw/i2c/i2c.h"
#include "net/net.h"
......
......@@ -29,7 +29,7 @@
#include "hw/sysbus.h"
#include "strongarm.h"
#include "qemu/error-report.h"
#include "hw/arm.h"
#include "hw/arm/arm.h"
#include "char/char.h"
#include "sysemu/sysemu.h"
#include "hw/ssi.h"
......
......@@ -13,8 +13,8 @@
#include "hw/hw.h"
#include "hw/arm/pxa.h"
#include "hw/arm.h"
#include "hw/arm/devices.h"
#include "hw/arm/arm.h"
#include "hw/devices.h"
#include "hw/arm/sharpsl.h"
#include "hw/pcmcia.h"
#include "block/block.h"
......
......@@ -8,8 +8,8 @@
*/
#include "hw/sysbus.h"
#include "hw/arm.h"
#include "hw/arm/devices.h"
#include "hw/arm/arm.h"
#include "hw/devices.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
#include "hw/pci/pci.h"
......
......@@ -22,9 +22,9 @@
*/
#include "hw/sysbus.h"
#include "hw/arm.h"
#include "hw/arm/arm.h"
#include "hw/arm/primecell.h"
#include "hw/arm/devices.h"
#include "hw/devices.h"
#include "net/net.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"
......
......@@ -16,7 +16,7 @@
*/
#include "hw/sysbus.h"
#include "hw/arm.h"
#include "hw/arm/arm.h"
#include "net/net.h"
#include "exec/address-spaces.h"
#include "sysemu/sysemu.h"
......
......@@ -13,8 +13,8 @@
#include "hw/hw.h"
#include "hw/arm/pxa.h"
#include "hw/arm.h"
#include "hw/arm/devices.h"
#include "hw/arm/arm.h"
#include "hw/devices.h"
#include "hw/i2c/i2c.h"
#include "hw/ssi.h"
#include "hw/boards.h"
......
......@@ -24,7 +24,7 @@
#include "hw/hw.h"
#include "sysemu/blockdev.h"
#include "hw/ssi.h"
#include "hw/arm/devices.h"
#include "hw/devices.h"
#ifdef M25P80_ERR_DEBUG
#define DB_PRINT(...) do { \
......
......@@ -20,7 +20,7 @@
#include "qemu-common.h"
#include "ui/console.h"
#include "hw/arm/devices.h"
#include "hw/devices.h"
#include "vga_int.h"
#include "ui/pixel_ops.h"
......
......@@ -26,7 +26,7 @@
#include "hw/hw.h"
#include "hw/char/serial.h"
#include "ui/console.h"
#include "hw/arm/devices.h"
#include "hw/devices.h"
#include "hw/sysbus.h"
#include "hw/qdev-addr.h"
#include "qemu/range.h"
......
......@@ -11,7 +11,7 @@
* GNU GPL, version 2 or (at your option) any later version.
*/
#include "hw/hw.h"
#include "hw/arm/devices.h"
#include "hw/devices.h"
#include "hw/block/flash.h"
#include "ui/console.h"
#include "ui/pixel_ops.h"
......
......@@ -7,7 +7,7 @@
* This code is licensed under the GPL.
*/
#include "hw/hw.h"
#include "hw/arm/devices.h"
#include "hw/devices.h"
#include "ui/console.h"
typedef struct {
......
......@@ -21,7 +21,7 @@
#include "hw/hw.h"
#include "qemu/timer.h"
#include "ui/console.h"
#include "hw/arm/devices.h"
#include "hw/devices.h"
#define TSC_CUT_RESOLUTION(value, p) ((value) >> (16 - (p ? 12 : 10)))
......
......@@ -24,7 +24,7 @@
#include "qemu/timer.h"
#include "ui/console.h"
#include "hw/arm/omap.h" /* For I2SCodec and uWireSlave */
#include "hw/arm/devices.h"
#include "hw/devices.h"
#define TSC_DATA_REGISTERS_PAGE 0x0
#define TSC_CONTROL_REGISTERS_PAGE 0x1
......
......@@ -12,7 +12,7 @@
#include "hw/sysbus.h"
#include "qemu/timer.h"
#include "hw/arm.h"
#include "hw/arm/arm.h"
#include "exec/address-spaces.h"
#include "gic_internal.h"
......
......@@ -20,7 +20,7 @@
#include "hw/sysbus.h"
#include "hw/hw.h"
#include "hw/block/flash.h"
#include "hw/arm/devices.h"
#include "hw/devices.h"
#include "hw/boards.h"
#include "hw/loader.h"
#include "sysemu/blockdev.h"
......
......@@ -21,7 +21,7 @@
#include "hw/hw.h"
#include "hw/block/flash.h"
#include "sysemu/sysemu.h"
#include "hw/arm/devices.h"
#include "hw/devices.h"
#include "hw/boards.h"
#include "hw/loader.h"
#include "elf.h"
......
......@@ -30,7 +30,7 @@
#include "net/net.h"
#include "hw/block/flash.h"
#include "sysemu/sysemu.h"
#include "hw/arm/devices.h"
#include "hw/devices.h"
#include "hw/boards.h"
#include "hw/xilinx.h"
#include "sysemu/blockdev.h"
......
......@@ -28,7 +28,7 @@
#include "net/net.h"
#include "hw/block/flash.h"
#include "sysemu/sysemu.h"
#include "hw/arm/devices.h"
#include "hw/devices.h"
#include "hw/boards.h"
#include "hw/xilinx.h"
#include "sysemu/blockdev.h"
......
......@@ -22,7 +22,7 @@
#include "qemu-common.h"
#include "hw/irq.h"
#include "hw/arm/devices.h"
#include "hw/devices.h"
#include "sysemu/sysemu.h"
//#define DEBUG
......
......@@ -12,7 +12,7 @@
#include "hw/sysbus.h"
#include "net/net.h"
#include "hw/arm/devices.h"
#include "hw/devices.h"
#include "sysemu/sysemu.h"
#include "hw/ptimer.h"
/* For crc32 */
......
......@@ -9,7 +9,7 @@
#include "hw/sysbus.h"
#include "net/net.h"
#include "hw/arm/devices.h"
#include "hw/devices.h"
/* For crc32 */
#include <zlib.h>
......
......@@ -27,7 +27,7 @@
#include "hw/char/serial.h"
#include "hw/block/flash.h"
#include "sysemu/sysemu.h"
#include "hw/arm/devices.h"
#include "hw/devices.h"
#include "hw/boards.h"
#include "sysemu/device_tree.h"
#include "hw/loader.h"
......
......@@ -26,7 +26,7 @@
#include "hw/sysbus.h"
#include "hw/hw.h"
#include "hw/sh4/sh.h"
#include "hw/arm/devices.h"
#include "hw/devices.h"
#include "sysemu/sysemu.h"
#include "hw/boards.h"
#include "hw/pci/pci.h"
......
......@@ -23,7 +23,7 @@
#include "hw/usb.h"
#include "hw/arm/omap.h"
#include "hw/irq.h"
#include "hw/arm/devices.h"
#include "hw/devices.h"
#include "hw/sysbus.h"
typedef struct TUSBState {
......
......@@ -34,7 +34,7 @@
#else
#include "qemu-common.h"
#include "exec/gdbstub.h"
#include "hw/arm.h"
#include "hw/arm/arm.h"
#endif
#define TARGET_SYS_OPEN 0x01
......
......@@ -21,7 +21,7 @@
#include "sysemu/kvm.h"
#include "kvm_arm.h"
#include "cpu.h"
#include "hw/arm.h"
#include "hw/arm/arm.h"
const KVMCapabilityInfo kvm_arch_required_capabilities[] = {
KVM_CAP_LAST_INFO
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment