[Qemu-devel] [6554] Load 32 bit ELF BIOS images also on PPC64

[Blue Swirl]

Revision: 6554
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=6554
Author:   blueswir1
Date:     2009-02-08 12:50:56 +0000 (Sun, 08 Feb 2009)

Log Message:
-----------
Load 32 bit ELF BIOS images also on PPC64

Modified Paths:
--------------
    trunk/hw/ppc_newworld.c
    trunk/hw/ppc_oldworld.c
    trunk/target-ppc/cpu.h

Modified: trunk/hw/ppc_newworld.c
===================================================================
--- trunk/hw/ppc_newworld.c     2009-02-08 12:49:13 UTC (rev 6553)
+++ trunk/hw/ppc_newworld.c     2009-02-08 12:50:56 UTC (rev 6554)
@@ -125,13 +125,6 @@
         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);

Modified: trunk/hw/ppc_oldworld.c
===================================================================
--- trunk/hw/ppc_oldworld.c     2009-02-08 12:49:13 UTC (rev 6553)
+++ trunk/hw/ppc_oldworld.c     2009-02-08 12:50:56 UTC (rev 6554)
@@ -152,13 +152,6 @@
         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)) {

Modified: trunk/target-ppc/cpu.h
===================================================================
--- trunk/target-ppc/cpu.h      2009-02-08 12:49:13 UTC (rev 6553)
+++ trunk/target-ppc/cpu.h      2009-02-08 12:50:56 UTC (rev 6554)
@@ -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