[PATCH 2/2] cmd: Split out timer command from the sleep command

Bin Meng bmeng.cn at gmail.com
Tue Oct 13 12:40:21 CEST 2020


From: Bin Meng <bin.meng at windriver.com>

CONFIG_CMD_TIMER merits a single file instead of co-exist in the
sleep command file.

Signed-off-by: Bin Meng <bin.meng at windriver.com>
---

 cmd/Makefile |  1 +
 cmd/sleep.c  | 28 ----------------------------
 cmd/timer.c  | 34 ++++++++++++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 28 deletions(-)
 create mode 100644 cmd/timer.c

diff --git a/cmd/Makefile b/cmd/Makefile
index 85bce48..c536a3e 100644
--- a/cmd/Makefile
+++ b/cmd/Makefile
@@ -140,6 +140,7 @@ obj-$(CONFIG_CMD_SMC) += smccc.o
 obj-$(CONFIG_CMD_SYSBOOT) += sysboot.o pxe_utils.o
 obj-$(CONFIG_CMD_TERMINAL) += terminal.o
 obj-$(CONFIG_CMD_TIME) += time.o
+obj-$(CONFIG_CMD_TIMER) += timer.o
 obj-$(CONFIG_CMD_TRACE) += trace.o
 obj-$(CONFIG_HUSH_PARSER) += test.o
 obj-$(CONFIG_CMD_TPM) += tpm-common.o
diff --git a/cmd/sleep.c b/cmd/sleep.c
index 20ab943..9c9b071 100644
--- a/cmd/sleep.c
+++ b/cmd/sleep.c
@@ -58,31 +58,3 @@ U_BOOT_CMD(
 	"    - delay execution for N seconds (N is _decimal_ and can be\n"
 	"      fractional)"
 );
-
-#ifdef CONFIG_CMD_TIMER
-static int do_timer(struct cmd_tbl *cmdtp, int flag, int argc,
-		    char *const argv[])
-{
-	static ulong start;
-
-	if (argc != 2)
-		return CMD_RET_USAGE;
-
-	if (!strcmp(argv[1], "start"))
-		start = get_timer(0);
-
-	if (!strcmp(argv[1], "get")) {
-		ulong msecs = get_timer(start) * 1000 / CONFIG_SYS_HZ;
-		printf("%ld.%03d\n", msecs / 1000, (int)(msecs % 1000));
-	}
-
-	return 0;
-}
-
-U_BOOT_CMD(
-	timer,    2,    1,     do_timer,
-	"access the system timer",
-	"start - Reset the timer reference.\n"
-	"timer get   - Print the time since 'start'."
-);
-#endif
diff --git a/cmd/timer.c b/cmd/timer.c
new file mode 100644
index 0000000..551be5d
--- /dev/null
+++ b/cmd/timer.c
@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * (C) Copyright 2001
+ * Wolfgang Denk, DENX Software Engineering, wd at denx.de.
+ */
+
+#include <common.h>
+#include <command.h>
+
+static int do_timer(struct cmd_tbl *cmdtp, int flag, int argc,
+		    char *const argv[])
+{
+	static ulong start;
+
+	if (argc != 2)
+		return CMD_RET_USAGE;
+
+	if (!strcmp(argv[1], "start"))
+		start = get_timer(0);
+
+	if (!strcmp(argv[1], "get")) {
+		ulong msecs = get_timer(start) * 1000 / CONFIG_SYS_HZ;
+		printf("%ld.%03d\n", msecs / 1000, (int)(msecs % 1000));
+	}
+
+	return 0;
+}
+
+U_BOOT_CMD(
+	timer,    2,    1,     do_timer,
+	"access the system timer",
+	"start - Reset the timer reference.\n"
+	"timer get   - Print the time since 'start'."
+);
-- 
2.7.4



More information about the U-Boot mailing list