aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Liguori <aliguori@us.ibm.com>2013-05-06 06:49:51 -0500
committerAnthony Liguori <aliguori@us.ibm.com>2013-05-06 06:49:51 -0500
commite4b006b7a5bce59d4f692d5da04eede5f6d0f31c (patch)
tree5ac41011104a39f7dd85b74fb640658199d31020
parent1e65fe536782132316ddae0a92f3c4e4f563cafb (diff)
parentb6f54b31e7cfb2e88b76fc6cfc5334a26d1b9e53 (diff)
downloadqemu-arm-e4b006b7a5bce59d4f692d5da04eede5f6d0f31c.tar.gz
Merge remote-tracking branch 'afaerber-or/prep-up' into staging
# By Andreas Färber (1) and others # Via Andreas Färber * afaerber-or/prep-up: prep: Make System I/O port 0092 read/write prep: Add ELF support for -bios prep: Fix NIP reset value
-rw-r--r--hw/ppc/prep.c36
1 files changed, 26 insertions, 10 deletions
diff --git a/hw/ppc/prep.c b/hw/ppc/prep.c
index 59c7da3af7..be8a50ec4a 100644
--- a/hw/ppc/prep.c
+++ b/hw/ppc/prep.c
@@ -40,7 +40,9 @@
#include "hw/isa/pc87312.h"
#include "sysemu/blockdev.h"
#include "sysemu/arch_init.h"
+#include "sysemu/qtest.h"
#include "exec/address-spaces.h"
+#include "elf.h"
//#define HARD_DEBUG_PPC_IO
//#define DEBUG_PPC_IO
@@ -267,7 +269,7 @@ static uint32_t PREP_io_800_readb (void *opaque, uint32_t addr)
switch (addr) {
case 0x0092:
/* Special port 92 */
- retval = 0x00;
+ retval = sysctrl->endian << 1;
break;
case 0x0800:
/* Motorola CPU configuration register */
@@ -427,6 +429,9 @@ static void ppc_prep_reset(void *opaque)
PowerPCCPU *cpu = opaque;
cpu_reset(CPU(cpu));
+
+ /* Reset address */
+ cpu->env.nip = 0xfffffffc;
}
/* PowerPC PREP hardware initialisation */
@@ -502,18 +507,29 @@ static void ppc_prep_init(QEMUMachineInitArgs *args)
bios_name = BIOS_FILENAME;
filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name);
if (filename) {
- bios_size = get_image_size(filename);
+ bios_size = load_elf(filename, NULL, NULL, NULL,
+ NULL, NULL, 1, ELF_MACHINE, 0);
+ if (bios_size < 0) {
+ bios_size = get_image_size(filename);
+ if (bios_size > 0 && bios_size <= BIOS_SIZE) {
+ hwaddr bios_addr;
+ bios_size = (bios_size + 0xfff) & ~0xfff;
+ bios_addr = (uint32_t)(-bios_size);
+ bios_size = load_image_targphys(filename, bios_addr, bios_size);
+ }
+ if (bios_size > BIOS_SIZE) {
+ fprintf(stderr, "qemu: PReP bios '%s' is too large (0x%x)\n",
+ bios_name, bios_size);
+ exit(1);
+ }
+ }
} else {
bios_size = -1;
}
- if (bios_size > 0 && bios_size <= BIOS_SIZE) {
- hwaddr bios_addr;
- bios_size = (bios_size + 0xfff) & ~0xfff;
- bios_addr = (uint32_t)(-bios_size);
- bios_size = load_image_targphys(filename, bios_addr, bios_size);
- }
- if (bios_size < 0 || bios_size > BIOS_SIZE) {
- hw_error("qemu: could not load PPC PREP bios '%s'\n", bios_name);
+ if (bios_size < 0 && !qtest_enabled()) {
+ fprintf(stderr, "qemu: could not load PPC PReP bios '%s'\n",
+ bios_name);
+ exit(1);
}
if (filename) {
g_free(filename);