openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-04-27 15:12:36 +02:00
Code Issues Releases Wiki Activity

chipset_enable.c: plumb programmer_cfg into sb600 and ich init

Browse Source 
Change-Id: Ic25014cbb983bda6e949bc62e30f2cca51f57a4c
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/66674
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Anastasia Klimchuk <aklm@chromium.org>
Reviewed-by: Felix Singer <felixsinger@posteo.net>
This commit is contained in:
Edward O'Callaghan 2022-08-12 16:37:45 +10:00 committed by Anastasia Klimchuk
parent 162b997f2f
commit 2c520b4afa
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
chipset_enable.c
View File

@ -428,7 +428,7 @@ static int enable_flash_ich_fwh_decode(const struct programmer_cfg *cfg, struct
break;
}
char *idsel = extract_programmer_param_str(NULL, "fwh_idsel"); /* TODO(quasisec): pass prog_param */
char *idsel = extract_programmer_param_str(cfg, "fwh_idsel");
if (idsel && strlen(idsel)) {
if (!implemented) {
msg_perr("Error: fwh_idsel= specified, but (yet) unsupported on this chipset.\n");
@ -816,7 +816,7 @@ static int enable_flash_ich_spi(const struct programmer_cfg *cfg, struct pci_dev
void *spibar = rcrb + spibar_offset;
/* This adds BUS_SPI */
int ret_spi = ich_init_spi(NULL, spibar, ich_generation); /* TODO(quasisec): pass prog_param */
int ret_spi = ich_init_spi(cfg, spibar, ich_generation);
if (ret_spi == ERROR_FATAL)
return ret_spi;
@ -960,7 +960,7 @@ static int enable_flash_pch100_or_c620(const struct programmer_cfg *cfg,
msg_pdbg("SPIBAR = 0x%0*" PRIxPTR " (phys = 0x%08x)\n", PRIxPTR_WIDTH, (uintptr_t)spibar, phys_spibar);
/* This adds BUS_SPI */
const int ret_spi = ich_init_spi(NULL, spibar, pch_generation); /* TODO(quasisec): pass prog_param */
const int ret_spi = ich_init_spi(cfg, spibar, pch_generation);
if (ret_spi != ERROR_FATAL) {
if (ret_bc || ret_spi)
ret = ERROR_NONFATAL;
@ -1077,7 +1077,7 @@ static int enable_flash_silvermont(const struct programmer_cfg *cfg, struct pci_
*/
enable_flash_ich_bios_cntl_memmapped(ich_generation, spibar + 0xFC);
int ret_spi = ich_init_spi(NULL, spibar, ich_generation); /* TODO(quasisec): pass prog_param */
int ret_spi = ich_init_spi(cfg, spibar, ich_generation);
if (ret_spi == ERROR_FATAL)
return ret_spi;
@ -1407,7 +1407,7 @@ static int enable_flash_sb600(const struct programmer_cfg *cfg, struct pci_dev *
internal_buses_supported &= BUS_LPC | BUS_FWH;
ret = sb600_probe_spi(NULL, dev); /* TODO(quasisec): pass prog_param */
ret = sb600_probe_spi(cfg, dev);
/* Read ROM strap override register. */
OUTB(0x8f, 0xcd6);