aboutsummaryrefslogtreecommitdiff
path: root/common/cmd_spi.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_spi.c
parent25d5352c71dcc599030a4a764d8087185ed537d3 (diff)
downloadu-boot-72a8cf8dccf6f8b86d1683205e032a94eaa86938.zip
u-boot-72a8cf8dccf6f8b86d1683205e032a94eaa86938.tar.gz
u-boot-72a8cf8dccf6f8b86d1683205e032a94eaa86938.tar.bz2
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_spi.c')
-rw-r--r--common/cmd_spi.c174
1 files changed, 0 insertions, 174 deletions
diff --git a/common/cmd_spi.c b/common/cmd_spi.c
deleted file mode 100644
index 64c3ffc..0000000
--- a/common/cmd_spi.c
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
- * (C) Copyright 2002
- * Gerald Van Baren, Custom IDEAS, vanbaren@cideas.com
- *
- * SPDX-License-Identifier: GPL-2.0+
- */
-
-/*
- * SPI Read/Write Utilities
- */
-
-#include <common.h>
-#include <command.h>
-#include <dm.h>
-#include <errno.h>
-#include <spi.h>
-
-/*-----------------------------------------------------------------------
- * Definitions
- */
-
-#ifndef MAX_SPI_BYTES
-# define MAX_SPI_BYTES 32 /* Maximum number of bytes we can handle */
-#endif
-
-#ifndef CONFIG_DEFAULT_SPI_BUS
-# define CONFIG_DEFAULT_SPI_BUS 0
-#endif
-#ifndef CONFIG_DEFAULT_SPI_MODE
-# define CONFIG_DEFAULT_SPI_MODE SPI_MODE_0
-#endif
-
-/*
- * Values from last command.
- */
-static unsigned int bus;
-static unsigned int cs;
-static unsigned int mode;
-static int bitlen;
-static uchar dout[MAX_SPI_BYTES];
-static uchar din[MAX_SPI_BYTES];
-
-static int do_spi_xfer(int bus, int cs)
-{
- struct spi_slave *slave;
- int ret = 0;
-
-#ifdef CONFIG_DM_SPI
- char name[30], *str;
- struct udevice *dev;
-
- snprintf(name, sizeof(name), "generic_%d:%d", bus, cs);
- str = strdup(name);
- ret = spi_get_bus_and_cs(bus, cs, 1000000, mode, "spi_generic_drv",
- str, &dev, &slave);
- if (ret)
- return ret;
-#else
- slave = spi_setup_slave(bus, cs, 1000000, mode);
- if (!slave) {
- printf("Invalid device %d:%d\n", bus, cs);
- return -EINVAL;
- }
-#endif
-
- ret = spi_claim_bus(slave);
- if (ret)
- goto done;
- ret = spi_xfer(slave, bitlen, dout, din,
- SPI_XFER_BEGIN | SPI_XFER_END);
-#ifndef CONFIG_DM_SPI
- /* We don't get an error code in this case */
- if (ret)
- ret = -EIO;
-#endif
- if (ret) {
- printf("Error %d during SPI transaction\n", ret);
- } else {
- int j;
-
- for (j = 0; j < ((bitlen + 7) / 8); j++)
- printf("%02X", din[j]);
- printf("\n");
- }
-done:
- spi_release_bus(slave);
-#ifndef CONFIG_DM_SPI
- spi_free_slave(slave);
-#endif
-
- return ret;
-}
-
-/*
- * SPI read/write
- *
- * Syntax:
- * spi {dev} {num_bits} {dout}
- * {dev} is the device number for controlling chip select (see TBD)
- * {num_bits} is the number of bits to send & receive (base 10)
- * {dout} is a hexadecimal string of data to send
- * The command prints out the hexadecimal string received via SPI.
- */
-
-int do_spi (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
-{
- char *cp = 0;
- uchar tmp;
- int j;
-
- /*
- * We use the last specified parameters, unless new ones are
- * entered.
- */
-
- if ((flag & CMD_FLAG_REPEAT) == 0)
- {
- if (argc >= 2) {
- mode = CONFIG_DEFAULT_SPI_MODE;
- bus = simple_strtoul(argv[1], &cp, 10);
- if (*cp == ':') {
- cs = simple_strtoul(cp+1, &cp, 10);
- } else {
- cs = bus;
- bus = CONFIG_DEFAULT_SPI_BUS;
- }
- if (*cp == '.')
- mode = simple_strtoul(cp+1, NULL, 10);
- }
- if (argc >= 3)
- bitlen = simple_strtoul(argv[2], NULL, 10);
- if (argc >= 4) {
- cp = argv[3];
- for(j = 0; *cp; j++, cp++) {
- tmp = *cp - '0';
- if(tmp > 9)
- tmp -= ('A' - '0') - 10;
- if(tmp > 15)
- tmp -= ('a' - 'A');
- if(tmp > 15) {
- printf("Hex conversion error on %c\n", *cp);
- return 1;
- }
- if((j % 2) == 0)
- dout[j / 2] = (tmp << 4);
- else
- dout[j / 2] |= tmp;
- }
- }
- }
-
- if ((bitlen < 0) || (bitlen > (MAX_SPI_BYTES * 8))) {
- printf("Invalid bitlen %d\n", bitlen);
- return 1;
- }
-
- if (do_spi_xfer(bus, cs))
- return 1;
-
- return 0;
-}
-
-/***************************************************/
-
-U_BOOT_CMD(
- sspi, 5, 1, do_spi,
- "SPI utility command",
- "[<bus>:]<cs>[.<mode>] <bit_len> <dout> - Send and receive bits\n"
- "<bus> - Identifies the SPI bus\n"
- "<cs> - Identifies the chip select\n"
- "<mode> - Identifies the SPI mode to use\n"
- "<bit_len> - Number of bits to send (base 10)\n"
- "<dout> - Hexadecimal string that gets sent"
-);