summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan Halbert <halbert@adafruit.com>2020-02-28 21:05:19 -0500
committerGitHub <noreply@github.com>2020-02-28 21:05:19 -0500
commit29e44721d2d4712de865aa3a3b8fdd5de90c029b (patch)
treef3453c8e24bd37a32c30bc0e7e07b2f997362f0b
parent0c2894c72548a08d58e6cf300927e076f9331350 (diff)
parent0af00cf9144a1fbbe3ab30abdcb6ec8129dd5ce9 (diff)
Merge pull request #2665 from arturo182/esp32_freeze
Freeze adafruit_requests and adafruit_esp32spi into mimxrt1011 Feathers
-rw-r--r--.gitmodules6
m---------frozen/Adafruit_CircuitPython_ESP32SPI0
m---------frozen/Adafruit_CircuitPython_Requests0
-rw-r--r--ports/mimxrt10xx/boards/feather_m7_1011/mpconfigboard.mk4
-rw-r--r--ports/mimxrt10xx/boards/feather_mimxrt1011/mpconfigboard.mk4
5 files changed, 14 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index 88d46f69d..74ba714b2 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -114,3 +114,9 @@
[submodule "frozen/Adafruit_CircuitPython_Register"]
path = frozen/Adafruit_CircuitPython_Register
url = https://github.com/adafruit/Adafruit_CircuitPython_Register.git
+[submodule "frozen/Adafruit_CircuitPython_ESP32SPI"]
+ path = frozen/Adafruit_CircuitPython_ESP32SPI
+ url = https://github.com/adafruit/Adafruit_CircuitPython_ESP32SPI
+[submodule "frozen/Adafruit_CircuitPython_Requests"]
+ path = frozen/Adafruit_CircuitPython_Requests
+ url = https://github.com/adafruit/Adafruit_CircuitPython_Requests
diff --git a/frozen/Adafruit_CircuitPython_ESP32SPI b/frozen/Adafruit_CircuitPython_ESP32SPI
new file mode 160000
+Subproject f523b2316bc3e25220b88c5435868c6a5880dfa
diff --git a/frozen/Adafruit_CircuitPython_Requests b/frozen/Adafruit_CircuitPython_Requests
new file mode 160000
+Subproject e8a759719e94c69a01f9e07d418ca6db39114db
diff --git a/ports/mimxrt10xx/boards/feather_m7_1011/mpconfigboard.mk b/ports/mimxrt10xx/boards/feather_m7_1011/mpconfigboard.mk
index 670b48b60..fbaf5d399 100644
--- a/ports/mimxrt10xx/boards/feather_m7_1011/mpconfigboard.mk
+++ b/ports/mimxrt10xx/boards/feather_m7_1011/mpconfigboard.mk
@@ -6,3 +6,7 @@ USB_MANUFACTURER = "Adafruit"
CHIP_VARIANT = MIMXRT1011DAE5A
CHIP_FAMILY = MIMXRT1011
FLASH = W25Q32JV
+
+# Include these Python libraries in the firmware
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_ESP32SPI
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests
diff --git a/ports/mimxrt10xx/boards/feather_mimxrt1011/mpconfigboard.mk b/ports/mimxrt10xx/boards/feather_mimxrt1011/mpconfigboard.mk
index 08164b140..60eed8a80 100644
--- a/ports/mimxrt10xx/boards/feather_mimxrt1011/mpconfigboard.mk
+++ b/ports/mimxrt10xx/boards/feather_mimxrt1011/mpconfigboard.mk
@@ -6,3 +6,7 @@ USB_MANUFACTURER = "arturo182"
CHIP_VARIANT = MIMXRT1011DAE5A
CHIP_FAMILY = MIMXRT1011
FLASH = W25Q64JV
+
+# Include these Python libraries in the firmware
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_ESP32SPI
+FROZEN_MPY_DIRS += $(TOP)/frozen/Adafruit_CircuitPython_Requests