summaryrefslogtreecommitdiffstats
path: root/hw/cris
diff options
context:
space:
mode:
authorPaolo Bonzini2013-03-18 17:36:02 +0100
committerPaolo Bonzini2013-04-08 18:13:16 +0200
commit47b43a1f414c5b3eb9eb7502d0b0be0d134259ba (patch)
tree9acfd03f458083a077ac79bd462d5360916f445f /hw/cris
parentMAINTAINERS: update for source code movement (diff)
downloadqemu-47b43a1f414c5b3eb9eb7502d0b0be0d134259ba.tar.gz
qemu-47b43a1f414c5b3eb9eb7502d0b0be0d134259ba.tar.xz
qemu-47b43a1f414c5b3eb9eb7502d0b0be0d134259ba.zip
hw: move private headers to hw/ subdirectories.
Many headers are used only in a single directory. These can be kept in hw/. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'hw/cris')
-rw-r--r--hw/cris/axis_dev88.c2
-rw-r--r--hw/cris/boot.c2
-rw-r--r--hw/cris/boot.h15
3 files changed, 17 insertions, 2 deletions
diff --git a/hw/cris/axis_dev88.c b/hw/cris/axis_dev88.c
index 00daceb813..7475671308 100644
--- a/hw/cris/axis_dev88.c
+++ b/hw/cris/axis_dev88.c
@@ -29,7 +29,7 @@
#include "hw/cris/etraxfs.h"
#include "hw/loader.h"
#include "elf.h"
-#include "hw/cris-boot.h"
+#include "boot.h"
#include "sysemu/blockdev.h"
#include "exec/address-spaces.h"
diff --git a/hw/cris/boot.c b/hw/cris/boot.c
index c330e22a86..622f353c9a 100644
--- a/hw/cris/boot.c
+++ b/hw/cris/boot.c
@@ -25,7 +25,7 @@
#include "hw/hw.h"
#include "hw/loader.h"
#include "elf.h"
-#include "hw/cris-boot.h"
+#include "boot.h"
static void main_cpu_reset(void *opaque)
{
diff --git a/hw/cris/boot.h b/hw/cris/boot.h
new file mode 100644
index 0000000000..c4d3fa6f6f
--- /dev/null
+++ b/hw/cris/boot.h
@@ -0,0 +1,15 @@
+#ifndef _CRIS_BOOT_H
+#define HW_CRIS_BOOT_H 1
+
+struct cris_load_info
+{
+ const char *image_filename;
+ const char *cmdline;
+ int image_size;
+
+ hwaddr entry;
+};
+
+void cris_load_image(CRISCPU *cpu, struct cris_load_info *li);
+
+#endif