diff options
| author | Edward O'Callaghan <quasisec@google.com> | 2022-08-12 15:42:29 +1000 |
|---|---|---|
| committer | Anastasia Klimchuk <aklm@chromium.org> | 2022-09-07 02:57:20 +0000 |
| commit | 162b997f2fb36d44640c6ca97baee328550c0869 (patch) | |
| tree | 40d0503748987055f1d29c68e9c7464ef7570e79 | |
| parent | a20ceffa352f790f14361211a1c9931475ec7ac7 (diff) | |
| download | flashrom-162b997f2fb36d44640c6ca97baee328550c0869.tar.gz flashrom-162b997f2fb36d44640c6ca97baee328550c0869.tar.bz2 flashrom-162b997f2fb36d44640c6ca97baee328550c0869.zip | |
tree: plumb programmer_cfg into chipset_flash_enable()
Change-Id: I963c674d212ce791ee155020fa97bcf26cefca0c
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/66673
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>
Reviewed-by: Felix Singer <felixsinger@posteo.net>
| -rw-r--r-- | chipset_enable.c | 4 | ||||
| -rw-r--r-- | include/programmer.h | 2 | ||||
| -rw-r--r-- | internal.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/chipset_enable.c b/chipset_enable.c index 64af483c..d8aa53dd 100644 --- a/chipset_enable.c +++ b/chipset_enable.c @@ -2182,7 +2182,7 @@ const struct penable chipset_enables[] = { {0}, }; -int chipset_flash_enable(void) +int chipset_flash_enable(const struct programmer_cfg *cfg) { struct pci_dev *dev = NULL; int ret = -2; /* Nothing! */ @@ -2231,7 +2231,7 @@ int chipset_flash_enable(void) continue; } msg_pinfo("Enabling flash write... "); - ret = chipset_enables[i].doit(NULL, dev, chipset_enables[i].device_name); + ret = chipset_enables[i].doit(cfg, dev, chipset_enables[i].device_name); if (ret == NOT_DONE_YET) { ret = -2; msg_pinfo("OK - searching further chips.\n"); diff --git a/include/programmer.h b/include/programmer.h index 2a4b1181..5331a12b 100644 --- a/include/programmer.h +++ b/include/programmer.h @@ -231,7 +231,7 @@ void board_handle_before_laptop(void); int board_flash_enable(const char *vendor, const char *model, const char *cb_vendor, const char *cb_model); /* chipset_enable.c */ -int chipset_flash_enable(void); +int chipset_flash_enable(const struct programmer_cfg *cfg); /* processor_enable.c */ int processor_flash_enable(void); @@ -282,7 +282,7 @@ static int internal_init(const struct programmer_cfg *cfg) /* try to enable it. Failure IS an option, since not all motherboards * really need this to be done, etc., etc. */ - ret = chipset_flash_enable(); + ret = chipset_flash_enable(cfg); if (ret == -2) { msg_perr("WARNING: No chipset found. Flash detection " "will most likely fail.\n"); |