[commit] r973 - trunk/openbios-devel/arch/ppc/qemu

[repository service]

Author: afaerber
Date: Sat Nov 27 18:07:59 2010
New Revision: 973
URL: http://tracker.coreboot.org/trac/openbios/changeset/973

Log:
ppc: Adapt CPU definition and identification

PVR is 32 bits. Use the new inline function.

Signed-off-by: Andreas Färber

Modified:
   trunk/openbios-devel/arch/ppc/qemu/init.c

Modified: trunk/openbios-devel/arch/ppc/qemu/init.c
==============================================================================
--- trunk/openbios-devel/arch/ppc/qemu/init.c	Sat Nov 27 17:41:12 2010	(r972)
+++ trunk/openbios-devel/arch/ppc/qemu/init.c	Sat Nov 27 18:07:59 2010	(r973)
@@ -38,7 +38,7 @@
 #define UUID_FMT "%02x%02x%02x%02x-%02x%02x-%02x%02x-%02x%02x-%02x%02x%02x%02x%02x%02x"

struct cpudef {
-    unsigned long iu_version;
+    unsigned int iu_version;
     const char *name;
     int icache_size, dcache_size;
     int icache_sets, dcache_sets;
@@ -502,18 +502,16 @@
 static const struct cpudef *
 id_cpu(void)
 {
-    unsigned long iu_version;
+    unsigned int iu_version;
     unsigned int i;

-    asm("mfpvr %0\n"
-        : "=r"(iu_version) :);
-    iu_version &= 0xffff0000;
+    iu_version = mfpvr() & 0xffff0000;

for (i = 0; i < sizeof(ppc_defs) / sizeof(struct cpudef); i++) {
         if (iu_version == ppc_defs[i].iu_version)
             return &ppc_defs[i];
     }
-    printk("Unknown cpu (pvr %lx), freezing!\n", iu_version);
+    printk("Unknown cpu (pvr %x), freezing!\n", iu_version);
     for (;;) {
     }
 }