summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--hscript/meta.cc6
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"};