Move common chipset console commands to chipset.c

apreset and apshutdown are now the same across all platforms.

BUG=chrome-os-partner:18343
BRANCH=none
TEST=build all platforms; make sure 'apreset warm', 'apreset cold', and
     'apshutdown' work.

Change-Id: I4ace1ab2bbda4d400528039ad5f84da63c9c7d0e
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/48942

4 files changed, 48 insertions, 39 deletions

diff --git a/common/build.mk b/common/build.mk
index 6eb685a1b9..a0203eb2a7 100644
--- a/common/build.mk
+++ b/common/build.mk
@@ -32,6 +32,7 @@ common-$(CONFIG_LPC)+=port80.o
 common-$(CONFIG_ONEWIRE_LED)+=onewire_led.o
 common-$(CONFIG_PSTORE)+=pstore_commands.o
 common-$(CONFIG_SMART_BATTERY)+=smart_battery.o smart_battery_stub.o
+common-$(CONFIG_TASK_CHIPSET)+=chipset.o
 common-$(CONFIG_TASK_CONSOLE)+=console.o
 common-$(CONFIG_TASK_HOSTCMD)+=host_command.o host_event_commands.o
 common-$(CONFIG_TASK_KEYSCAN)+=keyboard_scan.o
diff --git a/common/chipset.c b/common/chipset.c
new file mode 100644
index 0000000000..708c6b226a
--- /dev/null
+++ b/common/chipset.c
@@ -0,0 +1,47 @@
+/* Copyright (c) 2013 The Chromium OS Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
+ */
+
+/* Chipset common code for Chrome EC */
+
+#include "chipset.h"
+#include "common.h"
+#include "console.h"
+#include "util.h"
+
+/* Console output macros */
+#define CPUTS(outstr) cputs(CC_CHIPSET, outstr)
+#define CPRINTF(format, args...) cprintf(CC_CHIPSET, format, ## args)
+
+/*****************************************************************************/
+/* Console commands */
+
+static int command_apreset(int argc, char **argv)
+{
+	int is_cold = 1;
+
+	if (argc > 1 && !strcasecmp(argv[1], "cold"))
+		is_cold = 1;
+	else if (argc > 1 && !strcasecmp(argv[1], "warm"))
+		is_cold = 0;
+
+	/* Force the chipset to reset */
+	ccprintf("Issuing AP %s reset...\n", is_cold ? "cold" : "warm");
+	chipset_reset(is_cold);
+	return EC_SUCCESS;
+}
+DECLARE_CONSOLE_COMMAND(apreset, command_apreset,
+			"[warm | cold]",
+			"Issue AP reset",
+			NULL);
+
+static int command_apshutdown(int argc, char **argv)
+{
+	chipset_force_shutdown();
+	return EC_SUCCESS;
+}
+DECLARE_CONSOLE_COMMAND(apshutdown, command_apshutdown,
+			NULL,
+			"Force AP shutdown",
+			NULL);
diff --git a/common/gaia_power.c b/common/gaia_power.c
index 769d9ed777..4076e2b130 100644
--- a/common/gaia_power.c
+++ b/common/gaia_power.c
@@ -673,13 +673,3 @@ DECLARE_CONSOLE_COMMAND(power, command_power,
 			"on/off",
 			"Turn AP power on/off",
 			NULL);
-
-static int command_warm_reboot(int argc, char **argv)
-{
-	chipset_reset(0);
-	return EC_SUCCESS;
-}
-DECLARE_CONSOLE_COMMAND(warm_reboot, command_warm_reboot,
-			NULL,
-			"EC triggered warm reboot",
-			NULL);
diff --git a/common/x86_power.c b/common/x86_power.c
index 7761b883c9..d704d32efe 100644
--- a/common/x86_power.c
+++ b/common/x86_power.c
@@ -702,25 +702,6 @@ void chipset_task(void)
 /*****************************************************************************/
 /* Console commands */
 
-static int command_x86reset(int argc, char **argv)
-{
-	int is_cold = 1;
-
-	if (argc > 1 && !strcasecmp(argv[1], "cold"))
-		is_cold = 1;
-	else if (argc > 1 && !strcasecmp(argv[1], "warm"))
-		is_cold = 0;
-
-	/* Force the x86 to reset */
-	ccprintf("Issuing x86 %s reset...\n", is_cold ? "cold" : "warm");
-	chipset_reset(is_cold);
-	return EC_SUCCESS;
-}
-DECLARE_CONSOLE_COMMAND(x86reset, command_x86reset,
-			"[warm | cold]",
-			"Issue x86 reset",
-			NULL);
-
 static int command_powerinfo(int argc, char **argv)
 {
 	/*
@@ -737,16 +718,6 @@ DECLARE_CONSOLE_COMMAND(powerinfo, command_powerinfo,
 			"Show current x86 power state",
 			NULL);
 
-static int command_x86shutdown(int argc, char **argv)
-{
-	chipset_force_shutdown();
-	return EC_SUCCESS;
-}
-DECLARE_CONSOLE_COMMAND(x86shutdown, command_x86shutdown,
-			NULL,
-			"Force x86 shutdown",
-			NULL);
-
 static int command_x86indebug(int argc, char **argv)
 {
 	char *e;