CVS commit: src/sys/arch/sparc/stand/ofwboot
Module Name:src
Committed By: rin
Date: Fri Apr 29 20:24:02 UTC 2022
Modified Files:
src/sys/arch/sparc/stand/ofwboot: loadfile_machdep.c
Log Message:
Fix fallout from libsa change; stand.h includes now.
- Stop redefining roundup2().
- Compare kvamap->start (uint64_t) with 0 instead of NULL.
- Include explicitly.
Thanks gson@ for notification.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
src/sys/arch/sparc/stand/ofwboot/loadfile_machdep.c
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/loadfile_machdep.c
diff -u src/sys/arch/sparc/stand/ofwboot/loadfile_machdep.c:1.16 src/sys/arch/sparc/stand/ofwboot/loadfile_machdep.c:1.17
--- src/sys/arch/sparc/stand/ofwboot/loadfile_machdep.c:1.16 Fri Nov 4 20:04:11 2016
+++ src/sys/arch/sparc/stand/ofwboot/loadfile_machdep.c Fri Apr 29 20:24:02 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: loadfile_machdep.c,v 1.16 2016/11/04 20:04:11 macallan Exp $ */
+/* $NetBSD: loadfile_machdep.c,v 1.17 2022/04/29 20:24:02 rin Exp $ */
/*-
* Copyright (c) 2005 The NetBSD Foundation, Inc.
@@ -29,6 +29,8 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
+#include
+
#include
#include
@@ -47,8 +49,6 @@
#define hi(val) ((uint32_t)(((val) >> 32) & (uint32_t)-1))
#define lo(val) ((uint32_t)((val) & (uint32_t)-1))
-#define roundup2(x, y) (((x)+((y)-1))&(~((y)-1)))
-
typedef int phandle_t;
@@ -133,7 +133,7 @@ kvamap_extract(vaddr_t va, vsize_t len,
*new_va = va;
for (i = 0; (len > 0) && (i < MAXSEGNUM); i++) {
- if (kvamap[i].start == NULL)
+ if (kvamap[i].start == 0)
break;
if ((kvamap[i].start <= va) && (va < kvamap[i].end)) {
uint64_t va_len = kvamap[i].end - va;
@@ -155,7 +155,7 @@ kvamap_enter(uint64_t va, uint64_t len)
DPRINTF(("kvamap_enter: %d@%p\n", (int)len, (void*)(u_long)va));
for (i = 0; (len > 0) && (i < MAXSEGNUM); i++) {
- if (kvamap[i].start == NULL) {
+ if (kvamap[i].start == 0) {
kvamap[i].start = va;
kvamap[i].end = va + len;
break;
CVS commit: src/sys/arch/sparc/stand/ofwboot
Module Name:src Committed By: rin Date: Fri Apr 29 20:24:02 UTC 2022 Modified Files: src/sys/arch/sparc/stand/ofwboot: loadfile_machdep.c Log Message: Fix fallout from libsa change; stand.h includes now. - Stop redefining roundup2(). - Compare kvamap->start (uint64_t) with 0 instead of NULL. - Include explicitly. Thanks gson@ for notification. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 \ src/sys/arch/sparc/stand/ofwboot/loadfile_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sparc/stand/ofwboot
Module Name:src Committed By: martin Date: Thu Nov 28 14:21:25 UTC 2019 Modified Files: src/sys/arch/sparc/stand/ofwboot: srt0.s Log Message: Provide a mostly-zeroed page at the start of the text segment, to work around an OpenBIOS bug, see PR port-sparc64/54719 for details. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/sparc/stand/ofwboot/srt0.s Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sparc/stand/ofwboot
Module Name:src Committed By: martin Date: Thu Nov 28 14:21:25 UTC 2019 Modified Files: src/sys/arch/sparc/stand/ofwboot: srt0.s Log Message: Provide a mostly-zeroed page at the start of the text segment, to work around an OpenBIOS bug, see PR port-sparc64/54719 for details. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/sparc/stand/ofwboot/srt0.s 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/srt0.s diff -u src/sys/arch/sparc/stand/ofwboot/srt0.s:1.7 src/sys/arch/sparc/stand/ofwboot/srt0.s:1.8 --- src/sys/arch/sparc/stand/ofwboot/srt0.s:1.7 Sun Aug 23 10:59:15 2015 +++ src/sys/arch/sparc/stand/ofwboot/srt0.s Thu Nov 28 14:21:25 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: srt0.s,v 1.7 2015/08/23 10:59:15 joerg Exp $ */ +/* $NetBSD: srt0.s,v 1.8 2019/11/28 14:21:25 martin Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -63,7 +63,10 @@ _esym: .word 0 /* end of symbol table _C_LABEL(kernel_text) = _start _start: nop ! For some reason this is needed to fixup the text section - + b 1f + nop + .zero 8192-(.-_start) /* hack for OpenBIOS, see port-sparc64/54719 */ +1: /* * Start by creating a stack for ourselves. */
Re: CVS commit: src/sys/arch/sparc/stand/ofwboot
Modified Files: src/sys/arch/sparc/stand/ofwboot: ofdev.c Log Message: Add support for ffsv2 and lfs. It's better to bump ofwboot/version too. --- Izumi Tsutsui
CVS commit: src/sys/arch/sparc/stand/ofwboot
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.
