Edward O'Callaghan has submitted this change. ( https://review.coreboot.org/c/flashrom/+/47353 )
Change subject: programmer.h: Reorder MEC1308 and ENE_LPC enumerators ......................................................................
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
Original-Change-Id: I2e9d3df6a6fd6d5d8e3a5a13ee56f5997b10ea52 Original-Signed-off-by: Sam McNally sammc@chromium.org
Change-Id: I8e7a57b7c30e2dd2306d6fe7268eee8bb9d0c8a5 Signed-off-by: Edward O'Callaghan quasisec@google.com Reviewed-on: https://review.coreboot.org/c/flashrom/+/47353 Reviewed-by: Angel Pons th3fanbus@gmail.com Reviewed-by: Victor Ding victording@google.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M programmer.h 1 file changed, 6 insertions(+), 6 deletions(-)
Approvals: build bot (Jenkins): Verified Angel Pons: Looks good to me, approved Victor Ding: Looks good to me, but someone else must approve
diff --git a/programmer.h b/programmer.h index 9a7892d..1bd0d37 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