diff options
author | ru <ru@FreeBSD.org> | 2005-09-22 11:20:33 +0000 |
---|---|---|
committer | ru <ru@FreeBSD.org> | 2005-09-22 11:20:33 +0000 |
commit | 9760af8c382fa55568868d334ada0e64f2481cf9 (patch) | |
tree | 2fdf6fc1af64ba8da1cf34cdae1aff76b775752e | |
parent | d906cc2e792011234effd80b11aa1c6cce413143 (diff) | |
download | FreeBSD-src-9760af8c382fa55568868d334ada0e64f2481cf9.zip FreeBSD-src-9760af8c382fa55568868d334ada0e64f2481cf9.tar.gz |
- RBX_MASK wasn't updated when RB_PAUSE was changed from 0x40000
to 0x100000 in rev. 1.67.
- NOPT wasn't updated (decremented) in previous revision.
-rw-r--r-- | sys/boot/i386/boot2/boot2.c | 4 | ||||
-rw-r--r-- | sys/boot/i386/gptboot/gptboot.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sys/boot/i386/boot2/boot2.c b/sys/boot/i386/boot2/boot2.c index 0a4d056..2027a85 100644 --- a/sys/boot/i386/boot2/boot2.c +++ b/sys/boot/i386/boot2/boot2.c @@ -66,14 +66,14 @@ __FBSDID("$FreeBSD$"); /* 0x1f is reserved for log2(RB_BOOTINFO). */ /* pass: -a, -s, -r, -d, -c, -v, -h, -C, -g, -m, -p, -D */ -#define RBX_MASK 0x2005ffff +#define RBX_MASK 0x2011ffff #define PATH_CONFIG "/boot.config" #define PATH_BOOT3 "/boot/loader" #define PATH_KERNEL "/boot/kernel/kernel" #define ARGS 0x900 -#define NOPT 12 +#define NOPT 11 #define NDEV 3 #define MEM_BASE 0x12 #define MEM_EXT 0x15 diff --git a/sys/boot/i386/gptboot/gptboot.c b/sys/boot/i386/gptboot/gptboot.c index 0a4d056..2027a85 100644 --- a/sys/boot/i386/gptboot/gptboot.c +++ b/sys/boot/i386/gptboot/gptboot.c @@ -66,14 +66,14 @@ __FBSDID("$FreeBSD$"); /* 0x1f is reserved for log2(RB_BOOTINFO). */ /* pass: -a, -s, -r, -d, -c, -v, -h, -C, -g, -m, -p, -D */ -#define RBX_MASK 0x2005ffff +#define RBX_MASK 0x2011ffff #define PATH_CONFIG "/boot.config" #define PATH_BOOT3 "/boot/loader" #define PATH_KERNEL "/boot/kernel/kernel" #define ARGS 0x900 -#define NOPT 12 +#define NOPT 11 #define NDEV 3 #define MEM_BASE 0x12 #define MEM_EXT 0x15 |