aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAngel Pons <th3fanbus@gmail.com>2021-05-17 19:08:32 +0200
committerEdward O'Callaghan <quasisec@chromium.org>2021-05-20 02:23:23 +0000
commit59e344e904c2d5b5346803f9ab11b95c64bf05f0 (patch)
treefe914c0aa3b9e49543ae547f584ed7ed98c09ea6
parent6c9dfdc971e42c1017a5edcab8012c8fcfaefacc (diff)
downloadflashrom-59e344e904c2d5b5346803f9ab11b95c64bf05f0.tar.gz
flashrom-59e344e904c2d5b5346803f9ab11b95c64bf05f0.tar.bz2
flashrom-59e344e904c2d5b5346803f9ab11b95c64bf05f0.zip
Fix up handling of IFD chipsets
When `CHIPSET_400_SERIES_COMET_POINT` got added, the `chipset_names` table was not updated. Add the missing entry and reorder it to be next to `CHIPSET_300_SERIES_CANNON_POINT` for consistency. Change-Id: I4f4b31ecf91c432a2e82a92e274cb91ac166e635 Signed-off-by: Angel Pons <th3fanbus@gmail.com> Reviewed-on: https://review.coreboot.org/c/flashrom/+/54429 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Edward O'Callaghan <quasisec@chromium.org> Reviewed-by: Sam McNally <sammc@google.com>
-rw-r--r--ich_descriptors.c3
-rw-r--r--programmer.h2
2 files changed, 3 insertions, 2 deletions
diff --git a/ich_descriptors.c b/ich_descriptors.c
index c5f9f826..a6ac8814 100644
--- a/ich_descriptors.c
+++ b/ich_descriptors.c
@@ -106,7 +106,8 @@ void prettyprint_ich_chipset(enum ich_chipset cs)
"5 series Ibex Peak", "6 series Cougar Point", "7 series Panther Point",
"8 series Lynx Point", "Baytrail", "8 series Lynx Point LP", "8 series Wellsburg",
"9 series Wildcat Point", "9 series Wildcat Point LP", "100 series Sunrise Point",
- "C620 series Lewisburg", "300 series Cannon Point", "Apollo Lake", "Gemini Lake",
+ "C620 series Lewisburg", "300 series Cannon Point", "400 series Comet Point",
+ "Apollo Lake", "Gemini Lake",
};
if (cs < CHIPSET_ICH8 || cs - CHIPSET_ICH8 + 1 >= ARRAY_SIZE(chipset_names))
cs = 0;
diff --git a/programmer.h b/programmer.h
index d3a7ba35..1a2e7584 100644
--- a/programmer.h
+++ b/programmer.h
@@ -670,8 +670,8 @@ enum ich_chipset {
CHIPSET_100_SERIES_SUNRISE_POINT, /* also 6th/7th gen Core i/o (LP) variants */
CHIPSET_C620_SERIES_LEWISBURG,
CHIPSET_300_SERIES_CANNON_POINT,
- CHIPSET_APOLLO_LAKE,
CHIPSET_400_SERIES_COMET_POINT,
+ CHIPSET_APOLLO_LAKE,
CHIPSET_GEMINI_LAKE,
};