The preferred stuff probably got squashed in a merge. A question worth asking: should I reinstate it as-is, or is there any minor improvement that could be done opportunistically?

RE: device names- There are options here. EFI has a protocol that can be used to attach an arbitrary string as a description. It wouldn't be too hard to print that name out if it's present on a handle. You could generate those names from a number of sources, in fact: filesystem labels, ZFS UUID's, or EFI device paths as a fallback mechanism.

There isn't a need to clean up memory after boot1, and in fact, that will probably break things. Once an EFI driver is initialized and attached to handles, it stays around until ExitBootServices or until the driver is unloaded (which currently isn't done ever).

I closed the other review. What exactly remains to be done on this?

Closing. Conduct all review on https://reviews.freebsd.org/D4515

Work on this has moved to https://reviews.freebsd.org/D4515. Please make any requests for revision there.

Thanks for taking care of the remaining cleanup.

Thanks for submitting the update. I am currently tied up dealing with year-end stuff, so not much time to work on it. I will have more time after mid next week.

Fixed strlen bug

Also, it should cleanly apply to the current head and build in make world now.

Updated diff to address many issues.

General cleanup, address style issues. Also slight edits to makefiles.