diff options
| author | blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-02-08 12:50:56 +0000 |
|---|---|---|
| committer | blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> | 2009-02-08 12:50:56 +0000 |
| commit | 3a616592a18931f814c00f773194ef5819919895 (patch) | |
| tree | 5865ff560647f4d2cb391f2786b440cb2a4f1602 | |
| parent | b98a003c196bab74c881440a42d349b98625e134 (diff) | |
Load 32 bit ELF BIOS images also on PPC64
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6554 c046a42c-6fe2-441c-8c8c-71466251a162
| -rw-r--r-- | hw/ppc_newworld.c | 7 | ||||
| -rw-r--r-- | hw/ppc_oldworld.c | 7 | ||||
| -rw-r--r-- | target-ppc/cpu.h | 3 |
3 files changed, 2 insertions, 15 deletions
diff --git a/hw/ppc_newworld.c b/hw/ppc_newworld.c index 137984721..022f761c4 100644 --- a/hw/ppc_newworld.c +++ b/hw/ppc_newworld.c @@ -125,13 +125,6 @@ static void ppc_core99_init (ram_addr_t ram_size, int vga_ram_size, qemu_register_reset(&cpu_ppc_reset, env); envs[i] = env; } - if (env->nip < 0xFFF80000) { - /* Special test for PowerPC 601: - * the boot vector is at 0xFFF00100, then we need a 1MB BIOS. - * But the NVRAM is located at 0xFFF04000... - */ - cpu_abort(env, "Mac99 hardware can not handle 1 MB BIOS\n"); - } /* allocate RAM */ ram_offset = qemu_ram_alloc(ram_size); diff --git a/hw/ppc_oldworld.c b/hw/ppc_oldworld.c index a6dfc3529..358981210 100644 --- a/hw/ppc_oldworld.c +++ b/hw/ppc_oldworld.c @@ -152,13 +152,6 @@ static void ppc_heathrow_init (ram_addr_t ram_size, int vga_ram_size, qemu_register_reset(&cpu_ppc_reset, env); envs[i] = env; } - if (env->nip < 0xFFF80000) { - /* Special test for PowerPC 601: - * the boot vector is at 0xFFF00100, then we need a 1MB BIOS. - * But the NVRAM is located at 0xFFF04000... - */ - cpu_abort(env, "G3 Beige Mac hardware can not handle 1 MB BIOS\n"); - } /* allocate RAM */ if (ram_size > (2047 << 20)) { diff --git a/target-ppc/cpu.h b/target-ppc/cpu.h index 006f58d79..80ee76c73 100644 --- a/target-ppc/cpu.h +++ b/target-ppc/cpu.h @@ -66,7 +66,8 @@ #define TARGET_HAS_ICE 1 -#if defined (TARGET_PPC64) +/* Load a 32 bit BIOS also on 64 bit machines */ +#if defined (TARGET_PPC64) && defined(CONFIG_USER_ONLY) #define ELF_MACHINE EM_PPC64 #else #define ELF_MACHINE EM_PPC |