Move loader.efi and boot1.efi to be under sys/boot/efi

[andrew]

Summary

It's mostly MI, with a few MD parts. I've attempted to split out the MD
parts of loader, but more work will be needed.

[imp]

One might quibble over the directory name, but rather than do that, I'm going to say "go" on this, modulo the one comment above.

[imp]

helps to actually have the comment ready when you hit submit: the FDT stuff should be done in a different commit, and I didn't review it at all.

sys/boot/efi/loader/bootinfo.c

330

The LOADER_FDT_SUPPORT looks wholly new, and should be in a separate commit.

[emaste]

Overall looks good and I'm happy to see this go in. Let me know if you need more testing on amd64 still.

sys/boot/Makefile.amd64

12

Looks good; you could commit this little change separately first if you want.

[andrew]

Remove the fdt bits, and a few other items that should be reviewed separately

[emaste]

amd64 tinderbox failed with:

--- lib.depend__D ---
--- .depend ---
rm -f .depend
CC='cc  ' mkdep -f .depend -a     -std=gnu99   /scratch/tmp/emaste/freebsd/contrib/netbsd-tests/lib/libpthread/dlopen/dso/h_pthread_dlopen.c
--- sys.depend__D ---
--- x86 ---
ln -sf /scratch/tmp/emaste/freebsd/sys/boot/efi/boot1/../../../x86/include x86
make[8]: make[8]: don't know how to make reloc.c. Stop
make[8]: stopped in /scratch/tmp/emaste/freebsd/sys/boot/efi/boot1
--- sbin.depend__D ---
--- .depend ---
--- sys.depend__D ---

[andrew]

Re-add the arch dependent files

[emaste]

sys/boot/efi/Makefile

3

We'll need to limit loader/boot1 to amd64 only for now, until the other MD parts come in

[andrew]

Update to pass tinderbox

[emaste]

sys/boot/efi/boot1/Makefile

16

Comment from D1545: put start.S first

33

Comment from D1545:

-Wl,-znocombreloc stops boot1.efi from working on arm64, it would be nice if it was on a separate line, e.g. LDFLAGS+= -Wl,-znocombreloc. This would simplify when we pull this change across.

[andrew]

sys/boot/efi/boot1/Makefile

16

I'm thinking on reworking the arm64 code to put the PE+ header in a new section to make sure it's first.

[emaste]

I successfully tested the patch from your git branch (95153443bea0538431118b1ceaffdd308aa3965e)

[andrew]

Closed by commit rS280950 (authored by @andrew).