stm32/spiflash: Update definitions for mboot and boards using spi flash.

pi-anl · andrewleech · commit f68f7b256d37 · 2019-10-23T09:50:51.000+11:00
diff --git a/ports/stm32/boards/STM32F769DISC/board_init.c b/ports/stm32/boards/STM32F769DISC/board_init.c
@@ -1,17 +1,13 @@
 #include "drivers/memory/spiflash.h"
-#include "qspi.h"
+#include "drivers/bus/qspi.h"
 
 // This configuration is needed for mboot to be able to write to the external QSPI flash
+extern const mp_qspi_proto_t qspi_proto;
 
-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,
+mp_spiflash_t spiflash_instance = {
+    .qspi_proto = &qspi_proto
 };
 
-mp_spiflash_t spiflash_instance;
-
 // This init function is needed to memory map the QSPI flash early in the boot process
 
 void board_early_init(void) {
diff --git a/ports/stm32/boards/STM32F769DISC/mpconfigboard.h b/ports/stm32/boards/STM32F769DISC/mpconfigboard.h
@@ -205,5 +205,4 @@ extern struct _mp_spiflash_t spiflash_instance;
 #define MBOOT_SPIFLASH_BYTE_SIZE                (512 * 128 * 1024)
 #define MBOOT_SPIFLASH_LAYOUT                   "/0x90000000/512*128Kg"
 #define MBOOT_SPIFLASH_ERASE_BLOCKS_PER_PAGE    (128 / 4) // 128k page, 4k erase block
-#define MBOOT_SPIFLASH_CONFIG                   (&spiflash_config)
 #define MBOOT_SPIFLASH_SPIFLASH                 (&spiflash_instance)
diff --git a/ports/stm32/mboot/main.c b/ports/stm32/mboot/main.c
@@ -1485,12 +1485,10 @@ void stm32_main(int initial_r0) {
     #endif
 
     #if defined(MBOOT_SPIFLASH_ADDR)
-    MBOOT_SPIFLASH_SPIFLASH->config = MBOOT_SPIFLASH_CONFIG;
     mp_spiflash_init(MBOOT_SPIFLASH_SPIFLASH);
     #endif
 
     #if defined(MBOOT_SPIFLASH2_ADDR)
-    MBOOT_SPIFLASH2_SPIFLASH->config = MBOOT_SPIFLASH2_CONFIG;
     mp_spiflash_init(MBOOT_SPIFLASH2_SPIFLASH);
     #endif
 
