Add support for the PowerNV platform

While there correct the detection for IBM pSeries.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Tony Breeds <tony@bakeyournoodle.com>

diff --git a/second/yaboot.c b/second/yaboot.c
index 0fd26a106af36d2599019ebb9289aa1ba150bc5b..9b66ab44e1be0ee82b88e386a5d0358428766e73 100644 (file)
--- a/second/yaboot.c
+++ b/second/yaboot.c
@@ -205,6 +205,9 @@ yaboot_start (unsigned long r3, unsigned long r4, unsigned long r5)
          else if (prom_getprop(root, "device_type", model, 256 ) > 0 &&
              !strncmp("chrp", model, 4))
               _machine = _MACH_chrp;
+         else if (prom_getprop(root, "compatible", model, 256 ) > 0 &&
+                  strstr(model, "ibm,powernv"))
+              _machine = _MACH_chrp;
          else {
               if (prom_getprop(root, "model", model, 256 ) > 0 &&
                   !strncmp(model, "IBM", 3))

diff --git a/ybin/ybin b/ybin/ybin
index 44e63f4468090698d9b62b22f9c76f00561e7850..c1e95bac1a40f8404f5758e9d4e499bcdc809e7d 100755 (executable)
--- a/ybin/ybin
+++ b/ybin/ybin
@@ -73,7 +73,9 @@ fi
 
 ## defaults
 usemount=no
-if (cat /proc/cpuinfo 2> /dev/null | grep ^machine | grep -q 'CHRP IBM') ; then
+if (cat /proc/cpuinfo 2> /dev/null | grep ^platform | grep -q 'pSeries') ; then
+    fstype=raw
+elif (cat /proc/cpuinfo 2> /dev/null | grep ^platform | grep -q 'PowerNV') ; then
     fstype=raw
 else
     fstype=hfs
@@ -504,7 +506,11 @@ checkconf()
        echo 1>&2
        [ "$nonvram" = 0 ] && echo 1>&2 "$PRG: OldWorld PowerMac, nvram will not be updated"
        nonvram=1
-    elif (cat /proc/cpuinfo 2> /dev/null | grep ^machine | grep -q 'CHRP IBM') ; then
+    elif (cat /proc/cpuinfo 2> /dev/null | grep ^platform | grep -q 'pSeries') ; then
+       ## IBM hardware does not need nvram update AFAICT
+       nonvram=1
+       ADDNOTE=yes
+    elif (cat /proc/cpuinfo 2> /dev/null | grep ^platform | grep -q 'PowerNV') ; then
        ## IBM hardware does not need nvram update AFAICT
        nonvram=1
        ADDNOTE=yes