stand/uboot: reorg
ClosedPublic
Actions

Authored by imp on Dec 9 2021, 8:37 PM.

Details

Reviewers

manu
mmel
bdragon
tsoome

Commits

rG7b03d429ce9c: stand/uboot: reorg
rG9dc70af83e59: stand/uboot: reorg

Summary

Build uboot ubldr and friends like we build efi binaries
o move everything to be under stand/uboot
o md code goes in arch/$ARCH
o move everything over from the library

Had to rename console.c, disk.c and module.c due to conflicts

o update version to 1.5 to reflect the new way of building

This results in a more consistent build system and should represent no
functional change, apart from powerpc version getting new help
file. Also, moved to exlcuding uboot on powerpc64le by using
BROKEN_OPTION instead of the incidental exclusion we had before due to
Makefile reorgs.

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 43268
Build 40156: arc lint + arc unit

Event Timeline

imp created this revision.Dec 9 2021, 8:37 PM

Herald added subscribers: dab, emaste, andrew, bdrewery. · View Herald TranscriptDec 9 2021, 8:37 PM

imp requested review of this revision.Dec 9 2021, 8:37 PM

Harbormaster completed remote builds in B43265: Diff 99785.Dec 9 2021, 8:37 PM

imp edited the test plan for this revision. (Show Details)Dec 9 2021, 8:38 PM

imp added reviewers: manu, mmel, bdragon, tsoome.

jrtc27 added a subscriber: jrtc27.Dec 9 2021, 9:03 PM

jrtc27 added inline comments.

share/mk/src.opts.mk
319	I think you mean `\|\| ${__T} == "powerpc64le"` inside your parentheses (`!ppcbe == !(ppc && be) == (!ppc \|\| !be) == (!ppc \|\| le)`)? What you have is equivalent to the existing `${__T:Mpowerpc*} == ""`.

Get logic right, per jessica's feedback

Harbormaster completed remote builds in B43268: Diff 99799.Dec 9 2021, 10:09 PM

imp marked an inline comment as done.Dec 9 2021, 10:10 PM

imp added inline comments.

share/mk/src.opts.mk
319	I think this fix is correct, please verify.

stevek added a subscriber: stevek.Dec 10 2021, 3:34 AM

stevek added inline comments.

share/mk/src.opts.mk
319	Instead of the separate :M values you can do it like this: `.if ${__T:Narm:Npowerpc} != "" \|\| ${__T} == "powerpc64le"` (Note that I don't think you intended to have $__fT in there... it looks like a "f" creeped in.)

imp marked an inline comment as done.Dec 10 2021, 3:58 AM

imp added inline comments.

share/mk/src.opts.mk
319	I agree about the stray f. However, your example is != and mine is ==, so ${__T:Narm:Npowerpc} will always produce the null set, no?

jrtc27 added inline comments.Dec 10 2021, 4:01 AM

share/mk/src.opts.mk
319	stevek's suggestion uses :N not :M, but :N isn't commonly used in base for this, especially this file likes :M != "", so I'd prefer to keep it as is

stevek added inline comments.Dec 10 2021, 6:59 AM

share/mk/src.opts.mk
319	We use the :N form a lot in our build at Juniper as it's rather convenient and more efficient than a bunch of separate expressions

stevek added inline comments.Dec 10 2021, 7:07 AM

share/mk/src.opts.mk
319	For example of usage already in the tree, see share/mk/bsd.obj.mk with the .TARGETS variable

imp added inline comments.Dec 10 2021, 8:23 AM

share/mk/src.opts.mk
319	OK. I've convinced myself that :N makes sense (thanks jrtc27 for the insight). I'm inclined to keep it as is for the moment,... I do have one question on ubldr: how do I test it?