OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

Load 32 bit ELF BIOS images also on PPC64

Browse Source 
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6554 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
blueswir1 2009-02-08 12:50:56 +00:00
parent b98a003c19
commit 3a616592a1
3 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
hw/ppc_newworld.c
View File

@ -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);

7
hw/ppc_oldworld.c
View File

@ -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)) {

3
target-ppc/cpu.h
View File

@ -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