[src/trunk]: src/sys/arch/newsmips/stand/boot Switch bootloader to using DHCP...

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

details:   https://anonhg.NetBSD.org/src/rev/201f07d675e9
branches:  trunk
changeset: 433740:201f07d675e9
user:      tsutsui <tsutsui%NetBSD.org@localhost>
date:      Sun Sep 30 14:02:06 2018 +0000

description:
Switch bootloader to using DHCP rather than BOOTPARAM.

Also bump version.

diffstat:

 sys/arch/newsmips/stand/boot/Makefile |  5 +++--
 sys/arch/newsmips/stand/boot/net.c    |  5 +++--
 sys/arch/newsmips/stand/boot/version  |  3 ++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diffs (59 lines):

diff -r 3548cca80bfb -r 201f07d675e9 sys/arch/newsmips/stand/boot/Makefile
--- a/sys/arch/newsmips/stand/boot/Makefile     Sun Sep 30 13:53:26 2018 +0000
+++ b/sys/arch/newsmips/stand/boot/Makefile     Sun Sep 30 14:02:06 2018 +0000
@@ -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+= -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
diff -r 3548cca80bfb -r 201f07d675e9 sys/arch/newsmips/stand/boot/net.c
--- a/sys/arch/newsmips/stand/boot/net.c        Sun Sep 30 13:53:26 2018 +0000
+++ b/sys/arch/newsmips/stand/boot/net.c        Sun Sep 30 14:02:06 2018 +0000
@@ -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 @@
        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));
diff -r 3548cca80bfb -r 201f07d675e9 sys/arch/newsmips/stand/boot/version
--- a/sys/arch/newsmips/stand/boot/version      Sun Sep 30 13:53:26 2018 +0000
+++ b/sys/arch/newsmips/stand/boot/version      Sun Sep 30 14:02:06 2018 +0000
@@ -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 @@
 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