Load spufs module on cell (#237725) and remove spufs hack as we should do the

right thing now.

3 files changed, 27 insertions, 0 deletions

diff --git a/loader2/hardware.c b/loader2/hardware.c
index b22d124b1..72d8ce3cc 100644
--- a/loader2/hardware.c
+++ b/loader2/hardware.c
@@ -318,3 +318,27 @@ void dasdSetup(moduleList modLoaded, moduleDeps modDeps,
 #endif
 }
 
+void spufsSetup(moduleList modLoaded, moduleDeps modDeps,
+               moduleInfoSet modInfo) {
+#if !defined(__powerpc__)
+    return;
+#else
+    FILE *fd;
+    fd = fopen("/proc/cpuinfo", "r");
+    if(fd) {
+        char buf[1024];
+        while (fgets(buf, 1024, f) != NULL) {
+            if(!strncmp(buf, "cpu\t\t:", 5)) {
+                if(strstr(buf, "Cell")) {
+                    mlLoadModule("spufs", modLoaded, modDeps, modInfo, NULL);
+                    break;
+                }
+            }
+        }
+        fclose(fd);
+        return;
+    } else {
+        return;
+    }
+#endif
+}
diff --git a/loader2/hardware.h b/loader2/hardware.h
index 5da7bf6b5..7014cf80d 100644
--- a/loader2/hardware.h
+++ b/loader2/hardware.h
@@ -23,4 +23,6 @@ void dasdSetup(moduleList modLoaded, moduleDeps modDeps,
 void ipv6Setup(moduleList modLoaded, moduleDeps modDeps,
                moduleInfoSet modInfo);
 
+void spufsSetup(moduleList modLoaded, moduleDeps modDeps,
+               moduleInfoSet modInfo);
 #endif
diff --git a/loader2/loader.c b/loader2/loader.c
index cc353ca59..1b8d6c8b5 100644
--- a/loader2/loader.c
+++ b/loader2/loader.c
@@ -1535,6 +1535,7 @@ int main(int argc, char ** argv) {
     ideSetup(modLoaded, modDeps, modInfo);
     scsiSetup(modLoaded, modDeps, modInfo);
     dasdSetup(modLoaded, modDeps, modInfo);
+    spufsSetup(modLoaded, modDeps, modInfo);
 
     /* Note we *always* do this. If you could avoid this you could get
        a system w/o USB keyboard support, which would be bad. */