Add crossystem arch (reports x86 or arm, depending on platform)

Change-Id: I857ead5b108d42195145cdbc5cdafa817f3416b4

R=reinauer@chromium.org
BUG=chrome-os-partner:3023
TEST=crossystem arch

(reports 'x86' on x86 platform, 'arm' on ARM platform)

Review URL: http://codereview.chromium.org/6813054

3 files changed, 7 insertions, 2 deletions

diff --git a/host/arch/arm/lib/crossystem_arch.c b/host/arch/arm/lib/crossystem_arch.c
index 34f38f6e..4304ce7c 100644
--- a/host/arch/arm/lib/crossystem_arch.c
+++ b/host/arch/arm/lib/crossystem_arch.c
@@ -75,7 +75,9 @@ int VbGetArchPropertyInt(const char* name) {
 const char* VbGetArchPropertyString(const char* name, char* dest, int size) {
   /* TODO: IMPLEMENT ME!  For now, return reasonable defaults for
    * values where reasonable defaults exist. */
-  if (!strcasecmp(name,"hwid")) {
+  if (!strcasecmp(name,"arch")) {
+    return StrCopy(dest, "arm", size);
+  } else if (!strcasecmp(name,"hwid")) {
     return StrCopy(dest, "UnknownArmHwid", size);
   } else if (!strcasecmp(name,"fwid")) {
     return StrCopy(dest, "UnknownArmFwid", size);
diff --git a/host/arch/x86/lib/crossystem_arch.c b/host/arch/x86/lib/crossystem_arch.c
index 1e1f75b8..b8e6add5 100644
--- a/host/arch/x86/lib/crossystem_arch.c
+++ b/host/arch/x86/lib/crossystem_arch.c
@@ -529,7 +529,9 @@ int VbGetArchPropertyInt(const char* name) {
 
 const char* VbGetArchPropertyString(const char* name, char* dest, int size) {
 
-  if (!strcasecmp(name,"hwid")) {
+  if (!strcasecmp(name,"arch")) {
+    return StrCopy(dest, "x86", size);
+  } else if (!strcasecmp(name,"hwid")) {
     return ReadFileString(dest, size, ACPI_BASE_PATH "/HWID");
   } else if (!strcasecmp(name,"fwid")) {
     return ReadFileString(dest, size, ACPI_BASE_PATH "/FWID");
diff --git a/utility/crossystem_main.c b/utility/crossystem_main.c
index 31634381..133ab007 100644
--- a/utility/crossystem_main.c
+++ b/utility/crossystem_main.c
@@ -47,6 +47,7 @@ const Param sys_param_list[] = {
   {"tpm_fwver", 0, "Firmware version stored in TPM", "0x%08x"},
   {"tpm_kernver", 0, "Kernel version stored in TPM", "0x%08x"},
   /* Read-only strings */
+  {"arch", IS_STRING, "Platform architecture"},
   {"hwid", IS_STRING, "Hardware ID"},
   {"fwid", IS_STRING, "Active firmware ID"},
   {"ro_fwid", IS_STRING, "Read-only firmware ID"},