Merge pull request #1738 from sharkcz/s390x

detect z14 arch on s390x
This commit is contained in:
Martin Kroeker 2018-08-16 09:46:34 +02:00 committed by GitHub
commit 52d3f7af50
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 2 deletions

View File

@ -29,15 +29,18 @@
#define CPU_GENERIC 0 #define CPU_GENERIC 0
#define CPU_Z13 1 #define CPU_Z13 1
#define CPU_Z14 2
static char *cpuname[] = { static char *cpuname[] = {
"ZARCH_GENERIC", "ZARCH_GENERIC",
"Z13" "Z13",
"Z14"
}; };
static char *cpuname_lower[] = { static char *cpuname_lower[] = {
"zarch_generic", "zarch_generic",
"z13" "z13",
"z14"
}; };
int detect(void) int detect(void)
@ -62,6 +65,10 @@ int detect(void)
if (strstr(p, "2964")) return CPU_Z13; if (strstr(p, "2964")) return CPU_Z13;
if (strstr(p, "2965")) return CPU_Z13; if (strstr(p, "2965")) return CPU_Z13;
/* detect z14, but fall back to z13 */
if (strstr(p, "3906")) return CPU_Z13;
if (strstr(p, "3907")) return CPU_Z13;
return CPU_GENERIC; return CPU_GENERIC;
} }
@ -107,5 +114,9 @@ void get_cpuconfig(void)
printf("#define Z13\n"); printf("#define Z13\n");
printf("#define DTB_DEFAULT_ENTRIES 64\n"); printf("#define DTB_DEFAULT_ENTRIES 64\n");
break; break;
case CPU_Z14:
printf("#define Z14\n");
printf("#define DTB_DEFAULT_ENTRIES 64\n");
break;
} }
} }