[src/sommerfeld_i386mp_1]: src/sys/arch/i386/stand Cleanup of i386 bootloader...

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

details:   https://anonhg.NetBSD.org/src/rev/cf11cfd3a3e0
branches:  sommerfeld_i386mp_1
changeset: 482491:cf11cfd3a3e0
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Sun Feb 17 20:03:07 2002 +0000

description:
Cleanup of i386 bootloader building:
* Add separate directories for the individual netboot ROMs and
  always build them.
* Each bootloader Makefile explicitly specifies the start file
  and link address it wishes to use.
* genprom becomes a proper host program.
* Make sure all generated files get cleaned up.
* Set BINDIR in Makefile.inc
* Add compressed image support to pxeboot.
* Make pxeboot use the default serial console speed (9600).

diffstat:

 sys/arch/i386/stand/Makefile.inc           |   3 +
 sys/arch/i386/stand/biosboot/Makefile      |  67 ++++++++++++++++++++++++++++++
 sys/arch/i386/stand/biosboot_ser/Makefile  |  43 +++++++++++++++++++
 sys/arch/i386/stand/dosboot/Makefile       |  43 +++++++++++++++++++
 sys/arch/i386/stand/genprom/Makefile       |   6 ++
 sys/arch/i386/stand/lib/netif/Makefile.inc |  36 ++++++++++++++++
 6 files changed, 198 insertions(+), 0 deletions(-)

diffs (222 lines):

