Changeset 8e7c9fe in mainline for kernel/arch/ppc32/src/cpu/cpu.c

Timestamp:

2014-09-12T03:45:25Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge mainline changes

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

• kernel/arch/ppc32/src/cpu/cpu.c (modified) (2 diffs)

kernel/arch/ppc32/src/cpu/cpu.c

@@ -37 +37 @@
 #include <arch.h>
 #include <print.h>
+#include <fpu_context.h>
 
 void cpu_arch_init(void)
 {
+#ifdef CONFIG_FPU
+        fpu_enable();
+#endif
 }
 
@@ -52 +56 @@
         
         switch (cpu->arch.version) {
-                case 8:
-                        name = "PowerPC 750";
-                        break;
-                case 9:
-                        name = "PowerPC 604e";
-                        break;
-                case 0x81:
-                        name = "PowerPC 8260";
-                        break;
-                case 0x8081:
-                        name = "PowerPC 826xA";
-                        break;
-                default:
-                        name = "unknown";
+        case 8:
+                name = "PowerPC 750";
+                break;
+        case 9:
+                name = "PowerPC 604e";
+                break;
+        case 0x81:
+                name = "PowerPC 8260";
+                break;
+        case 0x8081:
+                name = "PowerPC 826xA";
+                break;
+        default:
+                name = "unknown";
         }