mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-07-26 12:59:43 +09:00
sf: Flash power up read-only based on idcode0
Using macro's for flash power up read-only access code leads wrong behaviour hence use idcode0 for runtime detection, hence the flash which require this functionality gets detected at runtime. Tested-by: Jagan Teki <jteki@openedev.com> Reviewed-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org> Signed-off-by: Jagan Teki <jteki@openedev.com>
This commit is contained in:
parent
cb37518516
commit
6f9d670d8e
@ -66,6 +66,7 @@ enum spi_nor_option_flags {
|
|||||||
#define SPI_FLASH_CFI_MFR_MACRONIX 0xc2
|
#define SPI_FLASH_CFI_MFR_MACRONIX 0xc2
|
||||||
#define SPI_FLASH_CFI_MFR_SST 0xbf
|
#define SPI_FLASH_CFI_MFR_SST 0xbf
|
||||||
#define SPI_FLASH_CFI_MFR_WINBOND 0xef
|
#define SPI_FLASH_CFI_MFR_WINBOND 0xef
|
||||||
|
#define SPI_FLASH_CFI_MFR_ATMEL 0x1f
|
||||||
|
|
||||||
/* Erase commands */
|
/* Erase commands */
|
||||||
#define CMD_ERASE_4K 0x20
|
#define CMD_ERASE_4K 0x20
|
||||||
|
@ -941,11 +941,10 @@ int spi_flash_scan(struct spi_slave *spi, struct spi_flash *flash)
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* Flash powers up read-only, so clear BP# bits */
|
/* Flash powers up read-only, so clear BP# bits */
|
||||||
#if defined(CONFIG_SPI_FLASH_ATMEL) || \
|
if (idcode[0] == SPI_FLASH_CFI_MFR_ATMEL ||
|
||||||
defined(CONFIG_SPI_FLASH_MACRONIX) || \
|
idcode[0] == SPI_FLASH_CFI_MFR_MACRONIX ||
|
||||||
defined(CONFIG_SPI_FLASH_SST)
|
idcode[0] == SPI_FLASH_CFI_MFR_SST)
|
||||||
write_sr(flash, 0);
|
write_sr(flash, 0);
|
||||||
#endif
|
|
||||||
|
|
||||||
/* Assign spi data */
|
/* Assign spi data */
|
||||||
flash->spi = spi;
|
flash->spi = spi;
|
||||||
|
Loading…
Reference in New Issue
Block a user