Module Name: src
Committed By: martin
Date: Wed Jan 27 22:18:37 UTC 2010
Modified Files:
src/sys/arch/sparc/stand/ofwboot: boot.c ofdev.c version
Log Message:
Properly close the firmware handle before starting the kernel.
This makes netbooting via bge* work.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/sparc/stand/ofwboot/boot.c
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/sparc/stand/ofwboot/ofdev.c
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/sparc/stand/ofwboot/version
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc/stand/ofwboot/boot.c
diff -u src/sys/arch/sparc/stand/ofwboot/boot.c:1.20 src/sys/arch/sparc/stand/ofwboot/boot.c:1.21
--- src/sys/arch/sparc/stand/ofwboot/boot.c:1.20 Mon Oct 26 19:16:57 2009
+++ src/sys/arch/sparc/stand/ofwboot/boot.c Wed Jan 27 22:18:37 2010
@@ -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);
}
}
Index: src/sys/arch/sparc/stand/ofwboot/ofdev.c
diff -u src/sys/arch/sparc/stand/ofwboot/ofdev.c:1.24 src/sys/arch/sparc/stand/ofwboot/ofdev.c:1.25
--- src/sys/arch/sparc/stand/ofwboot/ofdev.c:1.24 Mon Oct 26 19:16:57 2009
+++ src/sys/arch/sparc/stand/ofwboot/ofdev.c Wed Jan 27 22:18:37 2010
@@ -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;
Index: src/sys/arch/sparc/stand/ofwboot/version
diff -u src/sys/arch/sparc/stand/ofwboot/version:1.17 src/sys/arch/sparc/stand/ofwboot/version:1.18
--- src/sys/arch/sparc/stand/ofwboot/version:1.17 Thu May 7 00:01:31 2009
+++ src/sys/arch/sparc/stand/ofwboot/version Wed Jan 27 22:18:37 2010
@@ -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
