From 1ae4d248829d88ded5dc69ee86cd0fe8f69f18aa Mon Sep 17 00:00:00 2001 From: iabdalkader Date: Sun, 3 Dec 2023 10:19:06 +0100 Subject: [PATCH] ports/All: Add support for passing variables to manifest files. - Pulled from upstream. --- src/Makefile | 2 +- src/micropython | 2 +- src/omv/ports/rp2/omv_portconfig.cmake | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Makefile b/src/Makefile index 70cf08d6a..124639c14 100755 --- a/src/Makefile +++ b/src/Makefile @@ -108,7 +108,7 @@ include $(OMV_BOARD_CONFIG_DIR)/omv_boardconfig.mk #OMV_SRC_QSTR := $(wildcard $(TOP_DIR)/$(OMV_DIR)/modules/*.c) # The following command line args are passed to MicroPython's top Makefile. -MICROPY_ARGS = PORT=$(PORT) BOARD=$(TARGET) DEBUG=$(DEBUG) OMV_LIB_DIR=$(OMV_LIB_DIR)\ +MICROPY_ARGS = PORT=$(PORT) BOARD=$(TARGET) DEBUG=$(DEBUG) MICROPY_MANIFEST_OMV_LIB_DIR=$(OMV_LIB_DIR)\ FROZEN_MANIFEST=$(FROZEN_MANIFEST) OMV_SRC_QSTR="$(OMV_SRC_QSTR)"\ MICROPY_ROM_TEXT_COMPRESSION=$(ROM_TEXT_COMPRESSION) USER_C_MODULES=$(TOP_DIR)/$(OMV_DIR) diff --git a/src/micropython b/src/micropython index 59b60d5fc..b0b6a67f7 160000 --- a/src/micropython +++ b/src/micropython @@ -1 +1 @@ -Subproject commit 59b60d5fc60c4233e94f7f14f865c609e59ea34d +Subproject commit b0b6a67f71373d361cd209a38657edcf0088eb8e diff --git a/src/omv/ports/rp2/omv_portconfig.cmake b/src/omv/ports/rp2/omv_portconfig.cmake index 438de1ed6..52b4c315b 100644 --- a/src/omv/ports/rp2/omv_portconfig.cmake +++ b/src/omv/ports/rp2/omv_portconfig.cmake @@ -19,9 +19,9 @@ set(MLX90641_DIR drivers/mlx90641) set(OPENPDM_DIR ${TOP_DIR}/lib/openpdm) set(TENSORFLOW_DIR ${TOP_DIR}/lib/libtf) set(OMV_BOARD_CONFIG_DIR ${TOP_DIR}/${OMV_DIR}/boards/${TARGET}/) -set(OMV_LIB_DIR ${TOP_DIR}/../scripts/libraries) set(OMV_COMMON_DIR ${TOP_DIR}/${OMV_DIR}/common) set(PORT_DIR ${TOP_DIR}/${OMV_DIR}/ports/${PORT}) +set(MICROPY_MANIFEST_OMV_LIB_DIR ${TOP_DIR}/../scripts/libraries) # Include board cmake fragment include(${OMV_BOARD_CONFIG_DIR}/omv_boardconfig.cmake)