It does not seem worth having an option to enable another sub-command in this legacy driver. Drop this option so that the sub-command is always available.
Signed-off-by: Simon Glass sjg@chromium.org Reviewed-by: Bin Meng bmeng.cn@gmail.com ---
Changes in v2: None
README | 1 - drivers/gpio/pca953x.c | 8 -------- include/configs/cl-som-am57x.h | 1 - include/configs/cm_t335.h | 1 - include/configs/ot1200.h | 1 - include/configs/snapper9260.h | 3 --- include/configs/strider.h | 1 - include/configs/xilinx_zynqmp_zcu102.h | 1 - include/configs/xpedite517x.h | 1 - include/configs/xpedite520x.h | 1 - include/configs/xpedite537x.h | 1 - include/configs/xpedite550x.h | 1 - scripts/config_whitelist.txt | 1 - 13 files changed, 22 deletions(-)
diff --git a/README b/README index 5f916c8d8e..addbf306f1 100644 --- a/README +++ b/README @@ -812,7 +812,6 @@ The following options need to be configured: CONFIG_CMD_MII * MII utility commands CONFIG_CMD_NET bootp, tftpboot, rarpboot CONFIG_CMD_NFS NFS support - CONFIG_CMD_PCA953X_INFO * PCA953x I2C gpio info command CONFIG_CMD_PCI * pciinfo CONFIG_CMD_PCMCIA * PCMCIA support CONFIG_CMD_PING * send ICMP ECHO_REQUEST to network diff --git a/drivers/gpio/pca953x.c b/drivers/gpio/pca953x.c index 238e02805c..d1c1ae1411 100644 --- a/drivers/gpio/pca953x.c +++ b/drivers/gpio/pca953x.c @@ -143,7 +143,6 @@ int pca953x_get_val(uint8_t chip) }
#ifdef CONFIG_CMD_PCA953X -#ifdef CONFIG_CMD_PCA953X_INFO /* * Display pca953x information */ @@ -193,16 +192,13 @@ static int pca953x_info(uint8_t chip)
return 0; } -#endif /* CONFIG_CMD_PCA953X_INFO */
cmd_tbl_t cmd_pca953x[] = { U_BOOT_CMD_MKENT(device, 3, 0, (void *)PCA953X_CMD_DEVICE, "", ""), U_BOOT_CMD_MKENT(output, 4, 0, (void *)PCA953X_CMD_OUTPUT, "", ""), U_BOOT_CMD_MKENT(input, 3, 0, (void *)PCA953X_CMD_INPUT, "", ""), U_BOOT_CMD_MKENT(invert, 4, 0, (void *)PCA953X_CMD_INVERT, "", ""), -#ifdef CONFIG_CMD_PCA953X_INFO U_BOOT_CMD_MKENT(info, 2, 0, (void *)PCA953X_CMD_INFO, "", ""), -#endif };
int do_pca953x(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) @@ -231,13 +227,11 @@ int do_pca953x(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) ul_arg3 = simple_strtoul(argv[3], NULL, 16) & 0x1;
switch ((long)c->cmd) { -#ifdef CONFIG_CMD_PCA953X_INFO case PCA953X_CMD_INFO: ret = pca953x_info(chip); if (ret) ret = CMD_RET_FAILURE; break; -#endif
case PCA953X_CMD_DEVICE: if (argc == 3) @@ -287,10 +281,8 @@ U_BOOT_CMD( "pca953x gpio access", "device [dev]\n" " - show or set current device address\n" -#ifdef CONFIG_CMD_PCA953X_INFO "pca953x info\n" " - display info for current chip\n" -#endif "pca953x output pin 0|1\n" " - set pin as output and drive low or high\n" "pca953x invert pin 0|1\n" diff --git a/include/configs/cl-som-am57x.h b/include/configs/cl-som-am57x.h index 8f3721cbfc..b9d6454887 100644 --- a/include/configs/cl-som-am57x.h +++ b/include/configs/cl-som-am57x.h @@ -74,7 +74,6 @@ CONFIG_SYS_SCSI_MAX_LUN) /* PCA9555 GPIO expander support */ #define CONFIG_PCA953X -#define CONFIG_CMD_PCA953X_INFO #define CONFIG_SYS_I2C_PCA953X_ADDR 0x20 #define CONFIG_SYS_I2C_PCA953X_WIDTH { {0x20, 16} }
diff --git a/include/configs/cm_t335.h b/include/configs/cm_t335.h index 7331d4fe1f..bc52aae251 100644 --- a/include/configs/cm_t335.h +++ b/include/configs/cm_t335.h @@ -163,7 +163,6 @@ * First select the I2C0 bus with "i2c dev 0", then use "pca953x" command. */ #define CONFIG_PCA953X -#define CONFIG_CMD_PCA953X_INFO #define CONFIG_SYS_I2C_PCA953X_ADDR 0x26 #define CONFIG_SYS_I2C_PCA953X_WIDTH { {0x26, 16} } #endif /* CONFIG_SPL_BUILD */ diff --git a/include/configs/ot1200.h b/include/configs/ot1200.h index 1287282270..8a1a49653c 100644 --- a/include/configs/ot1200.h +++ b/include/configs/ot1200.h @@ -31,7 +31,6 @@ #define CONFIG_PCA953X #define CONFIG_SYS_I2C_PCA953X_ADDR 0x20 #define CONFIG_SYS_I2C_PCA953X_WIDTH { {0x20, 16} } -#define CONFIG_CMD_PCA953X_INFO
/* I2C Configs */ #define CONFIG_SYS_I2C diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h index 8ff0fa3412..e7828a5036 100644 --- a/include/configs/snapper9260.h +++ b/include/configs/snapper9260.h @@ -136,7 +136,4 @@ /* U-Boot memory settings */ #define CONFIG_SYS_MALLOC_LEN (1 << 20)
-/* Command line configuration */ -#define CONFIG_CMD_PCA953X_INFO - #endif /* __CONFIG_H */ diff --git a/include/configs/strider.h b/include/configs/strider.h index 507a41462b..aa7f15389c 100644 --- a/include/configs/strider.h +++ b/include/configs/strider.h @@ -301,7 +301,6 @@ #define CONFIG_SYS_FSL_I2C_OFFSET 0x3000
#define CONFIG_PCA953X /* NXP PCA9554 */ -#define CONFIG_CMD_PCA953X_INFO #define CONFIG_SYS_I2C_PCA953X_WIDTH { {0x24, 16}, {0x25, 16}, {0x26, 16}, \ {0x3c, 8}, {0x3d, 8}, {0x3e, 8} }
diff --git a/include/configs/xilinx_zynqmp_zcu102.h b/include/configs/xilinx_zynqmp_zcu102.h index 52278f1885..85f78ba43b 100644 --- a/include/configs/xilinx_zynqmp_zcu102.h +++ b/include/configs/xilinx_zynqmp_zcu102.h @@ -38,7 +38,6 @@
#define CONFIG_SYS_I2C_ZYNQ #define CONFIG_PCA953X -#define CONFIG_CMD_PCA953X_INFO
#define CONFIG_ZYNQMP_XHCI_LIST {ZYNQMP_USB0_XHCI_BASEADDR}
diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h index c27433787f..fe1c14b7ee 100644 --- a/include/configs/xpedite517x.h +++ b/include/configs/xpedite517x.h @@ -484,7 +484,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); /* * Command configuration. */ -#define CONFIG_CMD_PCA953X_INFO #define CONFIG_CMD_PCI #define CONFIG_CMD_PCI_ENUM #define CONFIG_CMD_REGINFO diff --git a/include/configs/xpedite520x.h b/include/configs/xpedite520x.h index fa8f1d89f5..8a7cf7f711 100644 --- a/include/configs/xpedite520x.h +++ b/include/configs/xpedite520x.h @@ -287,7 +287,6 @@ /* * Command configuration. */ -#define CONFIG_CMD_PCA953X_INFO #define CONFIG_CMD_PCI #define CONFIG_CMD_PCI_ENUM #define CONFIG_CMD_REGINFO diff --git a/include/configs/xpedite537x.h b/include/configs/xpedite537x.h index 2a35bf0972..5d59bfe28b 100644 --- a/include/configs/xpedite537x.h +++ b/include/configs/xpedite537x.h @@ -337,7 +337,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); /* * Command configuration. */ -#define CONFIG_CMD_PCA953X_INFO #define CONFIG_CMD_PCI #define CONFIG_CMD_PCI_ENUM #define CONFIG_CMD_REGINFO diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h index c31f83d2e1..6bf7dc3e67 100644 --- a/include/configs/xpedite550x.h +++ b/include/configs/xpedite550x.h @@ -336,7 +336,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); /* * Command configuration. */ -#define CONFIG_CMD_PCA953X_INFO #define CONFIG_CMD_PCI #define CONFIG_CMD_PCI_ENUM #define CONFIG_CMD_REGINFO diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 8993ee89fb..2f1d669114 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_PCA953X_INFO CONFIG_CMD_PCI CONFIG_CMD_PCI_ENUM CONFIG_CMD_PCMCIA