diff options
author | Thomas Heijligen <thomas.heijligen@secunet.de> | 2021-06-01 16:25:52 +0200 |
---|---|---|
committer | Nico Huber <nico.h@gmx.de> | 2021-06-10 12:53:40 +0000 |
commit | 2376ccf00a805f4744eb830aabdfb7fe8e29b7e3 (patch) | |
tree | 6878e42674c3ea5f32f326459618fad69cea316e | |
parent | 732aafdfecf084cc4277a344ac26b4ea5d0dd3be (diff) | |
download | flashrom-2376ccf00a805f4744eb830aabdfb7fe8e29b7e3.tar.gz flashrom-2376ccf00a805f4744eb830aabdfb7fe8e29b7e3.tar.bz2 flashrom-2376ccf00a805f4744eb830aabdfb7fe8e29b7e3.zip |
enum programmer: not needed anymore. Remove
Change-Id: I53cdb160616911a4beea6b5e8e56d582621818a4
Signed-off-by: Thomas Heijligen <thomas.heijligen@secunet.de>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/55124
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
-rw-r--r-- | flashrom.c | 7 | ||||
-rw-r--r-- | programmer.h | 121 |
2 files changed, 0 insertions, 128 deletions
@@ -1708,13 +1708,6 @@ int selfcheck(void) unsigned int i; int ret = 0; - /* Safety check. Instead of aborting after the first error, check - * if more errors exist. - */ - if (programmer_table_size != PROGRAMMER_INVALID) { - msg_gerr("Programmer table miscompilation!\n"); - ret = 1; - } for (i = 0; i < programmer_table_size; i++) { const struct programmer_entry *const p = programmer_table[i]; if (p == NULL) { diff --git a/programmer.h b/programmer.h index 809674fc..be6010dc 100644 --- a/programmer.h +++ b/programmer.h @@ -24,127 +24,6 @@ #include "flash.h" /* for chipaddr and flashctx */ -enum programmer { -#if CONFIG_INTERNAL == 1 - PROGRAMMER_INTERNAL, -#endif -#if CONFIG_DUMMY == 1 - PROGRAMMER_DUMMY, -#endif -#if CONFIG_MEC1308 == 1 - PROGRAMMER_MEC1308, -#endif -#if CONFIG_NIC3COM == 1 - PROGRAMMER_NIC3COM, -#endif -#if CONFIG_NICREALTEK == 1 - PROGRAMMER_NICREALTEK, -#endif -#if CONFIG_NICNATSEMI == 1 - PROGRAMMER_NICNATSEMI, -#endif -#if CONFIG_GFXNVIDIA == 1 - PROGRAMMER_GFXNVIDIA, -#endif -#if CONFIG_RAIDEN_DEBUG_SPI == 1 - PROGRAMMER_RAIDEN_DEBUG_SPI, -#endif -#if CONFIG_DRKAISER == 1 - PROGRAMMER_DRKAISER, -#endif -#if CONFIG_SATASII == 1 - PROGRAMMER_SATASII, -#endif -#if CONFIG_ATAHPT == 1 - PROGRAMMER_ATAHPT, -#endif -#if CONFIG_ATAVIA == 1 - PROGRAMMER_ATAVIA, -#endif -#if CONFIG_ATAPROMISE == 1 - PROGRAMMER_ATAPROMISE, -#endif -#if CONFIG_IT8212 == 1 - PROGRAMMER_IT8212, -#endif -#if CONFIG_FT2232_SPI == 1 - PROGRAMMER_FT2232_SPI, -#endif -#if CONFIG_SERPROG == 1 - PROGRAMMER_SERPROG, -#endif -#if CONFIG_BUSPIRATE_SPI == 1 - PROGRAMMER_BUSPIRATE_SPI, -#endif -#if CONFIG_DEDIPROG == 1 - PROGRAMMER_DEDIPROG, -#endif -#if CONFIG_DEVELOPERBOX_SPI == 1 - PROGRAMMER_DEVELOPERBOX_SPI, -#endif -#if CONFIG_ENE_LPC == 1 - PROGRAMMER_ENE_LPC, -#endif -#if CONFIG_RAYER_SPI == 1 - PROGRAMMER_RAYER_SPI, -#endif -#if CONFIG_PONY_SPI == 1 - PROGRAMMER_PONY_SPI, -#endif -#if CONFIG_NICINTEL == 1 - PROGRAMMER_NICINTEL, -#endif -#if CONFIG_NICINTEL_SPI == 1 - PROGRAMMER_NICINTEL_SPI, -#endif -#if CONFIG_NICINTEL_EEPROM == 1 - PROGRAMMER_NICINTEL_EEPROM, -#endif -#if CONFIG_OGP_SPI == 1 - PROGRAMMER_OGP_SPI, -#endif -#if CONFIG_SATAMV == 1 - PROGRAMMER_SATAMV, -#endif -#if CONFIG_LINUX_MTD == 1 - PROGRAMMER_LINUX_MTD, -#endif -#if CONFIG_LINUX_SPI == 1 - PROGRAMMER_LINUX_SPI, -#endif -#if CONFIG_USBBLASTER_SPI == 1 - PROGRAMMER_USBBLASTER_SPI, -#endif -#if CONFIG_MSTARDDC_SPI == 1 - PROGRAMMER_MSTARDDC_SPI, -#endif -#if CONFIG_PICKIT2_SPI == 1 - PROGRAMMER_PICKIT2_SPI, -#endif -#if CONFIG_CH341A_SPI == 1 - PROGRAMMER_CH341A_SPI, -#endif -#if CONFIG_DIGILENT_SPI == 1 - PROGRAMMER_DIGILENT_SPI, -#endif -#if CONFIG_JLINK_SPI == 1 - PROGRAMMER_JLINK_SPI, -#endif -#if CONFIG_NI845X_SPI == 1 - PROGRAMMER_NI845X_SPI, -#endif -#if CONFIG_STLINKV3_SPI == 1 - PROGRAMMER_STLINKV3_SPI, -#endif -#if CONFIG_LSPCON_I2C_SPI == 1 - PROGRAMMER_LSPCON_I2C_SPI, -#endif -#if CONFIG_REALTEK_MST_I2C_SPI == 1 - PROGRAMMER_REALTEK_MST_I2C_SPI, -#endif - PROGRAMMER_INVALID /* This must always be the last entry. */ -}; - enum programmer_type { PCI = 1, /* to detect uninitialized values */ USB, |