From af76e447527da609965dff5726696b59d6873d6e Mon Sep 17 00:00:00 2001 From: Edward O'Callaghan Date: Thu, 25 Aug 2022 23:11:56 +1000 Subject: flashrom.c: Make 'chip_to_probe' a param to probe_flash() Apart from the very bespoke case of 'probe_w29ee011()' the override 'chip_to_probe' name is a nature parameter to 'probe_flash()'. However we can deal with w29ee011 by providing a probe specific validation function to check if the chip can indeed be overriden. TEST=`./flashrom -p internal --flash-name`. Change-Id: Ifcdace07ea2135d83dea92cfa5c6bec8d7ddf05d Signed-off-by: Edward O'Callaghan Reviewed-on: https://review.coreboot.org/c/flashrom/+/67091 Tested-by: build bot (Jenkins) Reviewed-by: Felix Singer Reviewed-by: Anastasia Klimchuk --- include/flash.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'include/flash.h') diff --git a/include/flash.h b/include/flash.h index 2ba235db..da200ea9 100644 --- a/include/flash.h +++ b/include/flash.h @@ -475,13 +475,12 @@ size_t strnlen(const char *str, size_t n); /* flashrom.c */ extern const char flashrom_version[]; -extern const char *chip_to_probe; char *flashbuses_to_text(enum chipbustype bustype); int map_flash(struct flashctx *flash); void unmap_flash(struct flashctx *flash); int read_memmapped(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len); int erase_flash(struct flashctx *flash); -int probe_flash(struct registered_master *mst, int startchip, struct flashctx *fill_flash, int force); +int probe_flash(struct registered_master *mst, int startchip, struct flashctx *flash, int force, const char *const chip_to_probe); int verify_range(struct flashctx *flash, const uint8_t *cmpbuf, unsigned int start, unsigned int len); void emergency_help_message(void); void print_version(void); -- cgit v1.2.3