Ideally the path / rbx cleanup and the addition of new features such as the boot config support for EFI should be committed separately.

Set advertise = 0 when media = auto

Remove unused changes from bootstrap.h

Just some style nits.

Move fsizep assignment to the end of fsread as requested by tsoome_me.com

All test plan test pass here now under qemu.

Fix lost dmadat definition and assignment and add check for invalid dmadat in fsread.

Compile tested but not completed the test plan yet, will confirm once it's passed.

Fix style(9) nit.

Happy with this from a style perspective, however I haven't tested and this area is not one of my strong points. So for commit I'd say I've only reviewed (in part).

In D1986#105007, @rpokala wrote:

@smh: "Also still some older style(9) comments still not addressed."

Other than the blank line you mentioned, what other style(9) issues are there?

Forgot to reference review in commit r294068.

All good, any reason to update to 3.1.13-k?

Update to head r294041
Convert file_loadraw name param to const fixing compiler warning.

Also still some older style(9) comments still not addressed.

Sync with latest HEAD code that enabled WARNS.

Fix ARM warnings highlighted by tinderbox.

Spacing changes for GUID / PROTOCOL structs requested emaste

Address feedback from emaste:

• Remove WARNS from sys/boot/efi/Makefile as it has no effect
• Move WARNS below PROG= etc
• Remove split of GUID / PROTOCOL defines even though they break style(9) 80 col limit, to reduce diff and match NetBSD.

Remove changes covered by https://reviews.freebsd.org/D4839
Sync up with latest code which also removes changes covered by r293460

Looking to get this committed over the next day or so in the hope I can get it MFC'ed before 10.3 freeze.

One style(9) nit but otherwise this looks good to me.

Additional spacing fix

In D4515#102680, @emaste wrote:

You could commit this in three or four pieces if you wish:

1. migration to libstand

Committed: https://svnweb.freebsd.org/changeset/base/293460

Restore removed blank line and correct spacing highlighted by phabricator view.

style nit highlighted by emaste.

Address comment feedback from emaste.

Apart from the default for BOOT1_MAXSIZE this looks good and I've confirmed worked as expected locally, so nice one :)

To use this your head source must >= r293422

Resync with r293422 (required due to boot1 size increase).

In D4515#102069, @emaste wrote:

I built a QEMU VM image with this change incorporated, and run BOOTx64 from the EFI shell and it failed with Error reported: Unsupported. I'll investigate.

Sync with latest head version which now includes the ancillary changes, such as style and warning fixes originally part of this review.

In D4515#101927, @eric_metricspace.net wrote:

I closed the other review.

Hi Eric if we're going to continue working on this on my revision of this (https://reviews.freebsd.org/D4515) then would you like to close this one so we can avoid confusion?

• Fix UFS booting
• Improve error reporting with more use of EFI_ERROR_CODE
• Improve error checking of fsread call

kib believes this is waste of kernel memory so abandoning this review: