Page MenuHomeFreeBSD
Differential D12659

[[ my current integration branch, that also has refactor work ]] Unify boot1 with loader
AbandonedPublic
Actions

Authored by imp on Oct 13 2017, 3:23 PM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Nov 6, 12:01 AM
Unknown Object (File)
Tue, Oct 28, 8:23 AM
Unknown Object (File)
Mon, Oct 27, 1:25 PM
Unknown Object (File)
Oct 10 2025, 11:47 PM
Unknown Object (File)
Oct 8 2025, 1:00 PM
Unknown Object (File)
Oct 3 2025, 12:34 PM
Unknown Object (File)
Oct 1 2025, 10:20 AM
Unknown Object (File)
Sep 24 2025, 6:46 AM
View All Files
Subscribers
eric_metricspace.net

Details

Reviewers
None
Summary

Refactor boot1 to use the same I/O code as /boot/loader uses. Refactor
to use the common efi_main.c.

Submitted by: Eric McCorkle

Move orphaned man pages into new man directory from common. This helps keep cleaer that common is just for the MI files for /boot/loader programs.

Sponsored by: Netflix

Rename top level Makefile.ficl to ficl.mk.

Move common/Makefile.inc to sys/boot/loader.mk.

Makefile.inc has a specific meaning in the tree, and
common/Makefile.inc doesn't quite fit into that. Rename it to
loader.mk and it will be a place to collect common things to all
/boot/loader programs there.

Sponsored by: Netflix

tweak style

create defs.mk for common definitions

Move all the ficl common code into ficl.mk

There's a number of copies of basically identical code to enable
building forth in /boot/loader. Move it all into ficl.mk.

LOADER_foo_SUPPORTED

Explicitly inlcude SYSDIR in the include path -- need machine path too?

Diff Detail

Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 12031
Build 12343: arc lint + arc unit

Event Timeline

imp created this revision.Oct 13 2017, 3:23 PM
Harbormaster completed remote builds in B12031: Diff 33956.Oct 13 2017, 3:23 PM
eric_metricspace.net added a subscriber: eric_metricspace.net.Oct 13 2017, 4:00 PM

Is this applied against some branch? I'm getting complaints about sys/boot/ficl.mk not being there

imp added a comment.Oct 13 2017, 4:10 PM
In D12659#262916, @eric_metricspace.net wrote:

Is this applied against some branch? I'm getting complaints about sys/boot/ficl.mk not being there

The patch is against -current as of earlier today...

imp added a comment.Oct 13 2017, 9:32 PM
In D12659#262923, @imp wrote:
In D12659#262916, @eric_metricspace.net wrote:

Is this applied against some branch? I'm getting complaints about sys/boot/ficl.mk not being there

The patch is against -current as of earlier today...

Looking at the raw diff shows something is amiss. I'll just update this with the one change.

imp updated this revision to Diff 33972.Oct 13 2017, 9:59 PM

Just do one commit

Updating D12659: my current integration branch, that also has refactor work

Unify boot1 with loader

Harbormaster completed remote builds in B12041: Diff 33972.Oct 13 2017, 9:59 PM
imp abandoned this revision.Jul 9 2021, 7:28 AM

Revision Contents
Changeset List

PathSize
sys/
boot/
2 lines
8 lines
arm/
uboot/
61 lines
common/
74 lines
efi/
boot1/
36 lines
811 lines
109 lines
185 lines
248 lines
libefi/
9 lines
libefi/
loader/
188 lines
loader/
18 lines
ficl.mk
Makefile.ficl
7 lines
ficl/
2 lines
i386/
libi386/
9 lines
loader/
51 lines
zfsboot/
2 lines
libsa/
2 lines
loader.mk/
common/
Makefile.inc
32 lines
man/
common/
10 lines
1101 lines
106 lines
mips/
beri/
loader/
32 lines
uboot/
71 lines
powerpc/
kboot/
48 lines
ofw/
48 lines
ps3/
45 lines
uboot/
54 lines
sparc64/
loader/
40 lines
uboot/
lib/
5 lines
userboot/
userboot/
18 lines

Diff 33956

View Options

sys/boot/Makefile

Loading...
View Options

sys/boot/Makefile.ficl

Loading...
View Options

sys/boot/Makefile.inc

Loading...
View Options

sys/boot/arm/uboot/Makefile

Loading...
View Options

sys/boot/common/Makefile

Loading...
View Options

sys/boot/common/Makefile.inc

Loading...
View Options

sys/boot/common/loader.8

Loading...
View Options

sys/boot/common/zfsloader.8

Loading...
View Options

sys/boot/defs.mk

Loading...
View Options

sys/boot/efi/boot1/Makefile

Loading...
View Options

sys/boot/efi/boot1/boot1.c

Loading...
View Options

sys/boot/efi/boot1/boot_module.h

Loading...
View Options

sys/boot/efi/boot1/ufs_module.c

Loading...
View Options

sys/boot/efi/boot1/zfs_module.c

Loading...
View Options

sys/boot/efi/libefi/Makefile

Loading...
View Options

sys/boot/efi/libefi/efi_main.c

Loading...
View Options

sys/boot/efi/loader/Makefile

Loading...
View Options

sys/boot/efi/loader/efi_main.c

Loading...
View Options

sys/boot/ficl.mk

Loading...
View Options

sys/boot/ficl/Makefile

Loading...
View Options

sys/boot/i386/libi386/Makefile

Loading...
View Options

sys/boot/i386/loader/Makefile

Loading...
View Options

sys/boot/i386/zfsboot/Makefile

Loading...
View Options

sys/boot/libsa/Makefile

Loading...
View Options

sys/boot/loader.mk

Loading...
View Options

sys/boot/man/Makefile

Loading...
View Options

sys/boot/man/loader.8

Loading...
View Options

sys/boot/man/zfsloader.8

Loading...
View Options

sys/boot/mips/beri/loader/Makefile

Loading...
View Options

sys/boot/mips/uboot/Makefile

Loading...
View Options

sys/boot/powerpc/kboot/Makefile

Loading...
View Options

sys/boot/powerpc/ofw/Makefile

Loading...
View Options

sys/boot/powerpc/ps3/Makefile

Loading...
View Options

sys/boot/powerpc/uboot/Makefile

Loading...
View Options

sys/boot/sparc64/loader/Makefile

Loading...
View Options

sys/boot/uboot/lib/Makefile

Loading...
View Options

sys/boot/userboot/userboot/Makefile

Loading...