Disentangle #ifdef EFIBOOT.

Separate out files used by both BIOS and EFI boot modes. These files
had many #ifdef EFIBOOT code paths that make it difficult to move forward
with changes needed to support random base VA linked kernels.

ok deraadt@

Add a check to tftp_open() that we are actually opening a TFTP device.

When reading a file from a non-TFTP device, clear the bootmac variable
to prevent the kernel from going into netboot mode.

This allows loading a kernel from a disk device after having booted
efiboot from PXE.

style tweak and ok kettenis@

Implement network boot support in efiboot(8). This changes efiboot(8)
to recognize if it has been booted via PXE. The new TFTP file system
layer will then use the matching PXE base code protocol handle to load
the files. Since this uses the PXE base code protocol for abstraction
instead of the raw Simple Network protocol this will at this point not
work on u-boot based machines as needed on ARM.

Feedback and ok tom@
Also tested by afresh1@

Add serial console support for efiboot.

Don't try to access the com(4) hardware to set up the console speed
on efiboot(8), as it can crash the EFI application.

ok tom@

Switch amd64 to libsa MI softraid.

Rename softraid boot files, which are currently in an MD location. This
will allow us to bring in a MI softraid.{c,h} in lib/libsa.

Remove support for building the boot blocks with DEBUGFLAGS=-D_TEST, which is
supposed to create a userland binary in order to test non-boot related
functionality. This feature has been bitrotting in a non-compiling state
for years, and causes a too-many-ifdefs disease now that there are intrusive
EFI changes.

No functional change.

move putchar() into libsa

"sure" miod@

move getchar() into libsa where applicable

ok miod@

Apply a bunch of style(9) and whitespace fixes to i386/amd64 libsa, making
the code actually diffable. No binary change.

Move the code for softraid boot into separate files, leaving only minimal
hooks that are called from the normal code path. This allows softraid boot
support to be completely enabled or disabled at compile time. For boot(8)
all softraid boot support is now enabled by default, including support for
booting from crypto volumes. Disable softraid boot support for fdboot,
which further shrinks the binary.

If we have booted from a disk that is a member of a bootable softraid
volume, always select the srX device unless the 'a' partition of the disk
is FFS.

Only change the default boot device to a bootable softraid volume, if we
are able to handle the given discipline. At this stage amd64 boot(8) is
limited to RAID 1. This makes life easier for users who are booting from
a softraid crypto volume, but are loading a kernel from hd0a:/bsd.

Tested by jrick@devio.us - thanks!

Teach OpenBSD/amd64 boot(8) how to access softraid(8) volumes. This
allows a kernel to be loaded from a softraid RAID 1 volume. Furthermore,
if you boot from a disk that is a member of a bootable softraid volume
then it will default to booting from the softraid volume (sr[0-9]a:/bsd).

Discussed with deraadt@

kill mcd dead. ok krw matthew millert thib

remove remnants of scd device, discovered by Frederic Perrin

- properly remove NENTS now after fixing the fallout.

ok deraadt@

- partially revert previous NENTS removal for arches which got busted.

- drop NENTS(), which was yet another copy of nitems().
no binary change


ok deraadt@

wt(4) was removed a while ago, so don't support booting off it anoymore.

i386/amd64 was ok tom
zaurus ok drahn

Enter cdboot, a CD-specific second-stage bootrap. Based on the i386
cdboot that Toby and I put together at the hackathon.

"go for it" deraadt@

das boot; das cloned das from das i386

Add a check to tftp_open() that we are actually opening a TFTP device.

When reading a file from a non-TFTP device, clear the bootmac variable
to prevent the kernel from going into netboot mode.

This allows loading a kernel from a disk device after having booted
efiboot from PXE.

style tweak and ok kettenis@

Implement network boot support in efiboot(8). This changes efiboot(8)
to recognize if it has been booted via PXE. The new TFTP file system
layer will then use the matching PXE base code protocol handle to load
the files. Since this uses the PXE base code protocol for abstraction
instead of the raw Simple Network protocol this will at this point not
work on u-boot based machines as needed on ARM.

Feedback and ok tom@
Also tested by afresh1@

Add serial console support for efiboot.

Don't try to access the com(4) hardware to set up the console speed
on efiboot(8), as it can crash the EFI application.

ok tom@

Switch amd64 to libsa MI softraid.

Rename softraid boot files, which are currently in an MD location. This
will allow us to bring in a MI softraid.{c,h} in lib/libsa.

Remove support for building the boot blocks with DEBUGFLAGS=-D_TEST, which is
supposed to create a userland binary in order to test non-boot related
functionality. This feature has been bitrotting in a non-compiling state
for years, and causes a too-many-ifdefs disease now that there are intrusive
EFI changes.

No functional change.

move putchar() into libsa

"sure" miod@

