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>

diff --git a/README b/README
index 17c055a1ec47cadeb00b429fb8b6cc4552be0519..98fc95a9155064cb37581e94d476ddf5895fe623 100644 (file)
--- 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 bd231f24d8ab69cb07b2e00c383c14730b04244c..eff6bd678ffc6c158fa2f1355e267f2628b4deb1 100644 (file)
--- 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 (file)
index bf3a997..0000000
--- a/cmd/portio.c
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * (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"
-);

diff --git a/include/command.h b/include/command.h
index 08f04867ddf6846fe3354b6cbb2503c41b076fa3..767cabb3df09752e36d46987b32b774a716061e1 100644 (file)
--- 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 a008bacdd9f62fb2fb6f7bff8b6c584a05d443c7..35a6a529eb636256cc67a250f516e78aed26d475 100644 (file)
--- 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 358b17c31defd9b2a77e07ec17aa128d3d165f05..fdfca1a370abf39d209d3e56b6cfb7dc5097db20 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -293,7 +293,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