diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2023-12-11 03:57:40 -0600 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2023-12-11 03:57:40 -0600 |
| commit | 39dd5776f79d8af759419eedf7e9d4eb96853bca (patch) | |
| tree | 0ef3218a398ae3e9ece816c23e51091b042bab0a | |
| parent | 4fb6a777c8a555bcb05a4b8e77248e859d1c6b40 (diff) | |
| download | horizon-39dd5776f79d8af759419eedf7e9d4eb96853bca.tar.gz horizon-39dd5776f79d8af759419eedf7e9d4eb96853bca.tar.bz2 horizon-39dd5776f79d8af759419eedf7e9d4eb96853bca.tar.xz horizon-39dd5776f79d8af759419eedf7e9d4eb96853bca.zip | |
hscript: bootloader: Support EFI boot on ARMv7
| -rw-r--r-- | hscript/meta.cc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/hscript/meta.cc b/hscript/meta.cc index e2d6d28..d306eaf 100644 --- a/hscript/meta.cc +++ b/hscript/meta.cc @@ -803,7 +803,7 @@ Key *Bootloader::parseFromData(const std::string &data, if(boot == "true") { if(arch == "ppc64" || arch == "ppc") { boot = "grub-ieee1275"; - } else if(arch == "aarch64") { + } else if(arch == "aarch64" || arch == "armv7") { boot = "grub-efi"; } else if(arch == "x86_64" || arch == "pmmx") { #ifdef HAS_INSTALL_ENV @@ -837,10 +837,8 @@ bool Bootloader::validate() const { const static std::set<std::string> valid_arm64 = {"grub-efi"}; valid_selection = valid_arm64.find(candidate) != valid_arm64.end(); } else if(arch == "armv7") { - /* LCOV_EXCL_START - unreachable atm */ - const static std::set<std::string> valid_arm = {}; + const static std::set<std::string> valid_arm = {"grub-efi"}; valid_selection = valid_arm.find(candidate) != valid_arm.end(); - /* LCOV_EXCL_STOP */ } else if(arch == "pmmx") { const static std::set<std::string> valid_pmmx = {"grub-bios", "grub-efi"}; |