X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=second%2Fyaboot.c;h=3db7b4fe03f04b42c67adb703748246dcb37a066;hb=fa877515ee56ce034ee8ae0d37994d9c6957e5ad;hp=3d93275018027376cafffb685104a0fbfea586d0;hpb=0c0a18b7a1a6b44963da4469d21428e76f9c2b30;p=yaboot.git

diff --git a/second/yaboot.c b/second/yaboot.c
index 3d93275..3db7b4f 100644
--- a/second/yaboot.c
+++ b/second/yaboot.c
@@ -1606,7 +1606,7 @@ is_elf64(loadinfo_t *loadinfo)
 	     e->e_ident[EI_MAG3]  == ELFMAG3	    &&
 	     e->e_ident[EI_CLASS] == ELFCLASS64  &&
 	     e->e_ident[EI_DATA]  == ELFDATA2MSB &&
-	     e->e_type            == ET_EXEC	    &&
+	     (e->e_type == ET_EXEC || e->e_type == ET_DYN) &&
 	     e->e_machine         == EM_PPC64);
 }
 
@@ -1750,7 +1750,7 @@ yaboot_main(void)
 	  prom_printf("%s: Unable to parse\n", bootdevice);
 	  return -1;
      }
-     if (_machine == _MACH_bplan)
+     if (_machine == _MACH_bplan && !conf_given)
         boot.part++;
      DEBUG_F("After parse_device_path: dev=%s, part=%d, file=%s\n",
 	     boot.dev, boot.part, boot.file);