openwrt/flashrom
1
0
Fork 0
mirror of https://review.coreboot.org/flashrom.git synced 2025-07-02 06:23:18 +02:00
Code Issues Releases Wiki Activity

Revert "flashchips: port S25FS(128S) chip from chromiumos"

Browse Source 
This reverts commit a3519561bd.

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 <quasisec@google.com>
Reviewed-on: https://review.coreboot.org/c/flashrom/+/40626
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Shiyu Sun <sshiyu@google.com>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
This commit is contained in:
Nico Huber
2020-04-27 22:51:49 +00:00
committed by Edward O'Callaghan
parent 7f87f9fdc2
commit 9dc3d8d35b
8 changed files with 6 additions and 415 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
flashrom.c
View File

@ -500,14 +500,6 @@ const struct programmer_entry programmer_table[] = {
{0}, /* This entry corresponds to PROGRAMMER_INVALID. */
};
#define CHIP_RESTORE_MAXFN 4
static int chip_restore_fn_count = 0;
static struct chip_restore_func_data {
CHIP_RESTORE_CALLBACK;
struct flashctx *flash;
uint8_t status;
} chip_restore_fn[CHIP_RESTORE_MAXFN];
#define SHUTDOWN_MAXFN 32
static int shutdown_fn_count = 0;
/** @private */
@ -558,23 +550,6 @@ int register_shutdown(int (*function) (void *data), void *data)
return 0;
}
//int register_chip_restore(int (*function) (void *data), void *data)
int register_chip_restore(CHIP_RESTORE_CALLBACK,
struct flashctx *flash, uint8_t status)
{
if (chip_restore_fn_count >= CHIP_RESTORE_MAXFN) {
msg_perr("Tried to register more than %i chip restore"
" functions.\n", CHIP_RESTORE_MAXFN);
return 1;
}
chip_restore_fn[chip_restore_fn_count].func = func; /* from macro */
chip_restore_fn[chip_restore_fn_count].flash = flash;
chip_restore_fn[chip_restore_fn_count].status = status;
chip_restore_fn_count++;
return 0;
}
int programmer_init(enum programmer prog, const char *param)
{
int ret;