diff options
| author | bde <bde@FreeBSD.org> | 2003-11-15 10:04:06 +0000 |
|---|---|---|
| committer | bde <bde@FreeBSD.org> | 2003-11-15 10:04:06 +0000 |
| commit | e44f1268ea6c6ba3d8a0b5200b63319b96b9fd76 (patch) | |
| tree | 13acf8e7b71f20ff92a993329306a769b958ce83 /sys/boot/i386/gptboot/gptboot.c | |
| parent | 081986cbdea44621b192a29d45d34655bd949d4a (diff) | |
| download | FreeBSD-src-e44f1268ea6c6ba3d8a0b5200b63319b96b9fd76.zip FreeBSD-src-e44f1268ea6c6ba3d8a0b5200b63319b96b9fd76.tar.gz | |
Changed the RB_PAUSE flag from 0x40000 to 0x100000 and marked the old
value as reserved for internal use in boot blocks, because RB_PAUSE
broke binary compatibility by usurping the RB_DUAL flag. Probably no
one except me has boot blocks for which this matters, since most boot
blocks based on biosboot including pc98's boot2 can't boot elf kernels,
and /boot/loader doesn't properly pass flags set by the previous stage.
reboot.h:
Also mark the historical RB_PROBEKBD flag (0x80000) as reserved for
internal use in boot blocks.
boot2.c:
Added comments to inhibit usurping of other flags.
Approved by: guido, imp
MFC after: 1 week
Diffstat (limited to 'sys/boot/i386/gptboot/gptboot.c')
| -rw-r--r-- | sys/boot/i386/gptboot/gptboot.c | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/sys/boot/i386/gptboot/gptboot.c b/sys/boot/i386/gptboot/gptboot.c index 2f9971a..bb58353 100644 --- a/sys/boot/i386/gptboot/gptboot.c +++ b/sys/boot/i386/gptboot/gptboot.c @@ -41,19 +41,30 @@ __FBSDID("$FreeBSD$"); #define RBX_ASKNAME 0x0 /* -a */ #define RBX_SINGLE 0x1 /* -s */ +/* 0x2 is reserved for log2(RB_NOSYNC). */ +/* 0x3 is reserved for log2(RB_HALT). */ +/* 0x4 is reserved for log2(RB_INITNAME). */ #define RBX_DFLTROOT 0x5 /* -r */ #define RBX_KDB 0x6 /* -d */ +/* 0x7 is reserved for log2(RB_RDONLY). */ +/* 0x8 is reserved for log2(RB_DUMP). */ +/* 0x9 is reserved for log2(RB_MINIROOT). */ #define RBX_CONFIG 0xa /* -c */ #define RBX_VERBOSE 0xb /* -v */ #define RBX_SERIAL 0xc /* -h */ #define RBX_CDROM 0xd /* -C */ +/* 0xe is reserved for log2(RB_POWEROFF). */ #define RBX_GDB 0xf /* -g */ #define RBX_MUTE 0x10 /* -m */ -#define RBX_PAUSE 0x12 /* -p */ +/* 0x11 is reserved for log2(RB_SELFTEST). */ +/* 0x12 is reserved for boot programs. */ +/* 0x13 is reserved for boot programs. */ +#define RBX_PAUSE 0x14 /* -p */ #define RBX_NOINTR 0x1c /* -n */ +/* 0x1d is reserved for log2(RB_MULTIPLE) and is just misnamed here. */ #define RBX_DUAL 0x1d /* -D */ #define RBX_PROBEKBD 0x1e /* -P */ -/* 0x1f is reserved for the RB_BOOTINFO flag. */ +/* 0x1f is reserved for log2(RB_BOOTINFO). */ /* pass: -a, -s, -r, -d, -c, -v, -h, -C, -g, -m, -p, -D */ #define RBX_MASK 0x2005ffff |
