mirror of
https://git.FreeBSD.org/src.git
synced 2024-12-25 11:37:56 +00:00
make the NAMEBLOCK changes conditional on that preprocessor variable,
and add more documentation of the option in the Makefile also CORRECT the variable mentioned in the README.
This commit is contained in:
parent
1f47599122
commit
c9f36013e5
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=17021
sys/i386/boot/biosboot
@ -1,4 +1,4 @@
|
||||
# $Id: Makefile,v 1.39 1996/04/07 14:27:55 bde Exp $
|
||||
# $Id: Makefile,v 1.40 1996/05/11 04:27:23 bde Exp $
|
||||
#
|
||||
|
||||
PROG= boot
|
||||
@ -20,6 +20,11 @@ CFLAGS+= -DBOOTSEG=${BOOTSEG} -DBOOTSTACK=${BOOTSTACK}
|
||||
# PROBE_KEYBOARD is defined).
|
||||
#CFLAGS+= -DFORCE_COMCONSOLE
|
||||
|
||||
# Enable code to take the default boot string from a fixed location on the
|
||||
# disk.. see nextboot(8) and README.386BSD for more info
|
||||
#CFLAGS+= -DNAMEBLOCK
|
||||
#CFLAGS+= -DNAMEBLOCK_WRITEBACK
|
||||
|
||||
# Bias the conversion from the BIOS drive number to the FreeBSD unit number
|
||||
# for hard disks. This may be useful for people booting in a mixed IDE/SCSI
|
||||
# environment (set BOOT_HD_BIAS to the number of IDE drives).
|
||||
|
@ -41,7 +41,7 @@ boot1 is at block 0.
|
||||
4A/ IF the NAMEBLOCK option is compiled into the bootcode, then the
|
||||
boot1 code will load and examine block1 (Usually unused) and
|
||||
look for a default boot string to use later.. (if the corrct magic number
|
||||
is present). If the option NAMEBLOCKWRITEBACK is also defined, then
|
||||
is present). If the option NAMEBLOCK_WRITEBACK is also defined, then
|
||||
it will zero out that name after finding it, and write the block back,
|
||||
having "used up" that name. The block may contain multiple different
|
||||
boot strings which will be "used up" one after the other.. (one per boot)
|
||||
@ -169,4 +169,4 @@ Before you do this ensure you have a booting floppy with correct
|
||||
disktab and bootblock files on it so that if it doesn't work, you can
|
||||
re-disklabel from the floppy.
|
||||
|
||||
$Id: README.386BSD,v 1.4 1996/04/07 14:27:57 bde Exp $
|
||||
$Id: README.386BSD,v 1.5 1996/07/05 19:55:02 julian Exp $
|
||||
|
@ -24,7 +24,7 @@
|
||||
* the rights to redistribute these changes.
|
||||
*
|
||||
* from: Mach, [92/04/03 16:51:14 rvb]
|
||||
* $Id: boot.c,v 1.50 1996/05/11 04:27:24 bde Exp $
|
||||
* $Id: boot.c,v 1.51 1996/07/05 19:55:03 julian Exp $
|
||||
*/
|
||||
|
||||
|
||||
@ -127,19 +127,19 @@ boot(int drive)
|
||||
}
|
||||
#endif
|
||||
}
|
||||
#ifdef NAMEBLOCK
|
||||
/*
|
||||
* XXX
|
||||
* DAMN! I don't understand why this is not being set
|
||||
* by the code in boot2.S
|
||||
*/
|
||||
dflt_name= (char *)0x0000ffb0;
|
||||
if( (*dflt_name++ == 'D') && (*dflt_name++ == 'N')) {
|
||||
name = dflt_name;
|
||||
} else
|
||||
#endif /*NAMEBLOCK*/
|
||||
loadstart:
|
||||
if( (dflt_name[0] == 'D') && (dflt_name[1] == 'N') && dflt_name[2] ) {
|
||||
name = dflt_name+2;
|
||||
dflt_name[0] = 0;
|
||||
} else {
|
||||
name = dflname; /* re-initialize in case of loop */
|
||||
}
|
||||
name = dflname; /* re-initialize in case of loop */
|
||||
/* print this all each time.. (saves space to do so) */
|
||||
/* If we have looped, use the previous entries as defaults */
|
||||
printf("\n>> FreeBSD BOOT @ 0x%x: %d/%d k of memory\n"
|
||||
|
Loading…
Reference in New Issue
Block a user