diff options
| author | Edward O'Callaghan <quasisec@google.com> | 2023-03-06 11:12:37 +1100 |
|---|---|---|
| committer | Edward O'Callaghan <quasisec@chromium.org> | 2023-04-02 01:01:28 +0000 |
| commit | 3ed016f08faa011736443f3b39bf68187d974781 (patch) | |
| tree | 2463d5cb64803d97e3783a49add5b9c33c253c18 | |
| parent | 40cc15f55db5bf68c38be5a5cb695c38e75ffb37 (diff) | |
| download | flashrom-git-3ed016f08faa011736443f3b39bf68187d974781.tar.gz | |
internal: Move is_laptop into board_cfg
Change-Id: I24e38e4457299934acdcd70325d0bf0f4b139e5f
Signed-off-by: Edward O'Callaghan <quasisec@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/73455
Reviewed-by: Sam McNally <sammc@google.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
| -rw-r--r-- | board_enable.c | 4 | ||||
| -rw-r--r-- | include/programmer.h | 2 | ||||
| -rw-r--r-- | internal.c | 11 |
3 files changed, 8 insertions, 9 deletions
diff --git a/board_enable.c b/board_enable.c index fc212835..f95430a8 100644 --- a/board_enable.c +++ b/board_enable.c @@ -2282,7 +2282,7 @@ static int it8718f_gpio63_raise(struct board_cfg *cfg) static int p2_not_a_laptop(struct board_cfg *cfg) { /* label this board as not a laptop */ - g_is_laptop = 0; + cfg->is_laptop = 0; msg_pdbg("Laptop detection overridden by P2 board enable.\n"); return 0; } @@ -2292,7 +2292,7 @@ static int p2_not_a_laptop(struct board_cfg *cfg) */ static int p2_whitelist_laptop(struct board_cfg *cfg) { - g_is_laptop = 1; + cfg->is_laptop = 1; g_laptop_ok = true; msg_pdbg("Whitelisted laptop detected.\n"); return 0; diff --git a/include/programmer.h b/include/programmer.h index 047f49a5..157de2e2 100644 --- a/include/programmer.h +++ b/include/programmer.h @@ -161,6 +161,7 @@ enum board_match_phase { }; struct board_cfg { + int is_laptop; }; struct board_match { @@ -266,7 +267,6 @@ extern int superio_count; #endif #if CONFIG_INTERNAL == 1 -extern int g_is_laptop; extern bool g_laptop_ok; extern bool force_boardmismatch; void probe_superio(void); @@ -27,7 +27,6 @@ #include "hwaccess_x86_io.h" #endif -int g_is_laptop = 0; bool g_laptop_ok = false; bool force_boardmismatch = false; @@ -149,7 +148,7 @@ static int internal_init(const struct programmer_cfg *cfg) const char *cb_model = NULL; #endif bool force_boardenable = false; - struct board_cfg bcfg; + struct board_cfg bcfg = {0}; ret = get_params(cfg, &force_boardenable, &force_boardmismatch, @@ -204,9 +203,9 @@ static int internal_init(const struct programmer_cfg *cfg) } } - g_is_laptop = 2; /* Assume that we don't know by default. */ + bcfg.is_laptop = 2; /* Assume that we don't know by default. */ - dmi_init(&g_is_laptop); + dmi_init(&bcfg.is_laptop); /* In case Super I/O probing would cause pretty explosions. */ board_handle_before_superio(&bcfg, force_boardenable); @@ -229,7 +228,7 @@ static int internal_init(const struct programmer_cfg *cfg) * this isn't a laptop. Board-enables may override this, * non-legacy buses (SPI and opaque atm) are probed anyway. */ - if (g_is_laptop && !(g_laptop_ok || force_laptop || (not_a_laptop && g_is_laptop == 2))) + if (bcfg.is_laptop && !(g_laptop_ok || force_laptop || (not_a_laptop && bcfg.is_laptop == 2))) internal_buses_supported = BUS_NONE; /* try to enable it. Failure IS an option, since not all motherboards @@ -259,7 +258,7 @@ static int internal_init(const struct programmer_cfg *cfg) internal_par_init(internal_buses_supported); /* Report if a non-whitelisted laptop is detected that likely uses a legacy bus. */ - report_nonwl_laptop_detected(g_is_laptop, g_laptop_ok); + report_nonwl_laptop_detected(bcfg.is_laptop, g_laptop_ok); ret = 0; |