]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
cmd: Move meminfo command into its own file
authorSimon Glass <sjg@chromium.org>
Mon, 21 Oct 2024 08:19:29 +0000 (10:19 +0200)
committerTom Rini <trini@konsulko.com>
Fri, 25 Oct 2024 20:22:24 +0000 (14:22 -0600)
In preparation for expanding this command, move it into a separate file.
Rename the function to remove the extra underscore. Update the number of
arguments to 1, since 3 is incorrect.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
cmd/Kconfig
cmd/Makefile
cmd/mem.c
cmd/meminfo.c [new file with mode: 0644]

index 3ee70f31b142720e0104388c3f77922f1cda9f6b..ec2fe7ad35c3ac89465b006c0dffb298b82d58cb 100644 (file)
@@ -885,6 +885,7 @@ config MD5SUM_VERIFY
 
 config CMD_MEMINFO
        bool "meminfo"
+       default y if SANDBOX
        help
          Display memory information.
 
index 3c5bd56e912dff108b9f3849fd13fade0ce698fd..16e275eba630a6b2c796c23e2500036a21419d98 100644 (file)
@@ -110,6 +110,7 @@ obj-$(CONFIG_CMD_LOG) += log.o
 obj-$(CONFIG_CMD_LSBLK) += lsblk.o
 obj-$(CONFIG_CMD_MD5SUM) += md5sum.o
 obj-$(CONFIG_CMD_MEMORY) += mem.o
+obj-$(CONFIG_CMD_MEMINFO) += meminfo.o
 obj-$(CONFIG_CMD_IO) += io.o
 obj-$(CONFIG_CMD_MII) += mii.o
 obj-$(CONFIG_CMD_MISC) += misc.o
index 4d6fde2853170fb92b534ba9af6bb6cf654c0fc0..9e716776393ab1af2ac1d9709dcf1bd882d5aeb8 100644 (file)
--- a/cmd/mem.c
+++ b/cmd/mem.c
@@ -1379,17 +1379,6 @@ U_BOOT_CMD(
 
 #endif
 
-#ifdef CONFIG_CMD_MEMINFO
-static int do_mem_info(struct cmd_tbl *cmdtp, int flag, int argc,
-                      char *const argv[])
-{
-       puts("DRAM:  ");
-       print_size(gd->ram_size, "\n");
-
-       return 0;
-}
-#endif
-
 U_BOOT_CMD(
        base,   2,      1,      do_mem_base,
        "print or set address offset",
@@ -1433,14 +1422,6 @@ U_BOOT_CMD(
 );
 #endif /* CONFIG_CMD_MX_CYCLIC */
 
-#ifdef CONFIG_CMD_MEMINFO
-U_BOOT_CMD(
-       meminfo,        3,      1,      do_mem_info,
-       "display memory information",
-       ""
-);
-#endif
-
 #ifdef CONFIG_CMD_RANDOM
 U_BOOT_CMD(
        random, 4,      0,      do_random,
diff --git a/cmd/meminfo.c b/cmd/meminfo.c
new file mode 100644 (file)
index 0000000..bb9bcec
--- /dev/null
@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: GPL-2.0+
+/*
+ * Copyright 2024 Google LLC
+ * Written by Simon Glass <sjg@chromium.org>
+ */
+
+#include <command.h>
+#include <display_options.h>
+#include <asm/global_data.h>
+
+DECLARE_GLOBAL_DATA_PTR;
+
+static int do_meminfo(struct cmd_tbl *cmdtp, int flag, int argc,
+                      char *const argv[])
+{
+       puts("DRAM:  ");
+       print_size(gd->ram_size, "\n");
+
+       return 0;
+}
+
+U_BOOT_CMD(
+       meminfo,        1,      1,      do_meminfo,
+       "display memory information",
+       ""
+);