stm32/boards/STM32F769DISC: Use macro instead of const for flash size.

dpgeorge · dpgeorge · commit 2b9900380ad2 · 2020-06-12T10:28:26.000+10:00
So that the flash size can be changed in just one place.  Also remove the
duplicate cache entry.
diff --git a/ports/stm32/boards/STM32F769DISC/board_init.c b/ports/stm32/boards/STM32F769DISC/board_init.c
@@ -9,7 +9,6 @@ const mp_spiflash_config_t spiflash_config = {
     .bus_kind = MP_SPIFLASH_BUS_QSPI,
     .bus.u_qspi.data = NULL,
     .bus.u_qspi.proto = &qspi_proto,
-    .cache = NULL,
     .cache = &spi_bdev_cache,
 };
 
diff --git a/ports/stm32/boards/STM32F769DISC/mpconfigboard.h b/ports/stm32/boards/STM32F769DISC/mpconfigboard.h
@@ -41,7 +41,7 @@ extern struct _spi_bdev_t spi_bdev;
 #if !USE_QSPI_XIP
 #define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (0)
 #define MICROPY_HW_BDEV_IOCTL(op, arg) ( \
-    (op) == BDEV_IOCTL_NUM_BLOCKS ? (64 * 1024 * 1024 / FLASH_BLOCK_SIZE) : \
+    (op) == BDEV_IOCTL_NUM_BLOCKS ? ((1 << MICROPY_HW_QSPIFLASH_SIZE_BITS_LOG2) / 8 / FLASH_BLOCK_SIZE) : \
     (op) == BDEV_IOCTL_INIT ? spi_bdev_ioctl(&spi_bdev, (op), (uint32_t)&spiflash_config) : \
     spi_bdev_ioctl(&spi_bdev, (op), (arg)) \
 )

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ extern struct _spi_bdev_t spi_bdev;`
`41`	`41`	`#if !USE_QSPI_XIP`
`42`	`42`	`#define MICROPY_HW_ENABLE_INTERNAL_FLASH_STORAGE (0)`
`43`	`43`	`#define MICROPY_HW_BDEV_IOCTL(op, arg) ( \`
`44`		`- (op) == BDEV_IOCTL_NUM_BLOCKS ? (64 * 1024 * 1024 / FLASH_BLOCK_SIZE) : \`
	`44`	`+ (op) == BDEV_IOCTL_NUM_BLOCKS ? ((1 << MICROPY_HW_QSPIFLASH_SIZE_BITS_LOG2) / 8 / FLASH_BLOCK_SIZE) : \`
`45`	`45`	`(op) == BDEV_IOCTL_INIT ? spi_bdev_ioctl(&spi_bdev, (op), (uint32_t)&spiflash_config) : \`
`46`	`46`	`spi_bdev_ioctl(&spi_bdev, (op), (arg)) \`
`47`	`47`	`)`