commit 477270a6f55e90f94130dad3fd7757433c7b6ddf
author Sam McNally <sammc@chromium.org> Mon Nov 09 16:45:48 2020 +1100
committer Commit Bot <commit-bot@chromium.org> Tue Nov 10 03:37:18 2020 +0000
tree e56157063946cbf8fb4a5347c9ef3a3d99348548
parent e195b3d4f271804d029af4498e152b6acb9b953a

programmer.h: Reorder MEC1308 and ENE_LPC enumerators.

Programmer enumerators and their corresponding programmer_table entries
need to be aligned. This was not the case for MEC1308 and ENE_LPC.
Their configs were not enabled by default until commit 26fde5b0b067
("ene_lpc,mec1308: Fix entry-points to be explicit")/CL:2488823,
allowing this issue to go unnoticed. The particular symptom of the
mismatch was internal_init() trying to init linux_mtd instead of
linux_spi.

BUG=b:172668501
TEST=flashrom -p host on gale
BRANCH=None

Change-Id: I2e9d3df6a6fd6d5d8e3a5a13ee56f5997b10ea52
Signed-off-by: Sam McNally <sammc@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/flashrom/+/2524662
Commit-Queue: Edward O'Callaghan <quasisec@chromium.org>
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>

programmer.h

diff --git a/programmer.h b/programmer.h
index d673658..5ddc50c 100644
--- a/programmer.h
+++ b/programmer.h
@@ -31,6 +31,9 @@
 #if CONFIG_DUMMY == 1
 	PROGRAMMER_DUMMY,
 #endif
+#if CONFIG_MEC1308 == 1
+	PROGRAMMER_MEC1308,
+#endif
 #if CONFIG_NIC3COM == 1
 	PROGRAMMER_NIC3COM,
 #endif
@@ -61,9 +64,6 @@
 #if CONFIG_ATAPROMISE == 1
 	PROGRAMMER_ATAPROMISE,
 #endif
-#if CONFIG_ENE_LPC == 1
-	PROGRAMMER_ENE_LPC,
-#endif
 #if CONFIG_IT8212 == 1
 	PROGRAMMER_IT8212,
 #endif
@@ -82,6 +82,9 @@
 #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
@@ -112,9 +115,6 @@
 #if CONFIG_USBBLASTER_SPI == 1
 	PROGRAMMER_USBBLASTER_SPI,
 #endif
-#if CONFIG_MEC1308 == 1
-	PROGRAMMER_MEC1308,
-#endif
 #if CONFIG_MSTARDDC_SPI == 1
 	PROGRAMMER_MSTARDDC_SPI,
 #endif