summaryrefslogtreecommitdiffstats
path: root/common/cmd_demo.c
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2016-01-17 20:53:51 -0700
committerTom Rini <trini@konsulko.com>2016-01-25 10:39:43 -0500
commit72a8cf8dccf6f8b86d1683205e032a94eaa86938 (patch)
treeb29378eb8af182f0faf2028cb52465a021de40cc /common/cmd_demo.c
parent25d5352c71dcc599030a4a764d8087185ed537d3 (diff)
downloadtalos-obmc-uboot-72a8cf8dccf6f8b86d1683205e032a94eaa86938.tar.gz
talos-obmc-uboot-72a8cf8dccf6f8b86d1683205e032a94eaa86938.zip
Move all command code into its own directory
There are a lot of unrelated files in common, including all of the commands. Moving them into their own directory makes them easier to find and is more logical. Some commands include non-command code, such as cmd_scsi.c. This should be sorted out at some point so that the function can be enabled with or without the associated command. Unfortunately, with m68k I get this error: m68k: + M5329AFEE +arch/m68k/cpu/mcf532x/start.o: In function `_start': +arch/m68k/cpu/mcf532x/start.S:159:(.text+0x452): relocation truncated to fit: R_68K_PC16 against symbol `board_init_f' defined in .text.board_init_f section in common/built-in.o I hope someone can shed some light on what this means. I hope it isn't depending on the position of code in the image. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Heiko Schocher <hs@denx.de> Acked-by: Stefan Roese <sr@denx.de> Acked-by: Przemyslaw Marczak <p.marczak@samsung.com>
Diffstat (limited to 'common/cmd_demo.c')
-rw-r--r--common/cmd_demo.c132
1 files changed, 0 insertions, 132 deletions
diff --git a/common/cmd_demo.c b/common/cmd_demo.c
deleted file mode 100644
index 209dc4a57c..0000000000
--- a/common/cmd_demo.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * Copyright (c) 2013 Google, Inc
- *
- * (C) Copyright 2012
- * Pavel Herrmann <morpheus.ibis@gmail.com>
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-
-#include <common.h>
-#include <dm-demo.h>
-#include <mapmem.h>
-#include <asm/io.h>
-
-struct udevice *demo_dev;
-
-static int do_demo_hello(cmd_tbl_t *cmdtp, int flag, int argc,
- char * const argv[])
-{
- int ch = 0;
-
- if (argc)
- ch = *argv[0];
-
- return demo_hello(demo_dev, ch);
-}
-
-static int do_demo_status(cmd_tbl_t *cmdtp, int flag, int argc,
- char * const argv[])
-{
- int status;
- int ret;
-
- ret = demo_status(demo_dev, &status);
- if (ret)
- return ret;
-
- printf("Status: %d\n", status);
-
- return 0;
-}
-
-static int do_demo_light(cmd_tbl_t *cmdtp, int flag, int argc,
- char * const argv[])
-{
- int light;
- int ret;
-
- if (argc) {
- light = simple_strtoul(argv[0], NULL, 16);
- ret = demo_set_light(demo_dev, light);
- } else {
- ret = demo_get_light(demo_dev);
- if (ret >= 0) {
- printf("Light: %x\n", ret);
- ret = 0;
- }
- }
-
- return ret;
-}
-
-int do_demo_list(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
-{
- struct udevice *dev;
- int i, ret;
-
- puts("Demo uclass entries:\n");
-
- for (i = 0, ret = uclass_first_device(UCLASS_DEMO, &dev);
- dev;
- ret = uclass_next_device(&dev)) {
- printf("entry %d - instance %08x, ops %08x, platdata %08x\n",
- i++, map_to_sysmem(dev),
- map_to_sysmem(dev->driver->ops),
- map_to_sysmem(dev_get_platdata(dev)));
- }
-
- return cmd_process_error(cmdtp, ret);
-}
-
-static cmd_tbl_t demo_commands[] = {
- U_BOOT_CMD_MKENT(list, 0, 1, do_demo_list, "", ""),
- U_BOOT_CMD_MKENT(hello, 2, 1, do_demo_hello, "", ""),
- U_BOOT_CMD_MKENT(light, 2, 1, do_demo_light, "", ""),
- U_BOOT_CMD_MKENT(status, 1, 1, do_demo_status, "", ""),
-};
-
-static int do_demo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
-{
- cmd_tbl_t *demo_cmd;
- int devnum = 0;
- int ret;
-
- if (argc < 2)
- return CMD_RET_USAGE;
- demo_cmd = find_cmd_tbl(argv[1], demo_commands,
- ARRAY_SIZE(demo_commands));
- argc -= 2;
- argv += 2;
-
- if ((!demo_cmd || argc > demo_cmd->maxargs) ||
- ((demo_cmd->name[0] != 'l') && (argc < 1)))
- return CMD_RET_USAGE;
-
- if (argc) {
- devnum = simple_strtoul(argv[0], NULL, 10);
- ret = uclass_get_device(UCLASS_DEMO, devnum, &demo_dev);
- if (ret)
- return cmd_process_error(cmdtp, ret);
- argc--;
- argv++;
- } else {
- demo_dev = NULL;
- if (demo_cmd->cmd != do_demo_list)
- return CMD_RET_USAGE;
- }
-
- ret = demo_cmd->cmd(demo_cmd, flag, argc, argv);
-
- return cmd_process_error(demo_cmd, ret);
-}
-
-U_BOOT_CMD(
- demo, 4, 1, do_demo,
- "Driver model (dm) demo operations",
- "list List available demo devices\n"
- "demo hello <num> [<char>] Say hello\n"
- "demo light [<num>] Set or get the lights\n"
- "demo status <num> Get demo device status\n"
- "demo list List available demo devices"
-);
OpenPOWER on IntegriCloud