diff --git a/micropython/board/PICO/manifest.py b/micropython/board/PICO/manifest.py new file mode 100644 index 00000000..30ce0dd2 --- /dev/null +++ b/micropython/board/PICO/manifest.py @@ -0,0 +1,3 @@ +include("$(PORT_DIR)/boards/manifest.py") + +include("../manifest_pico.py") \ No newline at end of file diff --git a/micropython/board/PICO/mpconfigboard.cmake b/micropython/board/PICO/mpconfigboard.cmake index 6512b7f3..4ec156b0 100644 --- a/micropython/board/PICO/mpconfigboard.cmake +++ b/micropython/board/PICO/mpconfigboard.cmake @@ -1,2 +1,6 @@ # cmake file for Raspberry Pi Pico + +# Board specific version of the frozen manifest +set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py) + set(MICROPY_C_HEAP_SIZE 4096) \ No newline at end of file diff --git a/micropython/board/PICO_W/manifest.py b/micropython/board/PICO_W/manifest.py index e8f4e278..4a75556e 100644 --- a/micropython/board/PICO_W/manifest.py +++ b/micropython/board/PICO_W/manifest.py @@ -1,3 +1,5 @@ include("$(PORT_DIR)/boards/manifest.py") -require("bundle-networking") \ No newline at end of file +require("bundle-networking") + +include("../manifest_picow.py") \ No newline at end of file diff --git a/micropython/board/PICO_W_ENVIRO/manifest.py b/micropython/board/PICO_W_ENVIRO/manifest.py index 59f779eb..c4c9c685 100644 --- a/micropython/board/PICO_W_ENVIRO/manifest.py +++ b/micropython/board/PICO_W_ENVIRO/manifest.py @@ -3,3 +3,6 @@ include("$(PORT_DIR)/boards/manifest.py") # https://github.com/micropython/micropython-lib/blob/master/micropython/bundles/bundle-networking/manifest.py require("bundle-networking") require("umqtt.simple") + +freeze("../../modules_py", "pimoroni.py") +freeze("../../modules_py", "boot.py") diff --git a/micropython/board/PICO_W_INKY/manifest.py b/micropython/board/PICO_W_INKY/manifest.py index 571ec4ef..657bf9f9 100644 --- a/micropython/board/PICO_W_INKY/manifest.py +++ b/micropython/board/PICO_W_INKY/manifest.py @@ -3,4 +3,7 @@ include("$(PORT_DIR)/boards/manifest.py") # https://github.com/micropython/micropython-lib/blob/master/micropython/bundles/bundle-networking/manifest.py require("bundle-networking") require("urllib.urequest") -require("umqtt.simple") \ No newline at end of file +require("umqtt.simple") + +freeze("../../modules_py", "pimoroni.py") +freeze("../../modules_py", "boot.py") \ No newline at end of file diff --git a/micropython/board/PIMORONI_PICOLIPO_16MB/manifest.py b/micropython/board/PIMORONI_PICOLIPO_16MB/manifest.py new file mode 100644 index 00000000..30ce0dd2 --- /dev/null +++ b/micropython/board/PIMORONI_PICOLIPO_16MB/manifest.py @@ -0,0 +1,3 @@ +include("$(PORT_DIR)/boards/manifest.py") + +include("../manifest_pico.py") \ No newline at end of file diff --git a/micropython/board/PIMORONI_PICOLIPO_16MB/mpconfigboard.cmake b/micropython/board/PIMORONI_PICOLIPO_16MB/mpconfigboard.cmake index 92f79e52..8777c6ab 100644 --- a/micropython/board/PIMORONI_PICOLIPO_16MB/mpconfigboard.cmake +++ b/micropython/board/PIMORONI_PICOLIPO_16MB/mpconfigboard.cmake @@ -1,2 +1,6 @@ # cmake file for Pimoroni Pico LiPo 16MB + +# Board specific version of the frozen manifest +set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py) + set(MICROPY_C_HEAP_SIZE 4096) diff --git a/micropython/board/PIMORONI_PICOLIPO_4MB/manifest.py b/micropython/board/PIMORONI_PICOLIPO_4MB/manifest.py new file mode 100644 index 00000000..30ce0dd2 --- /dev/null +++ b/micropython/board/PIMORONI_PICOLIPO_4MB/manifest.py @@ -0,0 +1,3 @@ +include("$(PORT_DIR)/boards/manifest.py") + +include("../manifest_pico.py") \ No newline at end of file diff --git a/micropython/board/PIMORONI_PICOLIPO_4MB/mpconfigboard.cmake b/micropython/board/PIMORONI_PICOLIPO_4MB/mpconfigboard.cmake index 5c2aa5c6..65fb6885 100644 --- a/micropython/board/PIMORONI_PICOLIPO_4MB/mpconfigboard.cmake +++ b/micropython/board/PIMORONI_PICOLIPO_4MB/mpconfigboard.cmake @@ -1,2 +1,6 @@ # cmake file for Pimoroni Pico LiPo 4MB + +# Board specific version of the frozen manifest +set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py) + set(MICROPY_C_HEAP_SIZE 4096) diff --git a/micropython/board/PIMORONI_TINY2040/manifest.py b/micropython/board/PIMORONI_TINY2040/manifest.py new file mode 100644 index 00000000..30ce0dd2 --- /dev/null +++ b/micropython/board/PIMORONI_TINY2040/manifest.py @@ -0,0 +1,3 @@ +include("$(PORT_DIR)/boards/manifest.py") + +include("../manifest_pico.py") \ No newline at end of file diff --git a/micropython/board/PIMORONI_TINY2040/mpconfigboard.cmake b/micropython/board/PIMORONI_TINY2040/mpconfigboard.cmake index 7474782f..487923b2 100644 --- a/micropython/board/PIMORONI_TINY2040/mpconfigboard.cmake +++ b/micropython/board/PIMORONI_TINY2040/mpconfigboard.cmake @@ -1,2 +1,6 @@ # cmake file for Pimoroni Tiny 2040 + +# Board specific version of the frozen manifest +set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py) + set(MICROPY_C_HEAP_SIZE 4096) diff --git a/micropython/board/PIMORONI_TUFTY2040/manifest.py b/micropython/board/PIMORONI_TUFTY2040/manifest.py new file mode 100644 index 00000000..570280a8 --- /dev/null +++ b/micropython/board/PIMORONI_TUFTY2040/manifest.py @@ -0,0 +1,4 @@ +include("$(PORT_DIR)/boards/manifest.py") + +freeze("../../modules_py", "pimoroni.py") +freeze("../../modules_py", "boot.py") \ No newline at end of file diff --git a/micropython/board/PIMORONI_TUFTY2040/mpconfigboard.cmake b/micropython/board/PIMORONI_TUFTY2040/mpconfigboard.cmake index 2268a6df..9c060733 100644 --- a/micropython/board/PIMORONI_TUFTY2040/mpconfigboard.cmake +++ b/micropython/board/PIMORONI_TUFTY2040/mpconfigboard.cmake @@ -4,4 +4,7 @@ set(PICO_BOARD "pimoroni_tufty2040") # Allow Pico SDK to locate "pimoroni_tufty2040.h" in this directory. list(APPEND PICO_BOARD_HEADER_DIRS "${CMAKE_CURRENT_LIST_DIR}") +# Board specific version of the frozen manifest +set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py) + set(MICROPY_C_HEAP_SIZE 4096) \ No newline at end of file diff --git a/micropython/board/manifest_pico.py b/micropython/board/manifest_pico.py new file mode 100644 index 00000000..a01f7034 --- /dev/null +++ b/micropython/board/manifest_pico.py @@ -0,0 +1,5 @@ +freeze("../modules_py", "gfx_pack.py") +freeze("../modules_py", "interstate75.py") + +freeze("../modules_py", "pimoroni.py") +freeze("../modules_py", "boot.py") \ No newline at end of file diff --git a/micropython/board/manifest_picow.py b/micropython/board/manifest_picow.py new file mode 100644 index 00000000..2ee55424 --- /dev/null +++ b/micropython/board/manifest_picow.py @@ -0,0 +1,7 @@ +freeze("../modules_py", "gfx_pack.py") +freeze("../modules_py", "interstate75.py") +freeze("../modules_py", "automation.py") +freeze("../modules_py", "inventor.py") + +freeze("../modules_py", "pimoroni.py") +freeze("../modules_py", "boot.py") \ No newline at end of file diff --git a/micropython/modules/micropython-common.cmake b/micropython/modules/micropython-common.cmake index b83bc99a..d97ec6c9 100644 --- a/micropython/modules/micropython-common.cmake +++ b/micropython/modules/micropython-common.cmake @@ -41,12 +41,12 @@ endif() include(modules_py/modules_py) # Most board specific ports wont need all of these -copy_module(gfx_pack.py) -copy_module(interstate75.py) -if(PICO_BOARD STREQUAL "pico_w") - copy_module(automation.py) - copy_module(inventor.py) -endif() +# copy_module(gfx_pack.py) +# copy_module(interstate75.py) +# if(PICO_BOARD STREQUAL "pico_w") +# copy_module(automation.py) +# copy_module(inventor.py) +# endif() # Must call `enable_ulab()` to enable include(micropython-common-ulab) \ No newline at end of file diff --git a/micropython/modules_py/modules_py.cmake b/micropython/modules_py/modules_py.cmake index 8ab1e43e..f0951441 100644 --- a/micropython/modules_py/modules_py.cmake +++ b/micropython/modules_py/modules_py.cmake @@ -33,5 +33,5 @@ target_link_libraries(usermod INTERFACE usermod_modules_py) genversion(version.py) # .py files to copy from modules_py to ports/rp2/modules -copy_module(pimoroni.py) -copy_module(boot.py) +# copy_module(pimoroni.py) +# copy_module(boot.py)