Xiang Wang has uploaded this change for review.

View Change

flashrom.c: fix programmer_table

Modify the programmer_table array to make the sequence consistent with
enum programmer.

Change-Id: Id0755d550d1e5736f0fb3983028c2733822ebbcb
Signed-off-by: Xiang Wang <merle@hardenedliux.org>
---
M flashrom.c
1 file changed, 24 insertions(+), 24 deletions(-)

git pull ssh://review.coreboot.org:29418/flashrom refs/changes/94/49594/1
diff --git a/flashrom.c b/flashrom.c
index c89abad..cd4fdbb 100644
--- a/flashrom.c
+++ b/flashrom.c
@@ -413,30 +413,6 @@
},
#endif

-#if CONFIG_LSPCON_I2C_SPI == 1
- {
- .name = "lspcon_i2c_spi",
- .type = OTHER,
- .devs.note = "Device files /dev/i2c-*.\n",
- .init = lspcon_i2c_spi_init,
- .map_flash_region = fallback_map,
- .unmap_flash_region = fallback_unmap,
- .delay = internal_delay,
- },
-#endif
-
-#if CONFIG_REALTEK_MST_I2C_SPI == 1
- {
- .name = "realtek_mst_i2c_spi",
- .type = OTHER,
- .devs.note = "Device files /dev/i2c-*.\n",
- .init = realtek_mst_i2c_spi_init,
- .map_flash_region = fallback_map,
- .unmap_flash_region = fallback_unmap,
- .delay = internal_delay,
- },
-#endif
-
#if CONFIG_USBBLASTER_SPI == 1
{
.name = "usbblaster_spi",
@@ -533,6 +509,30 @@
},
#endif

+#if CONFIG_LSPCON_I2C_SPI == 1
+ {
+ .name = "lspcon_i2c_spi",
+ .type = OTHER,
+ .devs.note = "Device files /dev/i2c-*.\n",
+ .init = lspcon_i2c_spi_init,
+ .map_flash_region = fallback_map,
+ .unmap_flash_region = fallback_unmap,
+ .delay = internal_delay,
+ },
+#endif
+
+#if CONFIG_REALTEK_MST_I2C_SPI == 1
+ {
+ .name = "realtek_mst_i2c_spi",
+ .type = OTHER,
+ .devs.note = "Device files /dev/i2c-*.\n",
+ .init = realtek_mst_i2c_spi_init,
+ .map_flash_region = fallback_map,
+ .unmap_flash_region = fallback_unmap,
+ .delay = internal_delay,
+ },
+#endif
+
{0}, /* This entry corresponds to PROGRAMMER_INVALID. */
};


To view, visit change 49594. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: flashrom
Gerrit-Branch: master
Gerrit-Change-Id: Id0755d550d1e5736f0fb3983028c2733822ebbcb
Gerrit-Change-Number: 49594
Gerrit-PatchSet: 1
Gerrit-Owner: Xiang Wang <merle@hardenedlinux.org>
Gerrit-MessageType: newchange