Rename SILICON to VORTEX and fix duplicate numbering

This commit is contained in:
Martin Kroeker 2020-09-03 08:43:26 +02:00 committed by GitHub
parent ea3a58c844
commit af5bc95503
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions

View File

@ -51,7 +51,7 @@ size_t length=sizeof(value);
// Ampere // Ampere
#define CPU_EMAG8180 10 #define CPU_EMAG8180 10
// Apple // Apple
#define CPU_SILICON 11 #define CPU_VORTEX 13
static char *cpuname[] = { static char *cpuname[] = {
"UNKNOWN", "UNKNOWN",
@ -67,7 +67,7 @@ static char *cpuname[] = {
"EMAG8180", "EMAG8180",
"NEOVERSEN1", "NEOVERSEN1",
"THUNDERX3T110", "THUNDERX3T110",
"SILICON" "VORTEX"
}; };
static char *cpuname_lower[] = { static char *cpuname_lower[] = {
@ -84,7 +84,7 @@ static char *cpuname_lower[] = {
"emag8180", "emag8180",
"neoversen1", "neoversen1",
"thunderx3t110", "thunderx3t110",
"silicon" "vortex"
}; };
int get_feature(char *search) int get_feature(char *search)
@ -209,7 +209,7 @@ int detect(void)
#else #else
#ifdef DARWIN #ifdef DARWIN
sysctlbyname("hw.cpufamily",&value,&length,NULL,0); sysctlbyname("hw.cpufamily",&value,&length,NULL,0);
if (value ==131287967) return CPU_SILICON; if (value ==131287967) return CPU_VORTEX;
#endif #endif
return CPU_ARMV8; return CPU_ARMV8;
#endif #endif
@ -415,8 +415,8 @@ void get_cpuconfig(void)
printf("#define DTB_SIZE 4096 \n"); printf("#define DTB_SIZE 4096 \n");
break; break;
#ifdef DARWIN #ifdef DARWIN
case CPU_SILICON: case CPU_VORTEX:
printf("#define SILICON \n"); printf("#define VORTEX \n");
sysctlbyname("hw.l1icachesize",&value,&length,NULL,0); sysctlbyname("hw.l1icachesize",&value,&length,NULL,0);
printf("#define L1_CODE_SIZE %d \n",value); printf("#define L1_CODE_SIZE %d \n",value);
sysctlbyname("hw.cachelinesize",&value,&length,NULL,0); sysctlbyname("hw.cachelinesize",&value,&length,NULL,0);