stm32: Convert to use FROZEN_MANIFEST to specify frozen code.

All symlinks are removed, frozen files are now referenced via
boards/manifest.py.

11 files changed, 12 insertions, 13 deletions

diff --git a/ports/stm32/Makefile b/ports/stm32/Makefile
index 112271fe18..30d4d9b48f 100644
--- a/ports/stm32/Makefile
+++ b/ports/stm32/Makefile
@@ -18,8 +18,8 @@ include $(BOARD_DIR)/mpconfigboard.mk
 QSTR_DEFS = qstrdefsport.h $(BUILD)/pins_qstr.h $(BUILD)/modstm_qstr.h
 QSTR_GLOBAL_DEPENDENCIES = mpconfigboard_common.h $(BOARD_DIR)/mpconfigboard.h
 
-# directory containing scripts to be frozen as bytecode
-FROZEN_MPY_DIR ?= modules
+# File containing description of content to be frozen into firmware.
+FROZEN_MANIFEST ?= boards/manifest.py
 
 # include py core make definitions
 include $(TOP)/py/py.mk
@@ -485,13 +485,13 @@ $(TOP)/lib/stm32lib/README.md:
 	$(ECHO) "stm32lib submodule not found, fetching it now..."
 	(cd $(TOP) && git submodule update --init lib/stm32lib)
 
-ifneq ($(FROZEN_DIR),)
+ifneq ($(FROZEN_MANIFEST)$(FROZEN_DIR),)
 # To use frozen source modules, put your .py files in a subdirectory (eg scripts/)
 # and then invoke make with FROZEN_DIR=scripts (be sure to build from scratch).
 CFLAGS += -DMICROPY_MODULE_FROZEN_STR
 endif
 
-ifneq ($(FROZEN_MPY_DIR),)
+ifneq ($(FROZEN_MANIFEST)$(FROZEN_MPY_DIR),)
 # To use frozen bytecode, put your .py files in a subdirectory (eg frozen/) and
 # then invoke make with FROZEN_MPY_DIR=frozen (be sure to build from scratch).
 CFLAGS += -DMICROPY_QSTR_EXTRA_POOL=mp_qstr_frozen_const_pool
diff --git a/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.mk b/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.mk
index 084cf4d309..e2ced61183 100644
--- a/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.mk
+++ b/ports/stm32/boards/B_L072Z_LRWAN1/mpconfigboard.mk
@@ -5,4 +5,4 @@ AF_FILE = boards/stm32l072_af.csv
 LD_FILES = boards/stm32l072xz.ld boards/common_basic.ld
 
 # Don't include default frozen modules because MCU is tight on flash space
-FROZEN_MPY_DIR ?=
+FROZEN_MANIFEST ?=
diff --git a/ports/stm32/boards/ESPRUINO_PICO/mpconfigboard.mk b/ports/stm32/boards/ESPRUINO_PICO/mpconfigboard.mk
index 16cacc089e..d40825ec85 100644
--- a/ports/stm32/boards/ESPRUINO_PICO/mpconfigboard.mk
+++ b/ports/stm32/boards/ESPRUINO_PICO/mpconfigboard.mk
@@ -6,4 +6,4 @@ TEXT0_ADDR = 0x08000000
 TEXT1_ADDR = 0x08020000
 
 # Don't include default frozen modules because MCU is tight on flash space
-FROZEN_MPY_DIR ?=
+FROZEN_MANIFEST ?=
diff --git a/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.mk
index 1d66f7e6b6..5efa0d4a5d 100644
--- a/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_F091RC/mpconfigboard.mk
@@ -4,4 +4,4 @@ AF_FILE = boards/stm32f091_af.csv
 LD_FILES = boards/stm32f091xc.ld boards/common_basic.ld
 
 # Don't include default frozen modules because MCU is tight on flash space
-FROZEN_MPY_DIR ?=
+FROZEN_MANIFEST ?=
diff --git a/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.mk
index 69601f8602..5afe134ba0 100644
--- a/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_L073RZ/mpconfigboard.mk
@@ -4,4 +4,4 @@ AF_FILE = boards/stm32l072_af.csv
 LD_FILES = boards/stm32l072xz.ld boards/common_basic.ld
 
 # Don't include default frozen modules because MCU is tight on flash space
-FROZEN_MPY_DIR ?=
+FROZEN_MANIFEST ?=
diff --git a/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.mk b/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.mk
index 46697348fe..7c7cd34f0e 100644
--- a/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.mk
+++ b/ports/stm32/boards/NUCLEO_L432KC/mpconfigboard.mk
@@ -5,4 +5,4 @@ LD_FILES = boards/stm32l432.ld boards/common_basic.ld
 OPENOCD_CONFIG = boards/openocd_stm32l4.cfg
 
 # Don't include default frozen modules because MCU is tight on flash space
-FROZEN_MPY_DIR ?=
+FROZEN_MANIFEST ?=
diff --git a/ports/stm32/boards/manifest.py b/ports/stm32/boards/manifest.py
new file mode 100644
index 0000000000..99b08cca00
--- /dev/null
+++ b/ports/stm32/boards/manifest.py
@@ -0,0 +1,3 @@
+freeze('$(MPY)/drivers/dht', 'dht.py')
+freeze('$(MPY)/drivers/display', ('lcd160cr.py', 'lcd160cr_test.py'))
+freeze('$(MPY)/drivers/onewire', 'onewire.py')
diff --git a/ports/stm32/modules/dht.py b/ports/stm32/modules/dht.py
deleted file mode 120000
index 2aa2f5cbfe..0000000000
--- a/ports/stm32/modules/dht.py
+++ /dev/null
@@ -1 +0,0 @@
-../../../drivers/dht/dht.py
\ No newline at end of file
diff --git a/ports/stm32/modules/lcd160cr.py b/ports/stm32/modules/lcd160cr.py
deleted file mode 120000
index 9e63f1d23f..0000000000
--- a/ports/stm32/modules/lcd160cr.py
+++ /dev/null
@@ -1 +0,0 @@
-../../../drivers/display/lcd160cr.py
\ No newline at end of file
diff --git a/ports/stm32/modules/lcd160cr_test.py b/ports/stm32/modules/lcd160cr_test.py
deleted file mode 120000
index 5f5bcc1281..0000000000
--- a/ports/stm32/modules/lcd160cr_test.py
+++ /dev/null
@@ -1 +0,0 @@
-../../../drivers/display/lcd160cr_test.py
\ No newline at end of file
diff --git a/ports/stm32/modules/onewire.py b/ports/stm32/modules/onewire.py
deleted file mode 120000
index 33f30e84f1..0000000000
--- a/ports/stm32/modules/onewire.py
+++ /dev/null
@@ -1 +0,0 @@
-../../../drivers/onewire/onewire.py
\ No newline at end of file