diff options
| author | Tom Rini <[email protected]> | 2022-07-18 15:37:38 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-07-18 15:37:38 -0400 |
| commit | 905e779b9e0bd29255ebc6244f017690fdc10fc4 (patch) | |
| tree | f89cf036d16b31ded49d9e541d12636ab57c7801 /common | |
| parent | 26f6f7fb5c0651d65afdee6d8ed36063606179a8 (diff) | |
| parent | 47ed8b22fd561b65e8541919becc76ab3d86f7a3 (diff) | |
Merge branch 'master' of https://source.denx.de/u-boot/custodians/u-boot-spi
- add Macronix Octal flash (JaimeLiao)
Diffstat (limited to 'common')
| -rw-r--r-- | common/spl/spl_spi.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/common/spl/spl_spi.c b/common/spl/spl_spi.c index 3eef2f8d683..d959ad11458 100644 --- a/common/spl/spl_spi.c +++ b/common/spl/spl_spi.c @@ -172,6 +172,11 @@ static int spl_spi_load_image(struct spl_image_info *spl_image, spl_image->size, (void *)spl_image->load_addr); } + if (IS_ENABLED(CONFIG_SPI_FLASH_SOFT_RESET)) { + err = spi_nor_remove(flash); + if (err) + return err; + } } return err; |