diff options
Diffstat (limited to 'hw/cris')
-rw-r--r-- | hw/cris/Makefile.objs | 10 | ||||
-rw-r--r-- | hw/cris/axis_dev88.c | 6 | ||||
-rw-r--r-- | hw/cris/boot.c | 2 | ||||
-rw-r--r-- | hw/cris/boot.h | 15 | ||||
-rw-r--r-- | hw/cris/pic_cpu.c | 2 |
5 files changed, 20 insertions, 15 deletions
diff --git a/hw/cris/Makefile.objs b/hw/cris/Makefile.objs index a94c62450d..776db7c5cd 100644 --- a/hw/cris/Makefile.objs +++ b/hw/cris/Makefile.objs @@ -1,13 +1,3 @@ -# IO blocks -obj-y += etraxfs_dma.o -obj-y += etraxfs_pic.o -obj-y += etraxfs_eth.o -obj-y += etraxfs_timer.o -obj-y += etraxfs_ser.o - -obj-y := $(addprefix ../,$(obj-y)) - -# Boards obj-y += pic_cpu.o obj-y += boot.o obj-y += axis_dev88.o diff --git a/hw/cris/axis_dev88.c b/hw/cris/axis_dev88.c index eccd423abf..7475671308 100644 --- a/hw/cris/axis_dev88.c +++ b/hw/cris/axis_dev88.c @@ -24,12 +24,12 @@ #include "hw/sysbus.h" #include "net/net.h" -#include "hw/flash.h" +#include "hw/block/flash.h" #include "hw/boards.h" -#include "hw/etraxfs.h" +#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 diff --git a/hw/cris/pic_cpu.c b/hw/cris/pic_cpu.c index 85c68c0497..bd47bf1a5d 100644 --- a/hw/cris/pic_cpu.c +++ b/hw/cris/pic_cpu.c @@ -24,7 +24,7 @@ #include "hw/sysbus.h" #include "hw/hw.h" -#include "hw/etraxfs.h" +#include "hw/cris/etraxfs.h" #define D(x) |