Module Name: src
Committed By: isaki
Date: Sun Jun 19 09:42:28 UTC 2016
Modified Files:
src/sys/arch/x68k/stand/boot: boot.c
Log Message:
Display debug messages before loading the kernel.
It makes easy to read.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/x68k/stand/boot/boot.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/x68k/stand/boot/boot.c
diff -u src/sys/arch/x68k/stand/boot/boot.c:1.25 src/sys/arch/x68k/stand/boot/boot.c:1.26
--- src/sys/arch/x68k/stand/boot/boot.c:1.25 Sun Jun 19 09:23:16 2016
+++ src/sys/arch/x68k/stand/boot/boot.c Sun Jun 19 09:42:28 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.25 2016/06/19 09:23:16 isaki Exp $ */
+/* $NetBSD: boot.c,v 1.26 2016/06/19 09:42:28 isaki Exp $ */
/*
* Copyright (c) 2001 Minoura Makoto
@@ -142,17 +142,6 @@ doboot(const char *file, int flags)
printf("Starting %s, flags 0x%x\n", file, flags);
- loadflag = LOAD_KERNEL;
- if (file[0] == 'f')
- loadflag &= ~LOAD_BACKWARDS;
-
- marks[MARK_START] = 0x100000;
- if ((fd = loadfile(file, marks, loadflag)) == -1) {
- printf("loadfile failed\n");
- return;
- }
- close(fd);
-
if (devparse(file, &dev, &unit, &part, &name) != 0) {
printf("XXX: unknown corruption in /boot.\n");
}
@@ -195,6 +184,17 @@ doboot(const char *file, int flags)
#endif
#endif
+ loadflag = LOAD_KERNEL;
+ if (file[0] == 'f')
+ loadflag &= ~LOAD_BACKWARDS;
+
+ marks[MARK_START] = 0x100000;
+ if ((fd = loadfile(file, marks, loadflag)) == -1) {
+ printf("loadfile failed\n");
+ return;
+ }
+ close(fd);
+
p = ((short*) marks[MARK_ENTRY]) - 1;
#ifdef DEBUG
printf("Kernel Version: 0x%x\n", *p);
