[src/trunk]: src/sys/arch/sparc/stand/ofwboot Properly close the firmware han...

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

details:   https://anonhg.NetBSD.org/src/rev/ba6f7e0826df
branches:  trunk
changeset: 751203:ba6f7e0826df
user:      martin <martin%NetBSD.org@localhost>
date:      Wed Jan 27 22:18:37 2010 +0000

description:
Properly close the firmware handle before starting the kernel.
This makes netbooting via bge* work.

diffstat:

 sys/arch/sparc/stand/ofwboot/boot.c  |  3 ++-
 sys/arch/sparc/stand/ofwboot/ofdev.c |  4 ++--
 sys/arch/sparc/stand/ofwboot/version |  3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diffs (49 lines):

diff -r 3b79c3eb496b -r ba6f7e0826df sys/arch/sparc/stand/ofwboot/boot.c
--- a/sys/arch/sparc/stand/ofwboot/boot.c       Wed Jan 27 22:17:28 2010 +0000
+++ b/sys/arch/sparc/stand/ofwboot/boot.c       Wed Jan 27 22:18:37 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: boot.c,v 1.20 2009/10/26 19:16:57 cegger Exp $ */
+/*     $NetBSD: boot.c,v 1.21 2010/01/27 22:18:37 martin Exp $ */
 
 /*
  * Copyright (c) 1997, 1999 Eduardo E. Horvath.  All rights reserved.
@@ -359,6 +359,7 @@
                (void)printf("Loading %s: ", kernel);
 
                if (fdloadfile(fd, marks, LOAD_ALL) != -1) {
+                       close(fd);
                        jump_to_kernel(marks, kernel, bootline, ofw);
                }
        }
diff -r 3b79c3eb496b -r ba6f7e0826df sys/arch/sparc/stand/ofwboot/ofdev.c
--- a/sys/arch/sparc/stand/ofwboot/ofdev.c      Wed Jan 27 22:17:28 2010 +0000
+++ b/sys/arch/sparc/stand/ofwboot/ofdev.c      Wed Jan 27 22:18:37 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ofdev.c,v 1.24 2009/10/26 19:16:57 cegger Exp $        */
+/*     $NetBSD: ofdev.c,v 1.25 2010/01/27 22:18:37 martin Exp $        */
 
 /*
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -531,7 +531,7 @@
 
                ofdev.type = OFDEV_NET;
                of->f_dev = ofdevsw;
-               of->f_devdata = NULL;
+               of->f_devdata = &ofdev;
 
                if (!strncmp(*file,"/tftp:",6)) {
                        *file += 6;
diff -r 3b79c3eb496b -r ba6f7e0826df sys/arch/sparc/stand/ofwboot/version
--- a/sys/arch/sparc/stand/ofwboot/version      Wed Jan 27 22:17:28 2010 +0000
+++ b/sys/arch/sparc/stand/ofwboot/version      Wed Jan 27 22:18:37 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: version,v 1.17 2009/05/07 00:01:31 roy Exp $
+$NetBSD: version,v 1.18 2010/01/27 22:18:37 martin Exp $
 
 NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE.  The format of this
 file is important - make sure the entries are appended on end, last item
@@ -18,3 +18,4 @@
 1.12:  Add support to boot from newer Solaris UFS partitions
 1.13:  Deal with kernels missing a separate read-only text segment
 1.14:  Make 3 attempts at BOOTP/DHCP for to allow for bridges and clear prior data read
+1.15:  Properly close the firmware handle before starting the kernel