diff -r c67895103ab2 -r cf11cfd3a3e0 sys/arch/i386/stand/Makefile.inc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/i386/stand/Makefile.inc  Sun Feb 17 20:03:07 2002 +0000
@@ -0,0 +1,3 @@
+#      $NetBSD: Makefile.inc,v 1.1.2.2 2002/02/17 20:03:07 thorpej Exp $
+
+BINDIR=        /usr/mdec
diff -r c67895103ab2 -r cf11cfd3a3e0 sys/arch/i386/stand/biosboot/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/i386/stand/biosboot/Makefile     Sun Feb 17 20:03:07 2002 +0000
@@ -0,0 +1,67 @@
+#      $NetBSD: Makefile,v 1.39.2.2 2002/02/17 20:03:09 thorpej Exp $
+
+S=     ${.CURDIR}/../../../../
+
+BASE?= biosboot
+PROG= ${BASE}.sym
+NOMAN= # defined
+NEWVERSWHAT=   "BIOS Boot"
+STARTFILE=     ${BSSTART}
+RELOC=         0x0
+
+.if (${BASE} != "biosboot")
+.PATH.c: ${.CURDIR}/../biosboot/
+.endif
+
+SRCS= main.c devopen.c conf.c exec.c
+
+CPPFLAGS+= -DCOMPAT_386BSD_MBRPART -DSUPPORT_PS2
+
+.if (${BASE} == "biosboot")
+# Various serial line configurations
+CPPFLAGS+= -DSUPPORT_SERIAL=CONSDEV_PC -DDIRECT_SERIAL
+#      or
+#CPPFLAGS+= -DSUPPORT_SERIAL=CONSDEV_COM0KBD
+#      or
+#CPPFLAGS+= -DSUPPORT_SERIAL=CONSDEV_AUTO
+#      and maybe
+#CPPFLAGS+= -DDIRECT_SERIAL -DCOMCONS_KEYPRESS -DCONSPEED=57600
+.endif
+
+.if (${BASE} == "biosboot_com0")
+CPPFLAGS+= -DSUPPORT_SERIAL=CONSDEV_COM0 -DDIRECT_SERIAL
+.endif
+
+.if (${BASE} == "biosboot_resetvideo")
+CPPFLAGS+= -DRESET_VIDEO
+CPPFLAGS+= -DSUPPORT_SERIAL=CONSDEV_PC -DDIRECT_SERIAL
+.endif
+
+CPPFLAGS+= -DSUPPORT_USTARFS
+#CPPFLAGS+= -DSUPPORT_DOSFS
+CPPFLAGS+= -DPASS_BIOSGEOM
+CPPFLAGS+= -DPASS_MEMMAP
+#CPPFLAGS+= -DBOOTPASSWD
+
+#uncomment if there are problems with memory detection
+#CPPFLAGS+= -DCONSERVATIVE_MEMDETECT
+#increase MAXFLENTRIES if "installboot" complains about
+# "not enough fragment space in bootcode" (default: 10)
+#CPPFLAGS+= -DMAXFLENTRIES=15
+#set PRIM_LOADSZ to <=9 to make a 720k boot floppy (default: 15)
+#CPPFLAGS+= -DPRIM_LOADSZ=9
+
+#CFLAGS= -O2 -fomit-frame-pointer -fno-defer-pop
+CFLAGS+= -Wall -Wmissing-prototypes -Wstrict-prototypes -Wno-main
+
+SAMISCCPPFLAGS+= -DHEAP_START=0x20000 -DHEAP_LIMIT=0x50000
+SAMISCMAKEFLAGS+= SA_USE_CREAD=yes     # Read compressed kernels
+SAMISCMAKEFLAGS+= SA_INCLUDE_NET=no    # Netboot via TFTP, NFS
+
+.if (${BASE} == "biosboot")
+VERSIONFILE= ${.CURDIR}/version
+.else
+VERSIONFILE= ${.CURDIR}/../biosboot/version
+.endif
+
+.include "../Makefile.booters"
diff -r c67895103ab2 -r cf11cfd3a3e0 sys/arch/i386/stand/biosboot_ser/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/i386/stand/biosboot_ser/Makefile Sun Feb 17 20:03:07 2002 +0000
@@ -0,0 +1,43 @@
+#      $NetBSD: Makefile,v 1.9.2.2 2002/02/17 20:03:09 thorpej Exp $
+
+S=     ${.CURDIR}/../../../../
+
+BASE= biosboot_ser
+PROG= ${BASE}.sym
+NOMAN= # defined
+NEWVERSWHAT=   "BIOS Boot"
+STARTFILE=     ${BSSTART}
+RELOC=         0x0
+
+.PATH: ${.CURDIR}/../biosboot/
+SRCS= main.c devopen.c conf.c exec.c
+
+CPPFLAGS+= -DCOMPAT_386BSD_MBRPART -DDEBUG
+
+#Sample use of serial line debugger
+#CPPFLAGS+= -DSUPPORT_SERIAL=CONSDEV_COM0KBD
+#      or
+CPPFLAGS+= -DSUPPORT_SERIAL=CONSDEV_AUTO -DDIRECT_SERIAL
+#      and maybe
+#CPPFLAGS+= -DDIRECT_SERIAL -DCOMCONS_KEYPRESS -DCONSPEED=57600
+
+CPPFLAGS+= -DPASS_BIOSGEOM
+CPPFLAGS+= -DPASS_MEMMAP
+#uncomment if there are problems with memory detection
+#CPPFLAGS+= -DCONSERVATIVE_MEMDETECT
+#increase MAXFLENTRIES if "installboot" complains about
+# "not enough fragment space in bootcode" (default: 10)
+#CPPFLAGS+= -DMAXFLENTRIES=15
+#set PRIM_LOADSZ to <=9 to make a 720k boot floppy (default: 15)
+#CPPFLAGS+= -DPRIM_LOADSZ=9
+
+#CFLAGS= -O2 -fomit-frame-pointer -fno-defer-pop
+CFLAGS+= -Wall -Wmissing-prototypes -Wstrict-prototypes -Wno-main
+
+SAMISCCPPFLAGS+= -DHEAP_START=0x10000 -DHEAP_LIMIT=0x40000
+SAMISCMAKEFLAGS= SA_USE_CREAD=yes      # Read compressed kernels
+SAMISCMAKEFLAGS= SA_INCLUDE_NET=no     # Support netboot 
+
+VERSIONFILE= ${.CURDIR}/../biosboot/version
+
+.include "../Makefile.booters"
diff -r c67895103ab2 -r cf11cfd3a3e0 sys/arch/i386/stand/dosboot/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/i386/stand/dosboot/Makefile      Sun Feb 17 20:03:07 2002 +0000
@@ -0,0 +1,43 @@
+#      $NetBSD: Makefile,v 1.20.2.2 2002/02/17 20:03:10 thorpej Exp $
+
+S=     ${.CURDIR}/../../../../
+
+BASE= dosboot
+PROG= ${BASE}.com
+NOMAN= # defined
+NEWVERSWHAT=   "DOS Boot"
+STARTFILE=     ${DOSSTART}
+RELOC=         0x100
+
+SRCS= main.c devopen.c exec.c
+
+CPPFLAGS+= -DCOMPAT_386BSD_MBRPART
+CPPFLAGS+= -DXMS
+#uncomment if there are problems with memory detection
+#CPPFLAGS+= -DCONSERVATIVE_MEMDETECT
+
+#CFLAGS= -O2 -fomit-frame-pointer -fno-defer-pop
+CFLAGS+= -Wall -Wmissing-prototypes -Wstrict-prototypes -Wno-main
+
+# XXX should go into library
+SRCS+= getopt.c
+.PATH: ${.CURDIR}/../libsa
+
+SAMISCCPPFLAGS+= -DHEAP_START=0x10000 -DHEAP_LIMIT=0x40000
+SAMISCMAKEFLAGS= SA_USE_CREAD=yes SA_INCLUDE_NET=no
+I386MISCMAKEFLAGS= I386_INCLUDE_DOS=yes
+
+VERSIONFILE= ${.CURDIR}/version
+
+.include <bsd.own.mk>
+
+.ifndef RELEASEDIR
+release:
+       @echo setenv RELEASEDIR first
+       @false
+.else
+release:
+       cp dosboot.com ${RELEASEDIR}/installation/misc
+.endif
+
+.include "../Makefile.booters"
diff -r c67895103ab2 -r cf11cfd3a3e0 sys/arch/i386/stand/genprom/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/i386/stand/genprom/Makefile      Sun Feb 17 20:03:07 2002 +0000
@@ -0,0 +1,6 @@
+#      $NetBSD: Makefile,v 1.6.2.2 2002/02/17 20:03:11 thorpej Exp $
+
+HOSTPROG= genprom
+NOMAN= # defined
+
+.include <bsd.hostprog.mk>
diff -r c67895103ab2 -r cf11cfd3a3e0 sys/arch/i386/stand/lib/netif/Makefile.inc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/i386/stand/lib/netif/Makefile.inc        Sun Feb 17 20:03:07 2002 +0000
@@ -0,0 +1,36 @@
+##     $NetBSD: Makefile.inc,v 1.6.2.2 2002/02/17 20:03:12 thorpej Exp $
+
+SRCS+= netif_small.c
+
+.if (${USE_NETIF} == "3c509")
+SRCS+= 3c509.c elink3.c
+.endif
+
+.if (${USE_NETIF} == "3c590")
+SRCS+= 3c590.c elink3.c
+.endif
+
+.if (${USE_NETIF} == "wd80x3")
+SRCS+= wd80x3.c dp8390.c
+.endif
+
+.if (${USE_NETIF} == "pcnet_pci")
+SRCS+= pcnet_pci.c am7990.c
+.endif
+
+.if (${USE_NETIF} == "pcnet_isapnp")
+SRCS+= pcnet_isapnp.c am7990.c
+.endif
+
+.if (${USE_NETIF} == "i82557")
+SRCS+= i82557.c
+.endif
+
+.if (${USE_NETIF} == "3c90xb")
+SRCS+= 3c90xb.c
+.endif
+
+.if (${USE_NETIF} == "ne2000_isa")
+SRCS+= ne.c dp8390.c
+CPPFLAGS+= -DSUPPORT_NE2000
+.endif