Revert "spi: Adopt programmers to use per-flash spi master scheme"
This reverts commit bcae375630ea8a9bfd3645700451209fb98b66eb.
Reason for revert: Flashrom upgrades have broken a few key use cases.
BRANCH=none
BUG=b:138663774, b:138470368
TEST=emerge-nocturne flashrom && cros deploy dut1 flashrom
flashrom --fast-verify --programmer=ec:type=fp --image=EC_RW --write -V /opt/google/biod/fw/nocturne_fp_v2.2.110-b936c0a3c.bin
flashrom --fast-verify --programmer=ec:type=fp --image=EC_RO --write -V /opt/google/biod/fw/nocturne_fp_v2.2.110-b936c0a3c.bin
flashrom --fast-verify --programmer=ec:type=fp --image=EC_RW --write -V ~/some-other-fp-firmware.bin
cat /dev/cros_fp
bio_fw_updater --log_dir=voodoo
TEST=emerge-hatch flashrom && cros deploy dut3 flashrom
chromeos-firmwareupdate --mode=factory
Signed-off-by: Craig Hesling <hesling@chromium.org>
Change-Id: I796d4749372896249e2504122e9ec588da353d6b
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/flashrom/+/1731581
Reviewed-by: Furquan Shaikh <furquan@chromium.org>
Reviewed-by: Edward O'Callaghan <quasisec@chromium.org>
Commit-Queue: Furquan Shaikh <furquan@chromium.org>
diff --git a/programmer.h b/programmer.h
index b13e21d..3d929a3 100644
--- a/programmer.h
+++ b/programmer.h
@@ -463,7 +463,7 @@
#endif
/* bitbang_spi.c */
-int bitbang_spi_init(const struct bitbang_spi_master *master);
+int register_spi_bitbang_master(const struct bitbang_spi_master *master);
int bitbang_spi_shutdown(const struct bitbang_spi_master *master);
/* buspirate_spi.c */
@@ -584,15 +584,15 @@
/* Optimized functions for this master */
int (*read)(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len);
int (*write_256)(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len);
- const void *data;
};
+extern const struct spi_master *spi_master;
int default_spi_send_command(const struct flashctx *flash, unsigned int writecnt, unsigned int readcnt,
const unsigned char *writearr, unsigned char *readarr);
int default_spi_send_multicommand(const struct flashctx *flash, struct spi_command *cmds);
int default_spi_read(struct flashctx *flash, uint8_t *buf, unsigned int start, unsigned int len);
int default_spi_write_256(struct flashctx *flash, const uint8_t *buf, unsigned int start, unsigned int len);
-int register_spi_master(const struct spi_master *programmer);
+void register_spi_master(const struct spi_master *programmer);
/* ichspi.c */
enum ich_chipset {
@@ -676,7 +676,8 @@
int (*check_access) (const struct flashctx *flash, unsigned int start, unsigned int len, int read);
const void *data;
};
-int register_opaque_master(const struct opaque_master *mst);
+extern struct opaque_master *opaque_master;
+void register_opaque_master(struct opaque_master *pgm);
/* programmer.c */
int noop_shutdown(void);
@@ -701,7 +702,8 @@
void (*chip_readn) (const struct flashctx *flash, uint8_t *buf, const chipaddr addr, size_t len);
const void *data;
};
-int register_par_master(const struct par_master *pgm, const enum chipbustype buses);
+extern const struct par_master *par_master;
+void register_par_master(const struct par_master *pgm, const enum chipbustype buses);
struct registered_master {
enum chipbustype buses_supported;
union {