Commit 3a616592a18931f814c00f773194ef5819919895
1 parent
b98a003c
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
Showing
3 changed files
with
2 additions
and
15 deletions
hw/ppc_newworld.c
| ... | ... | @@ -125,13 +125,6 @@ static void ppc_core99_init (ram_addr_t ram_size, int vga_ram_size, |
| 125 | 125 | qemu_register_reset(&cpu_ppc_reset, env); |
| 126 | 126 | envs[i] = env; |
| 127 | 127 | } |
| 128 | - if (env->nip < 0xFFF80000) { | |
| 129 | - /* Special test for PowerPC 601: | |
| 130 | - * the boot vector is at 0xFFF00100, then we need a 1MB BIOS. | |
| 131 | - * But the NVRAM is located at 0xFFF04000... | |
| 132 | - */ | |
| 133 | - cpu_abort(env, "Mac99 hardware can not handle 1 MB BIOS\n"); | |
| 134 | - } | |
| 135 | 128 | |
| 136 | 129 | /* allocate RAM */ |
| 137 | 130 | ram_offset = qemu_ram_alloc(ram_size); | ... | ... |
hw/ppc_oldworld.c
| ... | ... | @@ -152,13 +152,6 @@ static void ppc_heathrow_init (ram_addr_t ram_size, int vga_ram_size, |
| 152 | 152 | qemu_register_reset(&cpu_ppc_reset, env); |
| 153 | 153 | envs[i] = env; |
| 154 | 154 | } |
| 155 | - if (env->nip < 0xFFF80000) { | |
| 156 | - /* Special test for PowerPC 601: | |
| 157 | - * the boot vector is at 0xFFF00100, then we need a 1MB BIOS. | |
| 158 | - * But the NVRAM is located at 0xFFF04000... | |
| 159 | - */ | |
| 160 | - cpu_abort(env, "G3 Beige Mac hardware can not handle 1 MB BIOS\n"); | |
| 161 | - } | |
| 162 | 155 | |
| 163 | 156 | /* allocate RAM */ |
| 164 | 157 | if (ram_size > (2047 << 20)) { | ... | ... |
target-ppc/cpu.h
| ... | ... | @@ -66,7 +66,8 @@ |
| 66 | 66 | |
| 67 | 67 | #define TARGET_HAS_ICE 1 |
| 68 | 68 | |
| 69 | -#if defined (TARGET_PPC64) | |
| 69 | +/* Load a 32 bit BIOS also on 64 bit machines */ | |
| 70 | +#if defined (TARGET_PPC64) && defined(CONFIG_USER_ONLY) | |
| 70 | 71 | #define ELF_MACHINE EM_PPC64 |
| 71 | 72 | #else |
| 72 | 73 | #define ELF_MACHINE EM_PPC | ... | ... |