Inline spufs loading for ppc.

3 files changed, 3 insertions, 26 deletions

diff --git a/loader2/hardware.c b/loader2/hardware.c
index 7b18cd5ae..f3aa14b2b 100644
--- a/loader2/hardware.c
+++ b/loader2/hardware.c
@@ -196,27 +196,3 @@ void dasdSetup() {
     }
 #endif
 }
-
-void spufsSetup() {
-#if !defined(__powerpc__)
-    return;
-#else
-    FILE *fd;
-    fd = fopen("/proc/cpuinfo", "r");
-    if(fd) {
-        char buf[1024];
-        while (fgets(buf, 1024, fd) != NULL) {
-            if(!strncmp(buf, "cpu\t\t:", 5)) {
-                if(strstr(buf, "Cell")) {
-                    mlLoadModule("spufs", NULL);
-                    break;
-                }
-            }
-        }
-        fclose(fd);
-        return;
-    } else {
-        return;
-    }
-#endif
-}
diff --git a/loader2/hardware.h b/loader2/hardware.h
index bb7bb430b..d49980d99 100644
--- a/loader2/hardware.h
+++ b/loader2/hardware.h
@@ -27,5 +27,4 @@ int busProbe(int justProbe);
 
 void dasdSetup();
 
-void spufsSetup();
 #endif
diff --git a/loader2/loader.c b/loader2/loader.c
index 6154d4cfc..230328ca1 100644
--- a/loader2/loader.c
+++ b/loader2/loader.c
@@ -1626,7 +1626,9 @@ int main(int argc, char ** argv) {
 
     /* now let's do some initial hardware-type setup */
     dasdSetup();
-    spufsSetup();
+#if defined(__powerpc__)
+    mlLoadModule("spufs", NULL);
+#endif
 
     if (loaderData.lang && (loaderData.lang_set == 1)) {
         setLanguage(loaderData.lang);