[U-Boot] [PATCH v2 14/42] Kconfig: Drop CONFIG_CMD_PORTIO and associated command

Simon Glass sjg at chromium.org
Fri Aug 4 22:34:38 UTC 2017


This command is not used by any board. It also looks quite similar to the
'iod' and 'iow' commands which use the correct I/O macros.

Drop it.

Signed-off-by: Simon Glass <sjg at chromium.org>
---

Changes in v2:
- Drop mention of this from several other places
- Move CMD_PORTIO changes in from the CMD_READ patch

 README                       |   1 -
 cmd/Makefile                 |   1 -
 cmd/portio.c                 | 145 -------------------------------------------
 include/command.h            |   9 ++-
 include/config_cmd_all.h     |   1 -
 scripts/config_whitelist.txt |   1 -
 6 files changed, 4 insertions(+), 154 deletions(-)
 delete mode 100644 cmd/portio.c

diff --git a/README b/README
index 186311bd88..06a9b2eca9 100644
--- a/README
+++ b/README
@@ -814,7 +814,6 @@ The following options need to be configured:
 		CONFIG_CMD_NFS		  NFS support
 		CONFIG_CMD_PING		* send ICMP ECHO_REQUEST to network
 					  host
-		CONFIG_CMD_PORTIO	* Port I/O
 		CONFIG_CMD_READ		* Read raw data from partition
 		CONFIG_CMD_REGINFO	* Register dump
 		CONFIG_CMD_RUN		  run command in env variable
diff --git a/cmd/Makefile b/cmd/Makefile
index bd231f24d8..eff6bd678f 100644
--- a/cmd/Makefile
+++ b/cmd/Makefile
@@ -97,7 +97,6 @@ ifdef CONFIG_PCI
 obj-$(CONFIG_CMD_PCI) += pci.o
 endif
 obj-y += pcmcia.o
-obj-$(CONFIG_CMD_PORTIO) += portio.o
 obj-$(CONFIG_CMD_PXE) += pxe.o
 obj-$(CONFIG_CMD_QFW) += qfw.o
 obj-$(CONFIG_CMD_READ) += read.o
