summaryrefslogtreecommitdiff
path: root/common/cmd_ubifs.c
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2016-01-18 03:53:51 (GMT)
committerTom Rini <trini@konsulko.com>2016-01-25 15:39:43 (GMT)
commit72a8cf8dccf6f8b86d1683205e032a94eaa86938 (patch)
treeb29378eb8af182f0faf2028cb52465a021de40cc /common/cmd_ubifs.c
parent25d5352c71dcc599030a4a764d8087185ed537d3 (diff)
downloadu-boot-fsl-qoriq-72a8cf8dccf6f8b86d1683205e032a94eaa86938.tar.xz
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_ubifs.c')
-rw-r--r--common/cmd_ubifs.c165
1 files changed, 0 insertions, 165 deletions
diff --git a/common/cmd_ubifs.c b/common/cmd_ubifs.c
deleted file mode 100644
index 5e9d357..0000000
--- a/common/cmd_ubifs.c
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
- * (C) Copyright 2008
- * Stefan Roese, DENX Software Engineering, sr@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-
-
-/*
- * UBIFS command support
- */
-
-#undef DEBUG
-
-#include <common.h>
-#include <config.h>
-#include <command.h>
-#include <ubifs_uboot.h>
-
-static int ubifs_initialized;
-static int ubifs_mounted;
-
-static int do_ubifs_mount(cmd_tbl_t *cmdtp, int flag, int argc,
- char * const argv[])
-{
- char *vol_name;
- int ret;
-
- if (argc != 2)
- return CMD_RET_USAGE;
-
- vol_name = argv[1];
- debug("Using volume %s\n", vol_name);
-
- if (ubifs_initialized == 0) {
- ubifs_init();
- ubifs_initialized = 1;
- }
-
- ret = uboot_ubifs_mount(vol_name);
- if (ret)
- return -1;
-
- ubifs_mounted = 1;
-
- return 0;
-}
-
-int ubifs_is_mounted(void)
-{
- return ubifs_mounted;
-}
-
-void cmd_ubifs_umount(void)
-{
- uboot_ubifs_umount();
- ubifs_mounted = 0;
- ubifs_initialized = 0;
-}
-
-static int do_ubifs_umount(cmd_tbl_t *cmdtp, int flag, int argc,
- char * const argv[])
-{
- if (argc != 1)
- return CMD_RET_USAGE;
-
- if (ubifs_initialized == 0) {
- printf("No UBIFS volume mounted!\n");
- return -1;
- }
-
- cmd_ubifs_umount();
-
- return 0;
-}
-
-static int do_ubifs_ls(cmd_tbl_t *cmdtp, int flag, int argc,
- char * const argv[])
-{
- char *filename = "/";
- int ret;
-
- if (!ubifs_mounted) {
- printf("UBIFS not mounted, use ubifsmount to mount volume first!\n");
- return -1;
- }
-
- if (argc == 2)
- filename = argv[1];
- debug("Using filename %s\n", filename);
-
- ret = ubifs_ls(filename);
- if (ret) {
- printf("** File not found %s **\n", filename);
- ret = CMD_RET_FAILURE;
- }
-
- return ret;
-}
-
-static int do_ubifs_load(cmd_tbl_t *cmdtp, int flag, int argc,
- char * const argv[])
-{
- char *filename;
- char *endp;
- int ret;
- u32 addr;
- u32 size = 0;
-
- if (!ubifs_mounted) {
- printf("UBIFS not mounted, use ubifs mount to mount volume first!\n");
- return -1;
- }
-
- if (argc < 3)
- return CMD_RET_USAGE;
-
- addr = simple_strtoul(argv[1], &endp, 16);
- if (endp == argv[1])
- return CMD_RET_USAGE;
-
- filename = argv[2];
-
- if (argc == 4) {
- size = simple_strtoul(argv[3], &endp, 16);
- if (endp == argv[3])
- return CMD_RET_USAGE;
- }
- debug("Loading file '%s' to address 0x%08x (size %d)\n", filename, addr, size);
-
- ret = ubifs_load(filename, addr, size);
- if (ret) {
- printf("** File not found %s **\n", filename);
- ret = CMD_RET_FAILURE;
- }
-
- return ret;
-}
-
-U_BOOT_CMD(
- ubifsmount, 2, 0, do_ubifs_mount,
- "mount UBIFS volume",
- "<volume-name>\n"
- " - mount 'volume-name' volume"
-);
-
-U_BOOT_CMD(
- ubifsumount, 1, 0, do_ubifs_umount,
- "unmount UBIFS volume",
- " - unmount current volume"
-);
-
-U_BOOT_CMD(
- ubifsls, 2, 0, do_ubifs_ls,
- "list files in a directory",
- "[directory]\n"
- " - list files in a 'directory' (default '/')"
-);
-
-U_BOOT_CMD(
- ubifsload, 4, 0, do_ubifs_load,
- "load file from an UBIFS filesystem",
- "<addr> <filename> [bytes]\n"
- " - load file 'filename' to address 'addr'"
-);