From 72a8cf8dccf6f8b86d1683205e032a94eaa86938 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Sun, 17 Jan 2016 20:53:51 -0700 Subject: 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 Reviewed-by: Bin Meng Reviewed-by: Heiko Schocher Acked-by: Stefan Roese Acked-by: Przemyslaw Marczak --- common/cmd_unzip.c | 88 ------------------------------------------------------ 1 file changed, 88 deletions(-) delete mode 100644 common/cmd_unzip.c (limited to 'common/cmd_unzip.c') diff --git a/common/cmd_unzip.c b/common/cmd_unzip.c deleted file mode 100644 index 0686be68ce0..00000000000 --- a/common/cmd_unzip.c +++ /dev/null @@ -1,88 +0,0 @@ -/* - * (C) Copyright 2000 - * Wolfgang Denk, DENX Software Engineering, wd@denx.de. - * - * SPDX-License-Identifier: GPL-2.0+ - */ - -#include -#include - -static int do_unzip(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) -{ - unsigned long src, dst; - unsigned long src_len = ~0UL, dst_len = ~0UL; - - switch (argc) { - case 4: - dst_len = simple_strtoul(argv[3], NULL, 16); - /* fall through */ - case 3: - src = simple_strtoul(argv[1], NULL, 16); - dst = simple_strtoul(argv[2], NULL, 16); - break; - default: - return CMD_RET_USAGE; - } - - if (gunzip((void *) dst, dst_len, (void *) src, &src_len) != 0) - return 1; - - printf("Uncompressed size: %ld = 0x%lX\n", src_len, src_len); - setenv_hex("filesize", src_len); - - return 0; -} - -U_BOOT_CMD( - unzip, 4, 1, do_unzip, - "unzip a memory region", - "srcaddr dstaddr [dstsize]" -); - -static int do_gzwrite(cmd_tbl_t *cmdtp, int flag, - int argc, char * const argv[]) -{ - block_dev_desc_t *bdev; - int ret; - unsigned char *addr; - unsigned long length; - unsigned long writebuf = 1<<20; - u64 startoffs = 0; - u64 szexpected = 0; - - if (argc < 5) - return CMD_RET_USAGE; - ret = get_device(argv[1], argv[2], &bdev); - if (ret < 0) - return CMD_RET_FAILURE; - - addr = (unsigned char *)simple_strtoul(argv[3], NULL, 16); - length = simple_strtoul(argv[4], NULL, 16); - - if (5 < argc) { - writebuf = simple_strtoul(argv[5], NULL, 16); - if (6 < argc) { - startoffs = simple_strtoull(argv[6], NULL, 16); - if (7 < argc) - szexpected = simple_strtoull(argv[7], - NULL, 16); - } - } - - ret = gzwrite(addr, length, bdev, writebuf, startoffs, szexpected); - - return ret ? CMD_RET_FAILURE : CMD_RET_SUCCESS; -} - -U_BOOT_CMD( - gzwrite, 8, 0, do_gzwrite, - "unzip and write memory to block device", - " length [wbuf=1M [offs=0 [outsize=0]]]\n" - "\twbuf is the size in bytes (hex) of write buffer\n" - "\t\tand should be padded to erase size for SSDs\n" - "\toffs is the output start offset in bytes (hex)\n" - "\toutsize is the size of the expected output (hex bytes)\n" - "\t\tand is required for files with uncompressed lengths\n" - "\t\t4 GiB or larger\n" -); -- cgit v1.2.3