X-Git-Url: http://git.ozlabs.org/?p=yaboot.git;a=blobdiff_plain;f=second%2Fyaboot.c;h=9b66ab44e1be0ee82b88e386a5d0358428766e73;hp=1f3f1518845aa67b0a81847f226a775a2ea9c34d;hb=ad973226cb9266ce5cf6946833387c0549c4f3f2;hpb=52ad93077e5334581d05ade8e55575573b98087e

diff --git a/second/yaboot.c b/second/yaboot.c
index 1f3f151..9b66ab4 100644
--- 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))
@@ -603,7 +606,7 @@ void check_password(char *str)
 	  prom_printf ("\n");
 #ifdef USE_MD5_PASSWORDS
 	  if (!strncmp (password, "$1$", 3)) {
-	       if (!check_md5_password(passwdbuff, password))
+	       if (!check_md5_password((unsigned char*)passwdbuff, (unsigned char*)password))
 		    return;
 	  }
 	  else if (!strcmp (password, passwdbuff))