[src/netbsd-7]: src/sys/arch/macppc/stand/ofwboot Pull up following revision(...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/e823ea26118a
branches:  netbsd-7
changeset: 445961:e823ea26118a
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Nov 18 19:41:37 2018 +0000

description:
Pull up following revision(s) (requested by tsutsui in ticket #1651):

        sys/arch/macppc/stand/ofwboot/version: revision 1.14
        sys/arch/macppc/stand/ofwboot/ofdev.c: revision 1.27

Fix boot failure from installation floppies.  PR port-macppc/53727

Also bump version to denote a visible fix.

Should be pulled up to netbsd-8 and netbsd-7.

diffstat:

 sys/arch/macppc/stand/ofwboot/ofdev.c |  11 ++++++-----
 sys/arch/macppc/stand/ofwboot/version |   3 ++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diffs (39 lines):

diff -r 268848e719ff -r e823ea26118a sys/arch/macppc/stand/ofwboot/ofdev.c
--- a/sys/arch/macppc/stand/ofwboot/ofdev.c     Sun Nov 18 19:39:49 2018 +0000
+++ b/sys/arch/macppc/stand/ofwboot/ofdev.c     Sun Nov 18 19:41:37 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ofdev.c,v 1.26 2012/02/19 12:02:55 tsutsui Exp $       */
+/*     $NetBSD: ofdev.c,v 1.26.14.1 2018/11/18 19:41:37 martin Exp $   */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -437,10 +437,11 @@
                ofdev.type = OFDEV_DISK;
                ofdev.bsize = DEV_BSIZE;
                /* First try to find a disklabel without partitions */
-               if (strategy(&ofdev, F_READ,
-                            LABELSECTOR, DEV_BSIZE, buf, &nread) != 0
-                   || nread != DEV_BSIZE
-                   || getdisklabel(buf, &label)) {
+               if (!floppyboot &&
+                   (strategy(&ofdev, F_READ,
+                             LABELSECTOR, DEV_BSIZE, buf, &nread) != 0
+                    || nread != DEV_BSIZE
+                    || getdisklabel(buf, &label))) {
                        /* Else try APM or MBR partitions */
                        struct drvr_map *map = (struct drvr_map *)buf;
 
diff -r 268848e719ff -r e823ea26118a sys/arch/macppc/stand/ofwboot/version
--- a/sys/arch/macppc/stand/ofwboot/version     Sun Nov 18 19:39:49 2018 +0000
+++ b/sys/arch/macppc/stand/ofwboot/version     Sun Nov 18 19:41:37 2018 +0000
@@ -1,4 +1,4 @@
-$NetBSD: version,v 1.13 2010/10/17 15:33:04 phx Exp $
+$NetBSD: version,v 1.13.34.1 2018/11/18 19:41:37 martin Exp $
 
 1.1:           Initial revision from NetBSD/powerpc.
 1.2:           Use MI loadfile().
@@ -14,3 +14,4 @@
 1.11:          Check floppyboot and disable LOAD_NOTE to avoid backward seek.
 1.12:          Read Apple Partition Map to find the root partition, when
                no OF path was specified.
+1.13:          Fix boot failure of installation floppies