Details

Reviewers

emaste
imp

Commits

rS280950: Move the efi loaders to be under sys/boot/efi. This will help us add

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.

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

No Lint Coverage

Unit

No Test Coverage

Event Timeline

andrew updated this revision to Diff 4479.Mar 28 2015, 5:10 PM

andrew retitled this revision from to Move loader.efi and boot1.efi to be under sys/boot/efi.

andrew updated this object.

andrew edited the test plan for this revision. (Show Details)

andrew added a reviewer: emaste.

Herald added a subscriber: imp. · View Herald TranscriptMar 28 2015, 5:10 PM

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.

This revision is now accepted and ready to land.Mar 28 2015, 5:14 PM

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
321	The LOADER_FDT_SUPPORT looks wholly new, and should be in a separate commit.

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 ↗	(On Diff #4479)	Looks good; you could commit this little change separately first if you want.

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

This revision now requires review to proceed.Mar 28 2015, 6:00 PM

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 ---

Re-add the arch dependent files

emaste added inline comments.Mar 29 2015, 8:30 PM

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

Update to pass tinderbox

emaste added inline comments.Mar 31 2015, 1:52 PM

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 added inline comments.Mar 31 2015, 2:12 PM

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.

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

This revision is now accepted and ready to land.Mar 31 2015, 9:39 PM

Closed by commit rS280950 (authored by @andrew).

emaste mentioned this in D3641: Various small cleanups to EFI loader Makefiles..Sep 15 2015, 1:11 PM

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

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 4538

sys/boot/amd64/

sys/boot/amd64/Makefile

sys/boot/amd64/Makefile.inc

sys/boot/amd64/boot1.efi/

sys/boot/amd64/boot1.efi/Makefile

sys/boot/amd64/boot1.efi/Makefile.fat

sys/boot/amd64/boot1.efi/boot1.c

sys/boot/amd64/boot1.efi/fat.tmpl.bz2.uu

sys/boot/amd64/boot1.efi/generate-fat.sh

sys/boot/amd64/efi/

sys/boot/amd64/efi/Makefile

sys/boot/amd64/efi/amd64_tramp.S

sys/boot/amd64/efi/autoload.c

sys/boot/amd64/efi/bootinfo.c

sys/boot/amd64/efi/conf.c

sys/boot/amd64/efi/copy.c

sys/boot/amd64/efi/devicename.c

sys/boot/amd64/efi/elf64_freebsd.c

sys/boot/amd64/efi/framebuffer.h

sys/boot/amd64/efi/framebuffer.c

sys/boot/amd64/efi/ldscript.amd64

sys/boot/amd64/efi/main.c

sys/boot/amd64/efi/reloc.c

sys/boot/amd64/efi/start.S

sys/boot/amd64/efi/version

sys/boot/amd64/efi/x86_efi.h

sys/boot/efi/Makefile

sys/boot/efi/Makefile.inc

sys/boot/efi/boot1/

sys/boot/efi/boot1/Makefile

sys/boot/efi/boot1/Makefile.fat

sys/boot/efi/boot1/boot1.c

sys/boot/efi/boot1/fat.tmpl.bz2.uu

sys/boot/efi/boot1/generate-fat.sh

sys/boot/efi/loader/

sys/boot/efi/loader/Makefile

sys/boot/efi/loader/arch/

sys/boot/efi/loader/arch/amd64/

sys/boot/efi/loader/arch/amd64/Makefile.inc

sys/boot/efi/loader/arch/amd64/amd64_tramp.S

sys/boot/efi/loader/arch/amd64/elf64_freebsd.c

sys/boot/efi/loader/arch/amd64/framebuffer.h

sys/boot/efi/loader/arch/amd64/framebuffer.c

sys/boot/efi/loader/arch/amd64/ldscript.amd64

sys/boot/efi/loader/arch/amd64/reloc.c

sys/boot/efi/loader/arch/amd64/start.S

sys/boot/efi/loader/autoload.c

sys/boot/efi/loader/bootinfo.c

sys/boot/efi/loader/conf.c

sys/boot/efi/loader/copy.c

sys/boot/efi/loader/devicename.c

sys/boot/efi/loader/loader_efi.h

sys/boot/efi/loader/main.c

sys/boot/efi/loader/version

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

Revision Contents
Changeset List