diff options
| -rw-r--r-- | kexec/arch/arm/kexec-arm.c | 2 | ||||
| -rw-r--r-- | kexec/phys_arch.c | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/kexec/arch/arm/kexec-arm.c b/kexec/arch/arm/kexec-arm.c index 3fdf839..4b4a659 100644 --- a/kexec/arch/arm/kexec-arm.c +++ b/kexec/arch/arm/kexec-arm.c @@ -113,8 +113,6 @@ int arch_process_options(int argc, char **argv) const struct arch_map_entry arches[] = { { "arm", KEXEC_ARCH_ARM }, - { "armv6l", KEXEC_ARCH_ARM }, - { "armv7l", KEXEC_ARCH_ARM }, { 0 }, }; diff --git a/kexec/phys_arch.c b/kexec/phys_arch.c index ff8c28b..1571a0f 100644 --- a/kexec/phys_arch.c +++ b/kexec/phys_arch.c @@ -13,9 +13,14 @@ long physical_arch(void) return -1; } - for (i = 0; arches[i].machine; ++i) + for (i = 0; arches[i].machine; ++i) { if (strcmp(utsname.machine, arches[i].machine) == 0) return arches[i].arch; + if ((strcmp(arches[i].machine, "arm") == 0) && + (strncmp(utsname.machine, arches[i].machine, + strlen(arches[i].machine)) == 0)) + return arches[i].arch; + } fprintf(stderr, "Unsupported machine type: %s\n", utsname.machine); |