summaryrefslogtreecommitdiffstats
path: root/common/cmd_disk.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_disk.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_disk.c')
-rw-r--r--common/cmd_disk.c132
1 files changed, 0 insertions, 132 deletions
diff --git a/common/cmd_disk.c b/common/cmd_disk.c
deleted file mode 100644
index 3025225c76..0000000000
--- a/common/cmd_disk.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
- * (C) Copyright 2000-2011
- * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-#include <common.h>
-#include <command.h>
-#include <part.h>
-
-#if defined(CONFIG_CMD_IDE) || defined(CONFIG_CMD_SCSI) || \
- defined(CONFIG_USB_STORAGE)
-int common_diskboot(cmd_tbl_t *cmdtp, const char *intf, int argc,
- char *const argv[])
-{
- int dev, part;
- ulong addr = CONFIG_SYS_LOAD_ADDR;
- ulong cnt;
- disk_partition_t info;
-#if defined(CONFIG_IMAGE_FORMAT_LEGACY)
- image_header_t *hdr;
-#endif
- block_dev_desc_t *dev_desc;
-
-#if defined(CONFIG_FIT)
- const void *fit_hdr = NULL;
-#endif
-
- bootstage_mark(BOOTSTAGE_ID_IDE_START);
- if (argc > 3) {
- bootstage_error(BOOTSTAGE_ID_IDE_ADDR);
- return CMD_RET_USAGE;
- }
- bootstage_mark(BOOTSTAGE_ID_IDE_ADDR);
-
- if (argc > 1)
- addr = simple_strtoul(argv[1], NULL, 16);
-
- bootstage_mark(BOOTSTAGE_ID_IDE_BOOT_DEVICE);
-
- part = get_device_and_partition(intf, (argc == 3) ? argv[2] : NULL,
- &dev_desc, &info, 1);
- if (part < 0) {
- bootstage_error(BOOTSTAGE_ID_IDE_TYPE);
- return 1;
- }
-
- dev = dev_desc->dev;
- bootstage_mark(BOOTSTAGE_ID_IDE_TYPE);
-
- printf("\nLoading from %s device %d, partition %d: "
- "Name: %.32s Type: %.32s\n", intf, dev, part, info.name,
- info.type);
-
- debug("First Block: " LBAFU ", # of blocks: " LBAFU
- ", Block Size: %ld\n",
- info.start, info.size, info.blksz);
-
- if (dev_desc->block_read(dev_desc, info.start, 1, (ulong *)addr) != 1) {
- printf("** Read error on %d:%d\n", dev, part);
- bootstage_error(BOOTSTAGE_ID_IDE_PART_READ);
- return 1;
- }
- bootstage_mark(BOOTSTAGE_ID_IDE_PART_READ);
-
- switch (genimg_get_format((void *) addr)) {
-#if defined(CONFIG_IMAGE_FORMAT_LEGACY)
- case IMAGE_FORMAT_LEGACY:
- hdr = (image_header_t *) addr;
-
- bootstage_mark(BOOTSTAGE_ID_IDE_FORMAT);
-
- if (!image_check_hcrc(hdr)) {
- puts("\n** Bad Header Checksum **\n");
- bootstage_error(BOOTSTAGE_ID_IDE_CHECKSUM);
- return 1;
- }
- bootstage_mark(BOOTSTAGE_ID_IDE_CHECKSUM);
-
- image_print_contents(hdr);
-
- cnt = image_get_image_size(hdr);
- break;
-#endif
-#if defined(CONFIG_FIT)
- case IMAGE_FORMAT_FIT:
- fit_hdr = (const void *) addr;
- puts("Fit image detected...\n");
-
- cnt = fit_get_size(fit_hdr);
- break;
-#endif
- default:
- bootstage_error(BOOTSTAGE_ID_IDE_FORMAT);
- puts("** Unknown image type\n");
- return 1;
- }
-
- cnt += info.blksz - 1;
- cnt /= info.blksz;
- cnt -= 1;
-
- if (dev_desc->block_read(dev_desc, info.start + 1, cnt,
- (ulong *)(addr + info.blksz)) != cnt) {
- printf("** Read error on %d:%d\n", dev, part);
- bootstage_error(BOOTSTAGE_ID_IDE_READ);
- return 1;
- }
- bootstage_mark(BOOTSTAGE_ID_IDE_READ);
-
-#if defined(CONFIG_FIT)
- /* This cannot be done earlier,
- * we need complete FIT image in RAM first */
- if (genimg_get_format((void *) addr) == IMAGE_FORMAT_FIT) {
- if (!fit_check_format(fit_hdr)) {
- bootstage_error(BOOTSTAGE_ID_IDE_FIT_READ);
- puts("** Bad FIT image format\n");
- return 1;
- }
- bootstage_mark(BOOTSTAGE_ID_IDE_FIT_READ_OK);
- fit_print_contents(fit_hdr);
- }
-#endif
-
- flush_cache(addr, (cnt+1)*info.blksz);
-
- /* Loading ok, update default load address */
- load_addr = addr;
-
- return bootm_maybe_autostart(cmdtp, argv[0]);
-}
-#endif
OpenPOWER on IntegriCloud