summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Halbert <halbert@halwitz.org>2018-12-27 10:12:30 -0500
committerGitHub <noreply@github.com>2018-12-27 10:12:30 -0500
commitddf0d3fc5335e076f150f3e5fe506a6978eb35b3 (patch)
treea634861836cc3a0ce9846e9760c61c3b443714b7
parent6d60b817f373575091d7ab54737621bccccc2c8f (diff)
parent55084b30efc5066a2aa43943de3d01e3b0277d06 (diff)
Merge pull request #1427 from jerryneedell/jerryn_argon
remove FRAMEBUF from nrf builds - use QSPI for particle ARGON
-rw-r--r--ports/nrf/boards/particle_argon/mpconfigboard.mk2
-rw-r--r--ports/nrf/mpconfigport.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/ports/nrf/boards/particle_argon/mpconfigboard.mk b/ports/nrf/boards/particle_argon/mpconfigboard.mk
index 071948821..ee30c2be9 100644
--- a/ports/nrf/boards/particle_argon/mpconfigboard.mk
+++ b/ports/nrf/boards/particle_argon/mpconfigboard.mk
@@ -20,6 +20,6 @@ endif
NRF_DEFINES += -DNRF52840_XXAA -DNRF52840
-SPI_FLASH_FILESYSTEM = 1
+QSPI_FLASH_FILESYSTEM = 1
EXTERNAL_FLASH_DEVICE_COUNT = 1
EXTERNAL_FLASH_DEVICES = "MX25L3233F"
diff --git a/ports/nrf/mpconfigport.h b/ports/nrf/mpconfigport.h
index db384d510..25710cea2 100644
--- a/ports/nrf/mpconfigport.h
+++ b/ports/nrf/mpconfigport.h
@@ -117,7 +117,7 @@
#define MICROPY_PY_UHEAPQ (0)
#define MICROPY_PY_UHASHLIB (1)
#define MICROPY_PY_STRUCT (0)
-#define MICROPY_PY_FRAMEBUF (1)
+#define MICROPY_PY_FRAMEBUF (0)
#define MICROPY_KBD_EXCEPTION (1)