esp32: Convert to use FROZEN_MANIFEST to specify frozen code.

All symlinks are removed.  boards/manifest.py is used as a default, and can
optionally use boards/manifest_release.py for more scripts.

16 files changed, 15 insertions, 15 deletions

diff --git a/ports/esp32/Makefile b/ports/esp32/Makefile
index 2a752553e..37261d17b 100644
--- a/ports/esp32/Makefile
+++ b/ports/esp32/Makefile
@@ -32,8 +32,7 @@ MICROPY_SSL_AXTLS = 0
 MICROPY_FATFS = 1
 MICROPY_PY_BTREE = 1
 
-#FROZEN_DIR = scripts
-FROZEN_MPY_DIR = modules
+FROZEN_MANIFEST ?= boards/manifest.py
 
 # include py core make definitions
 include $(TOP)/py/py.mk
diff --git a/ports/esp32/boards/manifest.py b/ports/esp32/boards/manifest.py
new file mode 100644
index 000000000..3da8af57f
--- /dev/null
+++ b/ports/esp32/boards/manifest.py
@@ -0,0 +1,6 @@
+freeze('modules')
+freeze('$(MPY)/tools', ('upip.py', 'upip_utarfile.py'))
+freeze('$(MPY)/ports/esp8266/modules', 'ntptime.py')
+freeze('$(MPY)/ports/esp8266/modules', ('webrepl.py', 'webrepl_setup.py', 'websocket_helper.py',))
+freeze('$(MPY)/drivers/dht', 'dht.py')
+freeze('$(MPY)/drivers/onewire')
diff --git a/ports/esp32/boards/manifest_release.py b/ports/esp32/boards/manifest_release.py
new file mode 100644
index 000000000..e56704d02
--- /dev/null
+++ b/ports/esp32/boards/manifest_release.py
@@ -0,0 +1,8 @@
+include('boards/manifest.py')
+
+LIB = '../../../micropython-lib'
+
+freeze(LIB + '/upysh', 'upysh.py')
+freeze(LIB + '/urequests', 'urequests.py')
+freeze(LIB + '/umqtt.simple', 'umqtt/simple.py')
+freeze(LIB + '/umqtt.robust', 'umqtt/robust.py')
diff --git a/ports/esp32/modules/dht.py b/ports/esp32/modules/dht.py
deleted file mode 120000
index 2aa2f5cbf..000000000
--- a/ports/esp32/modules/dht.py
+++ /dev/null
@@ -1 +0,0 @@
-../../../drivers/dht/dht.py
\ No newline at end of file
diff --git a/ports/esp32/modules/ds18x20.py b/ports/esp32/modules/ds18x20.py
deleted file mode 120000
index 9721929a3..000000000
--- a/ports/esp32/modules/ds18x20.py
+++ /dev/null
@@ -1 +0,0 @@
-../../esp8266/modules/ds18x20.py
\ No newline at end of file
diff --git a/ports/esp32/modules/ntptime.py b/ports/esp32/modules/ntptime.py
deleted file mode 120000
index e90900d5a..000000000
--- a/ports/esp32/modules/ntptime.py
+++ /dev/null
@@ -1 +0,0 @@
-../../esp8266/modules/ntptime.py
\ No newline at end of file
diff --git a/ports/esp32/modules/onewire.py b/ports/esp32/modules/onewire.py
deleted file mode 120000
index 091629488..000000000
--- a/ports/esp32/modules/onewire.py
+++ /dev/null
@@ -1 +0,0 @@
-../../esp8266/modules/onewire.py
\ No newline at end of file
diff --git a/ports/esp32/modules/umqtt/robust.py b/ports/esp32/modules/umqtt/robust.py
deleted file mode 120000
index 6bfbbcf55..000000000
--- a/ports/esp32/modules/umqtt/robust.py
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../micropython-lib/umqtt.robust/umqtt/robust.py
\ No newline at end of file
diff --git a/ports/esp32/modules/umqtt/simple.py b/ports/esp32/modules/umqtt/simple.py
deleted file mode 120000
index 6419a4664..000000000
--- a/ports/esp32/modules/umqtt/simple.py
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../micropython-lib/umqtt.simple/umqtt/simple.py
\ No newline at end of file
diff --git a/ports/esp32/modules/upip.py b/ports/esp32/modules/upip.py
deleted file mode 120000
index 130eb6901..000000000
--- a/ports/esp32/modules/upip.py
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/upip.py
\ No newline at end of file
diff --git a/ports/esp32/modules/upip_utarfile.py b/ports/esp32/modules/upip_utarfile.py
deleted file mode 120000
index d9653d6a6..000000000
--- a/ports/esp32/modules/upip_utarfile.py
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/upip_utarfile.py
\ No newline at end of file
diff --git a/ports/esp32/modules/upysh.py b/ports/esp32/modules/upysh.py
deleted file mode 120000
index 12d100c29..000000000
--- a/ports/esp32/modules/upysh.py
+++ /dev/null
@@ -1 +0,0 @@
-../../../../micropython-lib/upysh/upysh.py
\ No newline at end of file
diff --git a/ports/esp32/modules/urequests.py b/ports/esp32/modules/urequests.py
deleted file mode 120000
index 76661112e..000000000
--- a/ports/esp32/modules/urequests.py
+++ /dev/null
@@ -1 +0,0 @@
-../../../../micropython-lib/urequests/urequests.py
\ No newline at end of file
diff --git a/ports/esp32/modules/webrepl.py b/ports/esp32/modules/webrepl.py
deleted file mode 120000
index 2a3987a72..000000000
--- a/ports/esp32/modules/webrepl.py
+++ /dev/null
@@ -1 +0,0 @@
-../../esp8266/modules/webrepl.py
\ No newline at end of file
diff --git a/ports/esp32/modules/webrepl_setup.py b/ports/esp32/modules/webrepl_setup.py
deleted file mode 120000
index 999888bf1..000000000
--- a/ports/esp32/modules/webrepl_setup.py
+++ /dev/null
@@ -1 +0,0 @@
-../../esp8266/modules/webrepl_setup.py
\ No newline at end of file
diff --git a/ports/esp32/modules/websocket_helper.py b/ports/esp32/modules/websocket_helper.py
deleted file mode 120000
index 4bcf3bcb6..000000000
--- a/ports/esp32/modules/websocket_helper.py
+++ /dev/null
@@ -1 +0,0 @@
-../../esp8266/modules/websocket_helper.py
\ No newline at end of file