move getchar() into libsa where applicable

ok miod@

Apply a bunch of style(9) and whitespace fixes to i386/amd64 libsa, making
the code actually diffable. No binary change.

Move the code for softraid boot into separate files, leaving only minimal
hooks that are called from the normal code path. This allows softraid boot
support to be completely enabled or disabled at compile time. For boot(8)
all softraid boot support is now enabled by default, including support for
booting from crypto volumes. Disable softraid boot support for fdboot,
which further shrinks the binary.

If we have booted from a disk that is a member of a bootable softraid
volume, always select the srX device unless the 'a' partition of the disk
is FFS.

Only change the default boot device to a bootable softraid volume, if we
are able to handle the given discipline. At this stage amd64 boot(8) is
limited to RAID 1. This makes life easier for users who are booting from
a softraid crypto volume, but are loading a kernel from hd0a:/bsd.

Tested by jrick@devio.us - thanks!

Teach OpenBSD/amd64 boot(8) how to access softraid(8) volumes. This
allows a kernel to be loaded from a softraid RAID 1 volume. Furthermore,
if you boot from a disk that is a member of a bootable softraid volume
then it will default to booting from the softraid volume (sr[0-9]a:/bsd).

Discussed with deraadt@

kill mcd dead. ok krw matthew millert thib

remove remnants of scd device, discovered by Frederic Perrin

- properly remove NENTS now after fixing the fallout.

ok deraadt@

- partially revert previous NENTS removal for arches which got busted.

- drop NENTS(), which was yet another copy of nitems().
no binary change


ok deraadt@

wt(4) was removed a while ago, so don't support booting off it anoymore.

i386/amd64 was ok tom
zaurus ok drahn

Enter cdboot, a CD-specific second-stage bootrap. Based on the i386
cdboot that Toby and I put together at the hackathon.

"go for it" deraadt@

das boot; das cloned das from das i386

Implement network boot support in efiboot(8). This changes efiboot(8)
to recognize if it has been booted via PXE. The new TFTP file system
layer will then use the matching PXE base code protocol handle to load
the files. Since this uses the PXE base code protocol for abstraction
instead of the raw Simple Network protocol this will at this point not
work on u-boot based machines as needed on ARM.

Feedback and ok tom@
Also tested by afresh1@

Add serial console support for efiboot.

Don't try to access the com(4) hardware to set up the console speed
on efiboot(8), as it can crash the EFI application.

ok tom@

Switch amd64 to libsa MI softraid.

Rename softraid boot files, which are currently in an MD location. This
will allow us to bring in a MI softraid.{c,h} in lib/libsa.

Remove support for building the boot blocks with DEBUGFLAGS=-D_TEST, which is
supposed to create a userland binary in order to test non-boot related
functionality. This feature has been bitrotting in a non-compiling state
for years, and causes a too-many-ifdefs disease now that there are intrusive
EFI changes.

No functional change.

move putchar() into libsa

"sure" miod@

move getchar() into libsa where applicable

ok miod@

Apply a bunch of style(9) and whitespace fixes to i386/amd64 libsa, making
the code actually diffable. No binary change.

Move the code for softraid boot into separate files, leaving only minimal
hooks that are called from the normal code path. This allows softraid boot
support to be completely enabled or disabled at compile time. For boot(8)
all softraid boot support is now enabled by default, including support for
booting from crypto volumes. Disable softraid boot support for fdboot,
which further shrinks the binary.

If we have booted from a disk that is a member of a bootable softraid
volume, always select the srX device unless the 'a' partition of the disk
is FFS.

Only change the default boot device to a bootable softraid volume, if we
are able to handle the given discipline. At this stage amd64 boot(8) is
limited to RAID 1. This makes life easier for users who are booting from
a softraid crypto volume, but are loading a kernel from hd0a:/bsd.

Tested by jrick@devio.us - thanks!

Teach OpenBSD/amd64 boot(8) how to access softraid(8) volumes. This
allows a kernel to be loaded from a softraid RAID 1 volume. Furthermore,
if you boot from a disk that is a member of a bootable softraid volume
then it will default to booting from the softraid volume (sr[0-9]a:/bsd).

Discussed with deraadt@

kill mcd dead. ok krw matthew millert thib

remove remnants of scd device, discovered by Frederic Perrin

- properly remove NENTS now after fixing the fallout.

ok deraadt@

- partially revert previous NENTS removal for arches which got busted.

- drop NENTS(), which was yet another copy of nitems().
no binary change


ok deraadt@

wt(4) was removed a while ago, so don't support booting off it anoymore.

i386/amd64 was ok tom
zaurus ok drahn

Enter cdboot, a CD-specific second-stage bootrap. Based on the i386
cdboot that Toby and I put together at the hackathon.

"go for it" deraadt@

das boot; das cloned das from das i386