From 4e4c28bf27ff4a9e1a2ce5b6fffa641d9a332507 Mon Sep 17 00:00:00 2001
From: Damien George <damien@micropython.org>
Date: Tue, 6 Sep 2022 11:53:36 +1000
Subject: [PATCH] stm32/boards: Only freeze LCD160CR driver in PYB board
 firmware.

Although this driver and associated hardware can be used on any board, it
makes to only freeze it for PYB and PYBD boards.  It can be easily copied
to any board if needed.

Fixes issue #8056.

Signed-off-by: Damien George <damien@micropython.org>
---
 ports/stm32/boards/PYBD_SF2/manifest.py        | 1 +
 ports/stm32/boards/PYBLITEV10/mpconfigboard.mk | 3 +++
 ports/stm32/boards/PYBV10/manifest.py          | 2 ++
 ports/stm32/boards/PYBV10/mpconfigboard.mk     | 3 +++
 ports/stm32/boards/PYBV11/mpconfigboard.mk     | 3 +++
 ports/stm32/boards/manifest.py                 | 1 -
 ports/stm32/boards/manifest_pyboard.py         | 1 +
 7 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 ports/stm32/boards/PYBV10/manifest.py
 create mode 100644 ports/stm32/boards/manifest_pyboard.py

diff --git a/ports/stm32/boards/PYBD_SF2/manifest.py b/ports/stm32/boards/PYBD_SF2/manifest.py
index e4736f693a98..a9e92848d58d 100644
--- a/ports/stm32/boards/PYBD_SF2/manifest.py
+++ b/ports/stm32/boards/PYBD_SF2/manifest.py
@@ -1,2 +1,3 @@
 include("$(PORT_DIR)/boards/manifest.py")
+include("$(PORT_DIR)/boards/manifest_pyboard.py")
 include("$(MPY_DIR)/extmod/webrepl")
diff --git a/ports/stm32/boards/PYBLITEV10/mpconfigboard.mk b/ports/stm32/boards/PYBLITEV10/mpconfigboard.mk
index 8aeaf0e40cfb..74698664760f 100644
--- a/ports/stm32/boards/PYBLITEV10/mpconfigboard.mk
+++ b/ports/stm32/boards/PYBLITEV10/mpconfigboard.mk
@@ -24,3 +24,6 @@ endif
 ifeq ($(BOARD_VARIANT),"network")
 MICROPY_PY_NETWORK_WIZNET5K=5200
 endif
+
+# PYB-specific frozen modules
+FROZEN_MANIFEST ?= boards/PYBV10/manifest.py
diff --git a/ports/stm32/boards/PYBV10/manifest.py b/ports/stm32/boards/PYBV10/manifest.py
new file mode 100644
index 000000000000..ec0d4a26b785
--- /dev/null
+++ b/ports/stm32/boards/PYBV10/manifest.py
@@ -0,0 +1,2 @@
+include("$(PORT_DIR)/boards/manifest.py")
+include("$(PORT_DIR)/boards/manifest_pyboard.py")
diff --git a/ports/stm32/boards/PYBV10/mpconfigboard.mk b/ports/stm32/boards/PYBV10/mpconfigboard.mk
index 97af22b5e19b..af2878267803 100644
--- a/ports/stm32/boards/PYBV10/mpconfigboard.mk
+++ b/ports/stm32/boards/PYBV10/mpconfigboard.mk
@@ -34,3 +34,6 @@ endif
 ifeq ($(BOARD_VARIANT),"network")
 MICROPY_PY_NETWORK_WIZNET5K=5200
 endif
+
+# PYB-specific frozen modules
+FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py
diff --git a/ports/stm32/boards/PYBV11/mpconfigboard.mk b/ports/stm32/boards/PYBV11/mpconfigboard.mk
index 97af22b5e19b..cf7884cfc67a 100644
--- a/ports/stm32/boards/PYBV11/mpconfigboard.mk
+++ b/ports/stm32/boards/PYBV11/mpconfigboard.mk
@@ -34,3 +34,6 @@ endif
 ifeq ($(BOARD_VARIANT),"network")
 MICROPY_PY_NETWORK_WIZNET5K=5200
 endif
+
+# PYB-specific frozen modules
+FROZEN_MANIFEST ?= boards/PYBV10/manifest.py
diff --git a/ports/stm32/boards/manifest.py b/ports/stm32/boards/manifest.py
index 4bb224e2d866..723caa3eb6d1 100644
--- a/ports/stm32/boards/manifest.py
+++ b/ports/stm32/boards/manifest.py
@@ -1,5 +1,4 @@
 include("$(MPY_DIR)/extmod/uasyncio")
 
 include("$(MPY_DIR)/drivers/dht")
-include("$(MPY_DIR)/drivers/display", lcd160cr=True, test=True)
 include("$(MPY_DIR)/drivers/onewire", ds18x20=False)
diff --git a/ports/stm32/boards/manifest_pyboard.py b/ports/stm32/boards/manifest_pyboard.py
new file mode 100644
index 000000000000..e4fb0a8c4dd1
--- /dev/null
+++ b/ports/stm32/boards/manifest_pyboard.py
@@ -0,0 +1 @@
+include("$(MPY_DIR)/drivers/display", lcd160cr=True)