[src/trunk]: src/sys/arch/i386/stand * Rename the pxeboot binary from "pxeboo...

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

details:   https://anonhg.NetBSD.org/src/rev/278f039b8954
branches:  trunk
changeset: 522480:278f039b8954
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Wed Feb 20 03:00:27 2002 +0000

description:
* Rename the pxeboot binary from "pxeboot" to "pxeboot_ia32", since
  there are other architectures (e.g. IA64) which also use PXE.
* Get the console right in pxeboot, from Andreas Gustafsson.
* Add a "com0" version of pxeboot, to address the same issue that
  biosboot_com0 addresses.

diffstat:

 sys/arch/i386/stand/Makefile              |   3 ++-
 sys/arch/i386/stand/pxeboot/Makefile      |  21 ++++++++++++++++-----
 sys/arch/i386/stand/pxeboot/main.c        |   8 ++++++--
 sys/arch/i386/stand/pxeboot_com0/Makefile |   5 +++++
 4 files changed, 29 insertions(+), 8 deletions(-)

diffs (108 lines):

diff -r 13fd3ead516d -r 278f039b8954 sys/arch/i386/stand/Makefile
--- a/sys/arch/i386/stand/Makefile      Wed Feb 20 02:32:56 2002 +0000
+++ b/sys/arch/i386/stand/Makefile      Wed Feb 20 03:00:27 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.17 2002/02/19 19:49:37 thorpej Exp $
+#      $NetBSD: Makefile,v 1.18 2002/02/20 03:00:27 thorpej Exp $
 
 SUBDIR=                genprom installboot .WAIT
 
@@ -11,5 +11,6 @@
 SUBDIR+=       netboot
 
 SUBDIR+=       pxeboot
+SUBDIR+=       pxeboot_com0
 
 .include <bsd.subdir.mk>
diff -r 13fd3ead516d -r 278f039b8954 sys/arch/i386/stand/pxeboot/Makefile
--- a/sys/arch/i386/stand/pxeboot/Makefile      Wed Feb 20 02:32:56 2002 +0000
+++ b/sys/arch/i386/stand/pxeboot/Makefile      Wed Feb 20 03:00:27 2002 +0000
@@ -1,18 +1,22 @@
-#      $NetBSD: Makefile,v 1.2 2002/02/17 20:03:11 thorpej Exp $
+#      $NetBSD: Makefile,v 1.3 2002/02/20 03:00:27 thorpej Exp $
 
 S=     ${.CURDIR}/../../../../
 
-BASE?= pxeboot
+BASE?= pxeboot_ia32
 PROG= ${BASE}.bin
 MKMAN= no
 NEWVERSWHAT=   "PXE Boot"
 STARTFILE=     ${PXESTART}
 RELOC=         0x0
 
-#.PATH.c: ${.CURDIR}/../netboot
+.if (${BASE} != "pxeboot_ia32")
+.PATH.c: ${.CURDIR}/../pxeboot
+.PATH.S: ${.CURDIR}/../pxeboot
+.endif
 
 SRCS= main.c dev_net.c devopen.c conf.c exec.c pxe.c pxe_call.S
 
+.if (${BASE} == "pxeboot_ia32")
 # Various serial line configurations
 CPPFLAGS+= -DSUPPORT_SERIAL=CONSDEV_PC -DDIRECT_SERIAL
 #      or
@@ -21,6 +25,11 @@
 #CPPFLAGS+= -DSUPPORT_SERIAL=CONSDEV_AUTO 
 #      and maybe 
 #CPPFLAGS+= -DDIRECT_SERIAL -DCOMCONS_KEYPRESS -DCONSPEED=57600
+.endif
+
+.if (${BASE} == "pxeboot_ia32_com0")
+CPPFLAGS+= -DSUPPORT_SERIAL=CONSDEV_COM0 -DDIRECT_SERIAL
+.endif
 
 CPPFLAGS+= -DSUPPORT_BOOTP -DSUPPORT_DHCP
 CPPFLAGS+= -DSUPPORT_TFTP
@@ -28,8 +37,6 @@
 
 CPPFLAGS+= -DPASS_MEMMAP
 
-#CPPFLAGS+= -DBOOTPASSWD
-
 #CFLAGS= -O2 -fomit-frame-pointer -fno-defer-pop
 CFLAGS+= -Wall -Wmissing-prototypes -Wstrict-prototypes -Wno-main
 
@@ -38,6 +45,10 @@
 
 I386MISCMAKEFLAGS= I386_INCLUDE_DISK=no
 
+.if (${BASE} == "pxeboot_ia32")
 VERSIONFILE= ${.CURDIR}/version
+.else
+VERSIONFILE= ${.CURDIR}/../pxeboot/version
+.endif
 
 .include "../Makefile.booters"
diff -r 13fd3ead516d -r 278f039b8954 sys/arch/i386/stand/pxeboot/main.c
--- a/sys/arch/i386/stand/pxeboot/main.c        Wed Feb 20 02:32:56 2002 +0000
+++ b/sys/arch/i386/stand/pxeboot/main.c        Wed Feb 20 03:00:27 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: main.c,v 1.3 2002/02/17 20:14:08 thorpej Exp $ */
+/*     $NetBSD: main.c,v 1.4 2002/02/20 03:00:27 thorpej Exp $ */
 
 /*
  * Copyright (c) 1996
@@ -111,7 +111,11 @@
 {
         char c;
 
-       initio(CONSDEV_AUTO);
+#ifdef SUPPORT_SERIAL
+       initio(SUPPORT_SERIAL);
+#else
+       initio(CONSDEV_PC);
+#endif
        gateA20();
 
        print_banner();
diff -r 13fd3ead516d -r 278f039b8954 sys/arch/i386/stand/pxeboot_com0/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/i386/stand/pxeboot_com0/Makefile Wed Feb 20 03:00:27 2002 +0000
@@ -0,0 +1,5 @@
+#      $NetBSD: Makefile,v 1.1 2002/02/20 03:00:27 thorpej Exp $
+
+BASE=  pxeboot_ia32_com0
+
+.include "../pxeboot/Makefile"