[U-Boot] [PATCH 03/47] Kconfig: Drop CONFIG_CMD_DS4510_MEM

Simon Glass
2017-05-15T10:57:18Z

This option is only used in one driver and is not enabled by any board. It
does not seem worth having the ability to remove this part of the support.

Drop the option.

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

README | 1 -
drivers/misc/ds4510.c | 10 ----------
scripts/config_whitelist.txt | 1 -
3 files changed, 12 deletions(-)

diff --git a/README b/README
index 3c4f0165b1..965fc9c7eb 100644
--- a/README
+++ b/README
@@ -831,7 +831,6 @@ The following options need to be configured:
CONFIG_CMD_DHCP * DHCP support
CONFIG_CMD_DIAG * Diagnostics
CONFIG_CMD_DS4510 * ds4510 I2C gpio commands
- CONFIG_CMD_DS4510_MEM * ds4510 I2C eeprom/sram commansd
CONFIG_CMD_DS4510_RST * ds4510 I2C rst command
CONFIG_CMD_DTT * Digital Therm and Thermostat
CONFIG_CMD_ECHO echo arguments
diff --git a/drivers/misc/ds4510.c b/drivers/misc/ds4510.c
index 940e2ce6a0..936fb3ead4 100644
--- a/drivers/misc/ds4510.c
+++ b/drivers/misc/ds4510.c
@@ -250,11 +250,9 @@ cmd_tbl_t cmd_ds4510[] = {
#ifdef CONFIG_CMD_DS4510_RST
U_BOOT_CMD_MKENT(rstdelay, 3, 0, (void *)DS4510_CMD_RSTDELAY, "", ""),
#endif
-#ifdef CONFIG_CMD_DS4510_MEM
U_BOOT_CMD_MKENT(eeprom, 6, 0, (void *)DS4510_CMD_EEPROM, "", ""),
U_BOOT_CMD_MKENT(seeprom, 6, 0, (void *)DS4510_CMD_SEEPROM, "", ""),
U_BOOT_CMD_MKENT(sram, 6, 0, (void *)DS4510_CMD_SRAM, "", ""),
-#endif
};

int do_ds4510(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
@@ -264,13 +262,11 @@ int do_ds4510(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
ulong ul_arg2 = 0;
ulong ul_arg3 = 0;
int tmp;
-#ifdef CONFIG_CMD_DS4510_MEM
ulong addr;
ulong off;
ulong cnt;
int end;
int (*rw_func)(uint8_t, int, uint8_t *, int);
-#endif

c = find_cmd_tbl(argv[1], cmd_ds4510, ARRAY_SIZE(cmd_ds4510));

@@ -326,7 +322,6 @@ int do_ds4510(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
case DS4510_CMD_RSTDELAY:
return ds4510_rstdelay_write(chip, ul_arg2);
#endif
-#ifdef CONFIG_CMD_DS4510_MEM
case DS4510_CMD_EEPROM:
end = DS4510_EEPROM + DS4510_EEPROM_SIZE;
off = DS4510_EEPROM;
@@ -339,13 +334,11 @@ int do_ds4510(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
end = DS4510_SRAM + DS4510_SRAM_SIZE;
off = DS4510_SRAM;
break;
-#endif
default:
/* We should never get here... */
return 1;
}

-#ifdef CONFIG_CMD_DS4510_MEM
/* Only eeprom, seeprom, and sram commands should make it here */
if (strcmp(argv[2], "read") == 0)
rw_func = ds4510_mem_read;
@@ -364,7 +357,6 @@ int do_ds4510(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
}

return rw_func(chip, off, (uint8_t *)addr, cnt);
-#endif
}

U_BOOT_CMD(
@@ -387,7 +379,6 @@ U_BOOT_CMD(
"ds4510 rstdelay 0-3\n"
" - set reset output delay"
#endif
-#ifdef CONFIG_CMD_DS4510_MEM
"\n"
"ds4510 eeprom read addr off cnt\n"
"ds4510 eeprom write addr off cnt\n"
@@ -398,6 +389,5 @@ U_BOOT_CMD(
"ds4510 sram read addr off cnt\n"
"ds4510 sram write addr off cnt\n"
" - read/write 'cnt' bytes at SRAM offset 'off'"
-#endif
);
#endif /* CONFIG_CMD_DS4510 */
diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index b4c3d6b311..5e3cd98d44 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -385,7 +385,6 @@ CONFIG_CMDLINE_EDITING
CONFIG_CMDLINE_PS_SUPPORT
CONFIG_CMDLINE_TAG
CONFIG_CMD_DS4510
-CONFIG_CMD_DS4510_MEM
CONFIG_CMD_DS4510_RST
CONFIG_CMD_DTT
CONFIG_CMD_ECCTEST
--
2.13.0.rc2.291.g57267f2277-goog