From 9dc3d8d35b375eef3e63f3a24a63daaf57caf63b Mon Sep 17 00:00:00 2001 From: Nico Huber Date: Mon, 27 Apr 2020 22:51:49 +0000 Subject: Revert "flashchips: port S25FS(128S) chip from chromiumos" This reverts commit a3519561bd0fb44153bb376322b799000657576f. Breaks support for most SPI flash chips. It's too big and too invasive to be reviewed as a single commit. The changes to `spi_poll_wip():spi25.c` were not noticed in the original review that were from the similarly named function and file `s25f_poll_status():s25f.c` in the downstream Chromium fork. V.2: Rebase and rephrase commit msg to reflect how the issue slipped in. Change-Id: Id2a4593bdb654f8a26957d69d52189ce61621d93 Signed-off-by: Edward O'Callaghan Reviewed-on: https://review.coreboot.org/c/flashrom/+/40626 Tested-by: build bot (Jenkins) Reviewed-by: Shiyu Sun Reviewed-by: Angel Pons --- flashchips.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'flashchips.h') diff --git a/flashchips.h b/flashchips.h index 0c77d1d10..e5ef39013 100644 --- a/flashchips.h +++ b/flashchips.h @@ -642,8 +642,6 @@ #define SPANSION_S25FL032A 0x0215 /* Same as S25FL032P, but the latter supports EDI and CFI */ #define SPANSION_S25FL064A 0x0216 /* Same as S25FL064P, but the latter supports EDI and CFI */ #define SPANSION_S25FL128 0x2018 /* Same ID for various S25FL127S, S25FL128P, S25FL128S and S25FL129P (including dual-die S70FL256P) variants (EDI supported) */ -#define SPANSION_S25FS128S_L 0x20180081 /* Large sectors. */ -#define SPANSION_S25FS128S_S 0x20180181 /* Small sectors. */ #define SPANSION_S25FL256 0x0219 #define SPANSION_S25FL512 0x0220 #define SPANSION_S25FL204 0x4013 -- cgit v1.2.3