X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=common%2Fcmd_spi.c;h=82cb673f5f97002826f16ad53c14d51c0ae63fda;hb=8bde7f776c77b343aca29b8c7b58464d915ac245;hp=ccf9cc2879deeb46d912ade20bd79b91b390bb07;hpb=e3093091a9d0e7a0709ee79390414b5a5ca69f88;p=u-boot

diff --git a/common/cmd_spi.c b/common/cmd_spi.c
index ccf9cc2879..82cb673f5f 100644
--- a/common/cmd_spi.c
+++ b/common/cmd_spi.c
@@ -28,18 +28,23 @@
 #include <common.h>
 #include <command.h>
 #include <spi.h>
-#include <cmd_spi.h>
 
 #if (CONFIG_COMMANDS & CFG_CMD_SPI)
 
-#define MAX_SPI_BYTES	32	/* max number of bytes we can handle */
+/*-----------------------------------------------------------------------
+ * Definitions
+ */
+
+#ifndef MAX_SPI_BYTES
+#   define MAX_SPI_BYTES 32	/* Maximum number of bytes we can handle */
+#endif
 
 /*
  * External table of chip select functions (see the appropriate board
  * support for the actual definition of the table).
  */
 extern spi_chipsel_type spi_chipsel[];
-
+extern int spi_chipsel_cnt;
 
 /*
  * Values from last command.
@@ -60,7 +65,7 @@ static uchar din[MAX_SPI_BYTES];
  * The command prints out the hexadecimal string received via SPI.
  */
 
-int do_spi (cmd_tbl_t *cmdtp, bd_t *bd, int flag, int argc, char *argv[])
+int do_spi (cmd_tbl_t *cmdtp, int flag, int argc, char *argv[])
 {
 	char  *cp = 0;
 	uchar tmp;
@@ -78,26 +83,38 @@ int do_spi (cmd_tbl_t *cmdtp, bd_t *bd, int flag, int argc, char *argv[])
 			device = simple_strtoul(argv[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("Conversion error on %c, bailing out.\n", *cp);
-				break;
+		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, giving up.\n", *cp);
+					return 1;
+				}
+				if((j % 2) == 0)
+					dout[j / 2] = (tmp << 4);
+				else
+					dout[j / 2] |= tmp;
 			}
-			if((j % 2) == 0)
-				dout[j / 2] = (tmp << 4);
-			else
-				dout[j / 2] |= tmp;
 		}
 	}
 
-printf("spi_chipsel[%d] = %08X\n", device, (uint)spi_chipsel[device]);
+	if ((device < 0) || (device >=  spi_chipsel_cnt)) {
+		printf("Invalid device %d, giving up.\n", device);
+		return 1;
+	}
+	if ((bitlen < 0) || (bitlen >  (MAX_SPI_BYTES * 8))) {
+		printf("Invalid bitlen %d, giving up.\n", bitlen);
+		return 1;
+	}
+
+	debug ("spi_chipsel[%d] = %08X\n",
+		device, (uint)spi_chipsel[device]);
+
 	if(spi_xfer(spi_chipsel[device], bitlen, dout, din) != 0) {
 		printf("Error with the SPI transaction.\n");
 		rcode = 1;
@@ -112,5 +129,15 @@ printf("spi_chipsel[%d] = %08X\n", device, (uint)spi_chipsel[device]);
 	return rcode;
 }
 
-#endif	/* CFG_CMD_SPI */
+/***************************************************/
 
+cmd_tbl_t U_BOOT_CMD(SPI) = MK_CMD_ENTRY(
+	"sspi",	5,	1,	do_spi,
+	"sspi     - SPI utility commands\n",
+	"<device> <bit_len> <dout> - Send <bit_len> bits from <dout> out the SPI\n"
+	"<device>  - Identifies the chip select of the device\n"
+	"<bit_len> - Number of bits to send (base 10)\n"
+	"<dout>    - Hexadecimal string that gets sent\n"
+);
+
+#endif	/* CFG_CMD_SPI */