diff options
| author | avg <avg@FreeBSD.org> | 2012-05-09 08:04:29 +0000 |
|---|---|---|
| committer | avg <avg@FreeBSD.org> | 2012-05-09 08:04:29 +0000 |
| commit | a5d68259c2d9ee2ae1d901e393c549f79274ba13 (patch) | |
| tree | 64f3913b8394e9df98b044ee301d7200d7c6cbaf /sys/boot/i386/zfsboot | |
| parent | c4c31a507d2ada4ae55e23d07381c15a834cbc0c (diff) | |
| download | FreeBSD-src-a5d68259c2d9ee2ae1d901e393c549f79274ba13.zip FreeBSD-src-a5d68259c2d9ee2ae1d901e393c549f79274ba13.tar.gz | |
btxldr: future-proof argument passing from boot1/2-ish to loader
Place the arguments at a fixed offset of 0x800 withing the argument area
(of size 0x1000). Allow variable size extended arguments first of which
should be a size of the extended arguments (including the size
parameter).
Consolidate all related definitions in a new i386/common/bootargs.h header.
Many thanks to jhb and bde for their guidance and reviews.
Reviewed by: jhb, bde
Approved by: jhb
MFC after: 1 month
Diffstat (limited to 'sys/boot/i386/zfsboot')
| -rw-r--r-- | sys/boot/i386/zfsboot/zfsboot.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sys/boot/i386/zfsboot/zfsboot.c b/sys/boot/i386/zfsboot/zfsboot.c index a6be3ee..17881dd 100644 --- a/sys/boot/i386/zfsboot/zfsboot.c +++ b/sys/boot/i386/zfsboot/zfsboot.c @@ -41,9 +41,7 @@ __FBSDID("$FreeBSD$"); #include "drv.h" #include "util.h" #include "cons.h" - -/* Hint to loader that we came from ZFS */ -#define KARGS_FLAGS_ZFS 0x4 +#include "bootargs.h" #define PATH_DOTCONFIG "/boot.config" #define PATH_CONFIG "/boot/config" |
