diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2019-10-23 00:01:54 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2019-10-23 00:48:48 +0300 |
| commit | 456380bb272d3a301c887eee513a3937cc1f48e1 (patch) | |
| tree | 124399167d539582befbe35ad28377eaea6cc8bc /meta-openbmc-mods/meta-common/recipes-utilities | |
| parent | 9722c6ee87766a45a337c094d1293de81cdcb106 (diff) | |
| download | openbmc-456380bb272d3a301c887eee513a3937cc1f48e1.tar.xz | |
Update to internal 10-22-19
Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>
Diffstat (limited to 'meta-openbmc-mods/meta-common/recipes-utilities')
| -rw-r--r-- | meta-openbmc-mods/meta-common/recipes-utilities/io-app/files/io-app.c | 33 | ||||
| -rw-r--r-- | meta-openbmc-mods/meta-common/recipes-utilities/lpc-cmds/lpc-cmds.bb | 2 |
2 files changed, 33 insertions, 2 deletions
diff --git a/meta-openbmc-mods/meta-common/recipes-utilities/io-app/files/io-app.c b/meta-openbmc-mods/meta-common/recipes-utilities/io-app/files/io-app.c index a5ffabd88..955674fa6 100644 --- a/meta-openbmc-mods/meta-common/recipes-utilities/io-app/files/io-app.c +++ b/meta-openbmc-mods/meta-common/recipes-utilities/io-app/files/io-app.c @@ -450,6 +450,7 @@ typedef enum CPU_PILOT3, CPU_PILOT4, CPU_AST2500, + CPU_AST2600, CPU_MAX, } CPU_TYPE; @@ -499,21 +500,49 @@ static CPU_TYPE probe_cpu(void) if (!quiet) fprintf(stderr, "AST2500\n"); this_cpu = CPU_AST2500; + break; } else if (strncmp("ASpeed SoC", v, 11) == 0) { if (!quiet) fprintf(stderr, "Found ASpeed SoC\n"); this_cpu = CPU_AST2500; + break; } else if (strncmp("ServerEngines PILOT3", v, 21) == 0) { if (!quiet) fprintf(stderr, "Found PILOT3\n"); this_cpu = CPU_PILOT3; + break; + } + } + } + else if (strncmp("CPU", cpuinfo, 4) == 0) + { + char *v = strtok_r(NULL, delim, &tmp_s); + if (!v || strncmp("part", v, 5) != 0) + { + continue; + } + v = strtok_r(NULL, delim, &tmp_s); + if (v) + { + if (strncmp("0xb76", v, 6) == 0) + { + if (!quiet) + fprintf(stderr, "AST2500\n"); + this_cpu = CPU_AST2500; + break; + } + else if (strncmp("0xc07", v, 6) == 0) + { + if (!quiet) + fprintf(stderr, "AST2600\n"); + this_cpu = CPU_AST2600; + break; } } - break; } } fclose(f); @@ -530,6 +559,8 @@ static const char *probe_cpu_for_map(void) return "0:2000000,10000000:8000,40000000:43b000"; case CPU_AST2500: return "0:4000000,1e600000:1a0000,20000000:4000000"; + case CPU_AST2600: + return "0:20000000,38000000:8000000,60000000:20000000"; default: return ""; } diff --git a/meta-openbmc-mods/meta-common/recipes-utilities/lpc-cmds/lpc-cmds.bb b/meta-openbmc-mods/meta-common/recipes-utilities/lpc-cmds/lpc-cmds.bb index 2fbb1eb2f..38489263b 100644 --- a/meta-openbmc-mods/meta-common/recipes-utilities/lpc-cmds/lpc-cmds.bb +++ b/meta-openbmc-mods/meta-common/recipes-utilities/lpc-cmds/lpc-cmds.bb @@ -4,7 +4,7 @@ DESCRIPTION = "command tool for LPC interface test on the BMC" inherit cmake LICENSE = "Apache-2.0" -LIC_FILES_CHKSUM = "file://${PHOSPHORBASE}/LICENSE;md5=19407077e42b1ba3d653da313f1f5b4e" +LIC_FILES_CHKSUM = "file://${INTELBASE}/COPYING.apache-2.0;md5=34400b68072d710fecd0a2940a0d1658" SRC_URI = "\ file://CMakeLists.txt \ |