Merge branch '2021-07-14-platform-updates'
authorTom Rini <trini@konsulko.com>
Wed, 14 Jul 2021 20:48:23 +0000 (16:48 -0400)
committerTom Rini <trini@konsulko.com>
Wed, 14 Jul 2021 20:48:23 +0000 (16:48 -0400)
- Assorted platform updates


Trivial merge