Module Name: src Committed By: christos Date: Sat Jan 23 22:29:29 UTC 2016
Modified Files: src/sys/arch/i386/stand/boot: Makefile.boot src/sys/arch/i386/stand/dosboot: Makefile src/sys/arch/i386/stand/pxeboot: Makefile Log Message: We'll define the kernel types for standalone code. To generate a diff of this commit: cvs rdiff -u -r1.68 -r1.69 src/sys/arch/i386/stand/boot/Makefile.boot cvs rdiff -u -r1.29 -r1.30 src/sys/arch/i386/stand/dosboot/Makefile cvs rdiff -u -r1.23 -r1.24 src/sys/arch/i386/stand/pxeboot/Makefile 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/i386/stand/boot/Makefile.boot diff -u src/sys/arch/i386/stand/boot/Makefile.boot:1.68 src/sys/arch/i386/stand/boot/Makefile.boot:1.69 --- src/sys/arch/i386/stand/boot/Makefile.boot:1.68 Sat Jan 23 16:22:47 2016 +++ src/sys/arch/i386/stand/boot/Makefile.boot Sat Jan 23 17:29:29 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.boot,v 1.68 2016/01/23 21:22:47 christos Exp $ +# $NetBSD: Makefile.boot,v 1.69 2016/01/23 22:29:29 christos Exp $ S= ${.CURDIR}/../../../../.. @@ -36,7 +36,7 @@ BINMODE=444 LDFLAGS+= -nostdlib -Wl,-N -Wl,-e,boot_start CPPFLAGS+= -I ${.CURDIR}/.. -I ${.CURDIR}/../../lib -I ${S}/lib/libsa -CPPFLAGS+= -I ${.OBJDIR} -D_KERNTYPES +CPPFLAGS+= -I ${.OBJDIR} # Make sure we override any optimization options specified by the user COPTS= -Os Index: src/sys/arch/i386/stand/dosboot/Makefile diff -u src/sys/arch/i386/stand/dosboot/Makefile:1.29 src/sys/arch/i386/stand/dosboot/Makefile:1.30 --- src/sys/arch/i386/stand/dosboot/Makefile:1.29 Sat Jan 23 16:22:47 2016 +++ src/sys/arch/i386/stand/dosboot/Makefile Sat Jan 23 17:29:29 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2016/01/23 21:22:47 christos Exp $ +# $NetBSD: Makefile,v 1.30 2016/01/23 22:29:29 christos Exp $ S= ${.CURDIR}/../../../.. @@ -13,7 +13,7 @@ SRCS= main.c devopen.c exec.c CPPFLAGS+= -DSLOW # for libz CPPFLAGS+= -DCOMPAT_386BSD_MBRPART -CPPFLAGS+= -DXMS -D_KERNTYPES +CPPFLAGS+= -DXMS CPPFLAGS+= -DLIBSA_ENABLE_LS_OP #uncomment if there are problems with memory detection #CPPFLAGS+= -DCONSERVATIVE_MEMDETECT Index: src/sys/arch/i386/stand/pxeboot/Makefile diff -u src/sys/arch/i386/stand/pxeboot/Makefile:1.23 src/sys/arch/i386/stand/pxeboot/Makefile:1.24 --- src/sys/arch/i386/stand/pxeboot/Makefile:1.23 Sat Jan 23 16:22:47 2016 +++ src/sys/arch/i386/stand/pxeboot/Makefile Sat Jan 23 17:29:29 2016 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2016/01/23 21:22:47 christos Exp $ +# $NetBSD: Makefile,v 1.24 2016/01/23 22:29:29 christos Exp $ S= ${.CURDIR}/../../../.. @@ -40,7 +40,7 @@ CPPFLAGS+= -DSUPPORT_SERIAL=boot_params. CPPFLAGS+= -DCONSPEED=boot_params.bp_conspeed CPPFLAGS+= -DCONSADDR=boot_params.bp_consaddr CPPFLAGS+= -DCONSOLE_KEYMAP=boot_params.bp_keymap -CPPFLAGS+= -DDIRECT_SERIAL -D_KERNTYPES +CPPFLAGS+= -DDIRECT_SERIAL # Various serial line configurations #CPPFLAGS+= -DSUPPORT_SERIAL=CONSDEV_PC -DDIRECT_SERIAL # or