From 70932cab4223463816974e57945f6f803bbe7371 Mon Sep 17 00:00:00 2001
From: Lucian Copeland <hierophect@gmail.com>
Date: Fri, 24 Jan 2020 14:33:28 -0500
Subject: [PATCH] Simplify the flash-display conflict fix

---
 ports/stm32f4/boards/meowbit_v121/mpconfigboard.h |  2 +-
 py/circuitpy_mpconfig.h                           |  1 -
 shared-bindings/board/__init__.h                  |  2 --
 shared-module/board/__init__.c                    | 11 -----------
 shared-module/displayio/__init__.c                |  7 +++++--
 5 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/ports/stm32f4/boards/meowbit_v121/mpconfigboard.h b/ports/stm32f4/boards/meowbit_v121/mpconfigboard.h
index bf738e9618..2d8ff87618 100644
--- a/ports/stm32f4/boards/meowbit_v121/mpconfigboard.h
+++ b/ports/stm32f4/boards/meowbit_v121/mpconfigboard.h
@@ -38,7 +38,7 @@
 #define BOARD_OSC_DIV 12
 #define BOARD_NO_VBUS_SENSE
 //#define BOARD_VTOR_DEFER //Leave VTOR relocation to bootloader
-#define SHOW_FLASH_SPI
+#define BOARD_USE_INTERNAL_SPI
 
 // On-board flash
 #define SPI_FLASH_MOSI_PIN          (&pin_PB15)
diff --git a/py/circuitpy_mpconfig.h b/py/circuitpy_mpconfig.h
index b5d9bb9a80..5b705a0883 100644
--- a/py/circuitpy_mpconfig.h
+++ b/py/circuitpy_mpconfig.h
@@ -296,7 +296,6 @@ extern const struct _mp_obj_module_t board_module;
 #define BOARD_I2C (defined(DEFAULT_I2C_BUS_SDA) && defined(DEFAULT_I2C_BUS_SCL))
 #define BOARD_SPI (defined(DEFAULT_SPI_BUS_SCK) && defined(DEFAULT_SPI_BUS_MISO) && defined(DEFAULT_SPI_BUS_MOSI))
 #define BOARD_UART (defined(DEFAULT_UART_BUS_RX) && defined(DEFAULT_UART_BUS_TX))
-#define BOARD_INTERNAL_SPI (defined(SHOW_FLASH_SPI))
 
 // I2C and SPI are always allocated off the heap.
 
diff --git a/shared-bindings/board/__init__.h b/shared-bindings/board/__init__.h
index 2842057ad6..a9b652ba8d 100644
--- a/shared-bindings/board/__init__.h
+++ b/shared-bindings/board/__init__.h
@@ -37,8 +37,6 @@ mp_obj_t common_hal_board_get_i2c(void);
 mp_obj_t common_hal_board_create_i2c(void);
 MP_DECLARE_CONST_FUN_OBJ_0(board_i2c_obj);
 
-mp_obj_t common_hal_board_get_internal_spi(void);
-
 mp_obj_t common_hal_board_get_spi(void);
 mp_obj_t common_hal_board_create_spi(void);
 MP_DECLARE_CONST_FUN_OBJ_0(board_spi_obj);
diff --git a/shared-module/board/__init__.c b/shared-module/board/__init__.c
index 8d87a98ebd..914bc43137 100644
--- a/shared-module/board/__init__.c
+++ b/shared-module/board/__init__.c
@@ -29,8 +29,6 @@
 #include "mpconfigboard.h"
 #include "py/runtime.h"
 
-#include "supervisor/spi_flash_api.h"
-
 #if CIRCUITPY_BUSIO
 #include "shared-bindings/busio/I2C.h"
 #include "shared-bindings/busio/SPI.h"
@@ -91,15 +89,6 @@ mp_obj_t common_hal_board_create_spi(void) {
 }
 #endif
 
-#if BOARD_INTERNAL_SPI
-//Provide a reference to the internal SPI, if required. 
-mp_obj_t common_hal_board_get_internal_spi(void) {
-    //TODO: can we change the name of this without having to change every instance of spi in every
-    //flash file? 
-    return (mp_obj_t)(&spi);
-}
-#endif
-
 #if BOARD_UART
 mp_obj_t common_hal_board_get_uart(void) {
     return MP_STATE_VM(shared_uart_bus);
diff --git a/shared-module/displayio/__init__.c b/shared-module/displayio/__init__.c
index 795de7b87b..8d9f148834 100644
--- a/shared-module/displayio/__init__.c
+++ b/shared-module/displayio/__init__.c
@@ -16,6 +16,9 @@
 #include "supervisor/shared/display.h"
 #include "supervisor/memory.h"
 
+#include "supervisor/spi_flash_api.h"
+#include "py/mpconfig.h"
+
 primary_display_t displays[CIRCUITPY_DISPLAY_LIMIT];
 
 // Check for recursive calls to displayio_background.
@@ -100,8 +103,8 @@ void reset_displays(void) {
                         continue;
                     }
                 #endif
-                #if BOARD_INTERNAL_SPI
-                    if (original_spi == common_hal_board_get_internal_spi()) {
+                #ifdef BOARD_USE_INTERNAL_SPI
+                    if (original_spi == (mp_obj_t)(&spi)) {
                         continue;
                     }
                 #endif