spi25: Integrate 4BA support
Back port the upstream `commit f43c654a` reworked for our tree.
BUG=chromium:478356
BRANCH=none
TEST=still builds
Change-Id: I95c12d54fcc4acfbce00e59e11d00a324cbfaf7f
Signed-off-by: Edward O'Callaghan <quasisec@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/flashrom/+/1667513
Reviewed-by: Stefan Reinauer <reinauer@google.com>
diff --git a/flashrom.c b/flashrom.c
index 4b59f82..2ab9d63 100644
--- a/flashrom.c
+++ b/flashrom.c
@@ -2030,6 +2030,9 @@
if (flash->chip->unlock)
flash->chip->unlock(flash);
+ flash->address_high_byte = -1;
+ flash->in_4ba_mode = false;
+
/* Enable/disable 4-byte addressing mode if flash chip supports it */
if ((flash->chip->feature_bits & FEATURE_4BA_SUPPORT) &&
flash->chip->four_bytes_addr_funcs.set_4ba) {