diff --git a/cmd/portio.c b/cmd/portio.c
deleted file mode 100644
index bf3a99791c..0000000000
--- a/cmd/portio.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * (C) Copyright 2003
- * Marc Singer, elf at buici.com
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-/*
- * Port I/O Functions
- *
- * Copied from FADS ROM, Dan Malek (dmalek at jlc.net)
- */
-
-#include <common.h>
-#include <command.h>
-
-/* Display values from last command.
- * Memory modify remembered values are different from display memory.
- */
-static uint in_last_addr, in_last_size;
-static uint out_last_addr, out_last_size, out_last_value;
-
-
-int do_portio_out (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
-{
-	uint addr = out_last_addr;
-	uint size = out_last_size;
-	uint value = out_last_value;
-
-	if (argc != 3)
-		return CMD_RET_USAGE;
-
-	if ((flag & CMD_FLAG_REPEAT) == 0) {
-		/*
-		 * New command specified.  Check for a size specification.
-		 * Defaults to long if no or incorrect specification.
-		 */
-		size = cmd_get_data_size (argv[0], 1);
-		addr = simple_strtoul (argv[1], NULL, 16);
-		value = simple_strtoul (argv[2], NULL, 16);
-	}
-#if defined (CONFIG_X86)
-
-	{
-		unsigned short port = addr;
-
-		switch (size) {
-		default:
-		case 1:
-		    {
-			unsigned char ch = value;
-			__asm__ volatile ("out %0, %%dx"::"a" (ch), "d" (port));
-		    }
-			break;
-		case 2:
-		    {
-			unsigned short w = value;
-			__asm__ volatile ("out %0, %%dx"::"a" (w), "d" (port));
-		    }
-			break;
-		case 4:
-			__asm__ volatile ("out %0, %%dx"::"a" (value), "d" (port));
-
-			break;
-		}
-	}
-
-#endif							/* CONFIG_X86 */
-
-	out_last_addr = addr;
-	out_last_size = size;
-	out_last_value = value;
-
-	return 0;
-}
-
-U_BOOT_CMD(
-	out,	3,	1,	do_portio_out,
-	"write datum to IO port",
-	"[.b, .w, .l] port value\n    - output to IO port"
-);
-
-int do_portio_in (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
-{
-	uint addr = in_last_addr;
-	uint size = in_last_size;
-
-	if (argc != 2)
-		return CMD_RET_USAGE;
-
-	if ((flag & CMD_FLAG_REPEAT) == 0) {
-		/*
-		 * New command specified.  Check for a size specification.
-		 * Defaults to long if no or incorrect specification.
-		 */
-		size = cmd_get_data_size (argv[0], 1);
-		addr = simple_strtoul (argv[1], NULL, 16);
-	}
-#if defined (CONFIG_X86)
-
-	{
-		unsigned short port = addr;
-
-		switch (size) {
-		default:
-		case 1:
-		    {
-			unsigned char ch;
-			__asm__ volatile ("in %%dx, %0":"=a" (ch):"d" (port));
-
-			printf (" %02x\n", ch);
-		    }
-			break;
-		case 2:
-		    {
-			unsigned short w;
-			__asm__ volatile ("in %%dx, %0":"=a" (w):"d" (port));
-
-			printf (" %04x\n", w);
-		    }
-			break;
-		case 4:
-		    {
-			unsigned long l;
-			__asm__ volatile ("in %%dx, %0":"=a" (l):"d" (port));
-
-			printf (" %08lx\n", l);
-		    }
-			break;
-		}
-	}
-#endif	/* CONFIG_X86 */
-
-	in_last_addr = addr;
-	in_last_size = size;
-
-	return 0;
-}
-
-U_BOOT_CMD(
-	in,	2,	1,	do_portio_in,
-	"read data from an IO port",
-	"[.b, .w, .l] port\n"
-	"    - read datum from IO port"
-);
diff --git a/include/command.h b/include/command.h
index 08f04867dd..767cabb3df 100644
--- a/include/command.h
+++ b/include/command.h
@@ -80,11 +80,10 @@ int cmd_process_error(cmd_tbl_t *cmdtp, int err);
  * void function (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]);
  */
 
-#if defined(CONFIG_CMD_MEMORY)		\
-	|| defined(CONFIG_CMD_I2C)	\
-	|| defined(CONFIG_CMD_ITEST)	\
-	|| defined(CONFIG_CMD_PCI)	\
-	|| defined(CONFIG_CMD_PORTIO)
+#if defined(CONFIG_CMD_MEMORY) || \
+	defined(CONFIG_CMD_I2C) || \
+	defined(CONFIG_CMD_ITEST) || \
+	defined(CONFIG_CMD_PCI)
 #define CMD_DATA_SIZE
 extern int cmd_get_data_size(char* arg, int default_size);
 #endif
diff --git a/include/config_cmd_all.h b/include/config_cmd_all.h
index a008bacdd9..35a6a529eb 100644
--- a/include/config_cmd_all.h
+++ b/include/config_cmd_all.h
@@ -13,7 +13,6 @@
  * Alphabetical list of all possible commands.
  */
 
-#define CONFIG_CMD_PORTIO	/* Port I/O			*/
 #define CONFIG_CMD_REGINFO	/* Register dump		*/
 #define CONFIG_CMD_REISER	/* Reiserfs support		*/
 #define CONFIG_CMD_READ		/* Read data from partition	*/
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 6b7056d6ea..899fd501ad 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -296,7 +296,6 @@ CONFIG_CM922T_XA10
 CONFIG_CMDLINE_EDITING
 CONFIG_CMDLINE_PS_SUPPORT
 CONFIG_CMDLINE_TAG
-CONFIG_CMD_PORTIO
 CONFIG_CMD_READ
 CONFIG_CMD_REGINFO
 CONFIG_CMD_REISER
-- 
2.14.0.rc1.383.gd1ce394fe2-goog



More information about the U-Boot mailing list