Merge pull request #107999 from andir/platforms-arm-trusted-platform

lib/systems/platforms: treat missing cpu version as generic pcBase
This commit is contained in:
John Ericson 2020-12-31 13:52:09 -05:00 committed by GitHub
commit 15cb12178a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -490,8 +490,9 @@ rec {
# ARM
else if platform.isAarch32 then let
version = platform.parsed.cpu.version or "";
in if lib.versionOlder version "6" then sheevaplug
version = platform.parsed.cpu.version or null;
in if version == null then pcBase
else if lib.versionOlder version "6" then sheevaplug
else if lib.versionOlder version "7" then raspberrypi
else armv7l-hf-multiplatform
else if platform.isAarch64 then aarch64-multiplatform