openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-07-01 22:21:16 +02:00
Code Issues Releases Wiki Activity

tree: Port programmers to pass programmer_cfg to extractors

Browse Source 
Ran;
```
 $ find -name '*.c' -exec sed -i 's/extract_programmer_param_str(NULL/extract_programmer_param_str(cfg/g' '{}' \;
```

Manually fix i2c_helper_linux.c and other cases after.

Treat cases of;
 - pcidev.c , and
 - usb_device.c
as exceptional to be dealt with in later patches.

Change-Id: If7b7987e803d35582dda219652a6fc3ed5729b47
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/66656
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 13:47:29 +10:00
committed by Anastasia Klimchuk
parent c3df94cb96
commit 5c710ea54a
30 changed files with 87 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
realtek_mst_i2c_spi.c
View File

@ -450,7 +450,7 @@ static int get_params(const struct programmer_cfg *cfg, bool *reset, bool *enter
int ret = 0;
*allow_brick = false; /* Default behaviour is to bail. */
param_str = extract_programmer_param_str(NULL, "allow_brick");
param_str = extract_programmer_param_str(cfg, "allow_brick");
if (param_str) {
if (!strcmp(param_str, "yes")) {
*allow_brick = true;
@ -462,7 +462,7 @@ static int get_params(const struct programmer_cfg *cfg, bool *reset, bool *enter
free(param_str);
*reset = false; /* Default behaviour is no MCU reset on tear-down. */
param_str = extract_programmer_param_str(NULL, "reset_mcu");
param_str = extract_programmer_param_str(cfg, "reset_mcu");
if (param_str) {
if (param_str[0] == '1') {
*reset = true;
@ -476,7 +476,7 @@ static int get_params(const struct programmer_cfg *cfg, bool *reset, bool *enter
free(param_str);
*enter_isp = true; /* Default behaviour is enter ISP on setup. */
param_str = extract_programmer_param_str(NULL, "enter_isp");
param_str = extract_programmer_param_str(cfg, "enter_isp");
if (param_str) {
if (param_str[0] == '1') {
*enter_isp = true;
@ -512,7 +512,7 @@ static int realtek_mst_i2c_spi_init(const struct programmer_cfg *cfg)
return SPI_GENERIC_ERROR;
}
int fd = i2c_open_from_programmer_params(REGISTER_ADDRESS, 0);
int fd = i2c_open_from_programmer_params(cfg, REGISTER_ADDRESS, 0);
if (fd < 0)
return fd;