Merge branch '2021-10-18-OF_xxx-cleanup'
authorTom Rini <trini@konsulko.com>
Tue, 19 Oct 2021 13:07:07 +0000 (09:07 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 19 Oct 2021 13:07:07 +0000 (09:07 -0400)
- Clean things up and rework such that we can drop OF_PRIOR_STAGE


Trivial merge