Kconfig: Drop CONFIG_CMD_PORTIO and associated command

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@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>

Kconfig: Drop CONFIG_CMD_PORTIO and associated command
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@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Simon Glass · Tom Rini
1 parent 7f6665554a
Showing 6 changed files with 4 additions and 154 deletions Side-by-side Diff
README
cmd/Makefile
cmd/portio.c
include/command.h
include/config_cmd_all.h
scripts/config_whitelist.txt
@@ -814,7 +814,6 @@
 		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
@@ -97,7 +97,6 @@
 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
-/*
- * (C) Copyright 2003
- * Marc Singer, elf@buici.com
- *
- * SPDX-License-Identifier:	GPL-2.0+
- */
-
-/*
- * Port I/O Functions
- *
- * Copied from FADS ROM, Dan Malek (dmalek@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"
-);
@@ -80,11 +80,10 @@
  * 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
@@ -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	*/
@@ -293,7 +293,6 @@
 CONFIG_CMDLINE_EDITING
 CONFIG_CMDLINE_PS_SUPPORT
 CONFIG_CMDLINE_TAG
-CONFIG_CMD_PORTIO
 CONFIG_CMD_READ
 CONFIG_CMD_REGINFO
 CONFIG_CMD_REISER
...	...	@@ -814,7 +814,6 @@
814	814	CONFIG_CMD_NFS NFS support
815	815	CONFIG_CMD_PING * send ICMP ECHO_REQUEST to network
816	816	host
817		- CONFIG_CMD_PORTIO * Port I/O
818	817	CONFIG_CMD_READ * Read raw data from partition
819	818	CONFIG_CMD_REGINFO * Register dump
820	819	CONFIG_CMD_RUN run command in env variable
...	...	@@ -97,7 +97,6 @@
97	97	obj-$(CONFIG_CMD_PCI) += pci.o
98	98	endif
99	99	obj-y += pcmcia.o
100		-obj-$(CONFIG_CMD_PORTIO) += portio.o
101	100	obj-$(CONFIG_CMD_PXE) += pxe.o
102	101	obj-$(CONFIG_CMD_QFW) += qfw.o
103	102	obj-$(CONFIG_CMD_READ) += read.o
1		-/*
2		- * (C) Copyright 2003
3		- * Marc Singer, elf@buici.com
4		- *
5		- * SPDX-License-Identifier: GPL-2.0+
6		- */
7		-
8		-/*
9		- * Port I/O Functions
10		- *
11		- * Copied from FADS ROM, Dan Malek (dmalek@jlc.net)
12		- */
13		-
14		-#include <common.h>
15		-#include <command.h>
16		-
17		-/* Display values from last command.
18		- * Memory modify remembered values are different from display memory.
19		- */
20		-static uint in_last_addr, in_last_size;
21		-static uint out_last_addr, out_last_size, out_last_value;
22		-
23		-
24		-int do_portio_out (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
25		-{
26		- uint addr = out_last_addr;
27		- uint size = out_last_size;
28		- uint value = out_last_value;
29		-
30		- if (argc != 3)
31		- return CMD_RET_USAGE;
32		-
33		- if ((flag & CMD_FLAG_REPEAT) == 0) {
34		- /*
35		- * New command specified. Check for a size specification.
36		- * Defaults to long if no or incorrect specification.
37		- */
38		- size = cmd_get_data_size (argv[0], 1);
39		- addr = simple_strtoul (argv[1], NULL, 16);
40		- value = simple_strtoul (argv[2], NULL, 16);
41		- }
42		-#if defined (CONFIG_X86)
43		-
44		- {
45		- unsigned short port = addr;
46		-
47		- switch (size) {
48		- default:
49		- case 1:
50		- {
51		- unsigned char ch = value;
52		- __asm__ volatile ("out %0, %%dx"::"a" (ch), "d" (port));
53		- }
54		- break;
55		- case 2:
56		- {
57		- unsigned short w = value;
58		- __asm__ volatile ("out %0, %%dx"::"a" (w), "d" (port));
59		- }
60		- break;
61		- case 4:
62		- __asm__ volatile ("out %0, %%dx"::"a" (value), "d" (port));
63		-
64		- break;
65		- }
66		- }
67		-
68		-#endif /* CONFIG_X86 */
69		-
70		- out_last_addr = addr;
71		- out_last_size = size;
72		- out_last_value = value;
73		-
74		- return 0;
75		-}
76		-
77		-U_BOOT_CMD(
78		- out, 3, 1, do_portio_out,
79		- "write datum to IO port",
80		- "[.b, .w, .l] port value\n - output to IO port"
81		-);
82		-
83		-int do_portio_in (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[])
84		-{
85		- uint addr = in_last_addr;
86		- uint size = in_last_size;
87		-
88		- if (argc != 2)
89		- return CMD_RET_USAGE;
90		-
91		- if ((flag & CMD_FLAG_REPEAT) == 0) {
92		- /*
93		- * New command specified. Check for a size specification.
94		- * Defaults to long if no or incorrect specification.
95		- */
96		- size = cmd_get_data_size (argv[0], 1);
97		- addr = simple_strtoul (argv[1], NULL, 16);
98		- }
99		-#if defined (CONFIG_X86)
100		-
101		- {
102		- unsigned short port = addr;
103		-
104		- switch (size) {
105		- default:
106		- case 1:
107		- {
108		- unsigned char ch;
109		- __asm__ volatile ("in %%dx, %0":"=a" (ch):"d" (port));
110		-
111		- printf (" %02x\n", ch);
112		- }
113		- break;
114		- case 2:
115		- {
116		- unsigned short w;
117		- __asm__ volatile ("in %%dx, %0":"=a" (w):"d" (port));
118		-
119		- printf (" %04x\n", w);
120		- }
121		- break;
122		- case 4:
123		- {
124		- unsigned long l;
125		- __asm__ volatile ("in %%dx, %0":"=a" (l):"d" (port));
126		-
127		- printf (" %08lx\n", l);
128		- }
129		- break;
130		- }
131		- }
132		-#endif /* CONFIG_X86 */
133		-
134		- in_last_addr = addr;
135		- in_last_size = size;
136		-
137		- return 0;
138		-}
139		-
140		-U_BOOT_CMD(
141		- in, 2, 1, do_portio_in,
142		- "read data from an IO port",
143		- "[.b, .w, .l] port\n"
144		- " - read datum from IO port"
145		-);
...	...	@@ -80,11 +80,10 @@
80	80	* void function (cmd_tbl_t cmdtp, int flag, int argc, char const argv[]);
81	81	*/
82	82
83		-#if defined(CONFIG_CMD_MEMORY) \
84		- \|\| defined(CONFIG_CMD_I2C) \
85		- \|\| defined(CONFIG_CMD_ITEST) \
86		- \|\| defined(CONFIG_CMD_PCI) \
87		- \|\| defined(CONFIG_CMD_PORTIO)
	83	+#if defined(CONFIG_CMD_MEMORY) \|\| \
	84	+ defined(CONFIG_CMD_I2C) \|\| \
	85	+ defined(CONFIG_CMD_ITEST) \|\| \
	86	+ defined(CONFIG_CMD_PCI)
88	87	#define CMD_DATA_SIZE
89	88	extern int cmd_get_data_size(char* arg, int default_size);
90	89	#endif
...	...	@@ -13,7 +13,6 @@
13	13	* Alphabetical list of all possible commands.
14	14	*/
15	15
16		-#define CONFIG_CMD_PORTIO /* Port I/O */
17	16	#define CONFIG_CMD_REGINFO /* Register dump */
18	17	#define CONFIG_CMD_REISER /* Reiserfs support */
19	18	#define CONFIG_CMD_READ /* Read data from partition */
...	...	@@ -293,7 +293,6 @@
293	293	CONFIG_CMDLINE_EDITING
294	294	CONFIG_CMDLINE_PS_SUPPORT
295	295	CONFIG_CMDLINE_TAG
296		-CONFIG_CMD_PORTIO
297	296	CONFIG_CMD_READ
298	297	CONFIG_CMD_REGINFO
299	298	CONFIG_CMD_REISER