Module Name: src
Committed By: tsutsui
Date: Sun Sep 30 14:02:06 UTC 2018
Modified Files:
src/sys/arch/newsmips/stand/boot: Makefile net.c version
Log Message:
Switch bootloader to using DHCP rather than BOOTPARAM.
Also bump version.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/newsmips/stand/boot/Makefile
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/newsmips/stand/boot/net.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/newsmips/stand/boot/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/newsmips/stand/boot/Makefile
diff -u src/sys/arch/newsmips/stand/boot/Makefile:1.22 src/sys/arch/newsmips/stand/boot/Makefile:1.23
--- src/sys/arch/newsmips/stand/boot/Makefile:1.22 Thu Dec 17 05:29:56 2009
+++ src/sys/arch/newsmips/stand/boot/Makefile Sun Sep 30 14:02:06 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2009/12/17 05:29:56 matt Exp $
+# $NetBSD: Makefile,v 1.23 2018/09/30 14:02:06 tsutsui Exp $
S!= cd ${.CURDIR}/../../../..; pwd
@@ -21,7 +21,8 @@ CFLAGS= -Os -ffreestanding -mmemcpy -mno
CFLAGS+= -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith
CPPFLAGS+= -DSUPPORT_USTARFS -DHAVE_CHANGEDISK_HOOK
-CPPFLAGS+= -DSUN_BOOTPARAMS
+#CPPFLAGS+= -DSUN_BOOTPARAMS
+CPPFLAGS+= -DSUPPORT_DHCP -DSUPPORT_BOOTP
CPPFLAGS+= -D_STANDALONE #-DBOOT_DEBUG
CPPFLAGS+= -I${.CURDIR} -I. -I${S}
CPPFLAGS+= -D__daddr_t=int32_t
Index: src/sys/arch/newsmips/stand/boot/net.c
diff -u src/sys/arch/newsmips/stand/boot/net.c:1.5 src/sys/arch/newsmips/stand/boot/net.c:1.6
--- src/sys/arch/newsmips/stand/boot/net.c:1.5 Wed Oct 21 23:12:09 2009
+++ src/sys/arch/newsmips/stand/boot/net.c Sun Sep 30 14:02:06 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: net.c,v 1.5 2009/10/21 23:12:09 snj Exp $ */
+/* $NetBSD: net.c,v 1.6 2018/09/30 14:02:06 tsutsui Exp $ */
/*
* Copyright (c) 1995 Gordon W. Ross
@@ -52,6 +52,7 @@
#include <lib/libsa/stand.h>
#include <lib/libsa/net.h>
#include <lib/libsa/bootparam.h>
+#include <lib/libsa/bootp.h>
#include <lib/libsa/nfs.h>
#include <lib/libkern/libkern.h>
@@ -144,7 +145,7 @@ net_mountroot(void)
printf("Using IP address: %s\n", inet_ntoa(myip));
printf("myip: %s (%s)", hostname, inet_ntoa(myip));
- if (gateip)
+ if (gateip.s_addr)
printf(", gateip: %s", inet_ntoa(gateip));
if (netmask)
printf(", netmask: %s", intoa(netmask));
Index: src/sys/arch/newsmips/stand/boot/version
diff -u src/sys/arch/newsmips/stand/boot/version:1.1 src/sys/arch/newsmips/stand/boot/version:1.2
--- src/sys/arch/newsmips/stand/boot/version:1.1 Thu Apr 18 14:54:39 2002
+++ src/sys/arch/newsmips/stand/boot/version Sun Sep 30 14:02:06 2018
@@ -1,4 +1,4 @@
-$NetBSD: version,v 1.1 2002/04/18 14:54:39 tsutsui Exp $
+$NetBSD: version,v 1.2 2018/09/30 14:02:06 tsutsui 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
@@ -11,3 +11,4 @@ is taken as the current.
1.5: loadfile() update to avoid backwards seeks for ELF Program Headers.
1.6: Add ustarfs support
1.7: Use newvers_stand.sh and print version strings
+1.8: Switch to DHCP rather than BOOTPARAM
