diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2013-03-18 17:36:02 +0100 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2013-04-08 18:13:16 +0200 |
| commit | 47b43a1f414c5b3eb9eb7502d0b0be0d134259ba (patch) | |
| tree | 9acfd03f458083a077ac79bd462d5360916f445f /hw/microblaze | |
| parent | 8d8b636d28a97af7bf43c3267d07f87b9530939a (diff) | |
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/microblaze')
| -rw-r--r-- | hw/microblaze/boot.c | 2 | ||||
| -rw-r--r-- | hw/microblaze/boot.h | 10 | ||||
| -rw-r--r-- | hw/microblaze/petalogix_ml605_mmu.c | 4 | ||||
| -rw-r--r-- | hw/microblaze/petalogix_s3adsp1800_mmu.c | 4 | ||||
| -rw-r--r-- | hw/microblaze/pic_cpu.c | 2 | ||||
| -rw-r--r-- | hw/microblaze/pic_cpu.h | 8 |
6 files changed, 24 insertions, 6 deletions
diff --git a/hw/microblaze/boot.c b/hw/microblaze/boot.c index e13b3e13bb..23cb11d70e 100644 --- a/hw/microblaze/boot.c +++ b/hw/microblaze/boot.c @@ -31,7 +31,7 @@ #include "hw/loader.h" #include "elf.h" -#include "hw/microblaze_boot.h" +#include "boot.h" static struct { diff --git a/hw/microblaze/boot.h b/hw/microblaze/boot.h new file mode 100644 index 0000000000..b14ef2b992 --- /dev/null +++ b/hw/microblaze/boot.h @@ -0,0 +1,10 @@ +#ifndef __MICROBLAZE_BOOT__ +#define __MICROBLAZE_BOOT__ + +#include "hw/hw.h" + +void microblaze_load_kernel(MicroBlazeCPU *cpu, hwaddr ddr_base, + uint32_t ramsize, const char *dtb_filename, + void (*machine_cpu_reset)(MicroBlazeCPU *)); + +#endif /* __MICROBLAZE_BOOT __ */ diff --git a/hw/microblaze/petalogix_ml605_mmu.c b/hw/microblaze/petalogix_ml605_mmu.c index 79a8a0e170..f61818b42b 100644 --- a/hw/microblaze/petalogix_ml605_mmu.c +++ b/hw/microblaze/petalogix_ml605_mmu.c @@ -38,8 +38,8 @@ #include "exec/address-spaces.h" #include "hw/ssi.h" -#include "hw/microblaze_boot.h" -#include "hw/microblaze_pic_cpu.h" +#include "boot.h" +#include "pic_cpu.h" #include "hw/stream.h" diff --git a/hw/microblaze/petalogix_s3adsp1800_mmu.c b/hw/microblaze/petalogix_s3adsp1800_mmu.c index b38640321b..eedd60e38c 100644 --- a/hw/microblaze/petalogix_s3adsp1800_mmu.c +++ b/hw/microblaze/petalogix_s3adsp1800_mmu.c @@ -34,8 +34,8 @@ #include "sysemu/blockdev.h" #include "exec/address-spaces.h" -#include "hw/microblaze_boot.h" -#include "hw/microblaze_pic_cpu.h" +#include "boot.h" +#include "pic_cpu.h" #define LMB_BRAM_SIZE (128 * 1024) #define FLASH_SIZE (16 * 1024 * 1024) diff --git a/hw/microblaze/pic_cpu.c b/hw/microblaze/pic_cpu.c index 6248de92bb..16902f7880 100644 --- a/hw/microblaze/pic_cpu.c +++ b/hw/microblaze/pic_cpu.c @@ -23,7 +23,7 @@ */ #include "hw/hw.h" -#include "hw/microblaze_pic_cpu.h" +#include "pic_cpu.h" #define D(x) diff --git a/hw/microblaze/pic_cpu.h b/hw/microblaze/pic_cpu.h new file mode 100644 index 0000000000..43090a48ef --- /dev/null +++ b/hw/microblaze/pic_cpu.h @@ -0,0 +1,8 @@ +#ifndef MICROBLAZE_PIC_CPU_H +#define MICROBLAZE_PIC_CPU_H + +#include "qemu-common.h" + +qemu_irq *microblaze_pic_init_cpu(CPUMBState *env); + +#endif /* MICROBLAZE_PIC_CPU_H */ |