summaryrefslogtreecommitdiffstats
path: root/sys/boot
diff options
context:
space:
mode:
authorticso <ticso@FreeBSD.org>2007-12-23 14:46:30 +0000
committerticso <ticso@FreeBSD.org>2007-12-23 14:46:30 +0000
commitbe62f6be4e3edc66289ba8cf8264b6312b937279 (patch)
treee7f2e1ae03ed782010efdeb5b6e2fbb0e36e52ee /sys/boot
parentd2a56e1c39575f38ab1f976471c8628766611c03 (diff)
downloadFreeBSD-src-be62f6be4e3edc66289ba8cf8264b6312b937279.zip
FreeBSD-src-be62f6be4e3edc66289ba8cf8264b6312b937279.tar.gz
BWCT boards uses two different SPI flash chips
check for both status codes
Diffstat (limited to 'sys/boot')
-rw-r--r--sys/boot/arm/at91/libat91/spi_flash.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/boot/arm/at91/libat91/spi_flash.c b/sys/boot/arm/at91/libat91/spi_flash.c
index a35e798..591b9eb 100644
--- a/sys/boot/arm/at91/libat91/spi_flash.c
+++ b/sys/boot/arm/at91/libat91/spi_flash.c
@@ -256,11 +256,12 @@ SPI_InitFlash(void)
value = pSPI->SPI_RDR;
value = pSPI->SPI_SR;
+ value = GetFlashStatus() & 0xFC;
#ifdef BOOT_BWCT
- if (((value = GetFlashStatus()) & 0xFC) != 0xB4)
+ if (value != 0xB4 && value != 0xAC)
printf(" Bad SPI status: 0x%x\n", value);
#else
- if (((value = GetFlashStatus()) & 0xFC) != 0xBC)
+ if (value != 0xBC)
printf(" Bad SPI status: 0x%x\n", value);
#endif
}
OpenPOWER on IntegriCloud