mirrors/micropython
1
0
Fork 0
mirror of https://github.com/licsber/micropython.git synced 2024-09-20 09:00:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

esp32: Restore FROZEN_MANIFEST support with new CMake build system.

Browse Source 
This commit re-enables the command-line make option "FROZEN_MANIFEST".  The
boards/*/mpconfigboard.cmake will now use the command-line FROZEN_MANIFEST
value if supplied.

Usage: make FROZEN_MANIFEST=~/foo/my-manifest.py
This commit is contained in:
Steve App 2021-04-25 11:05:47 +01:00 committed by Damien George
parent a708848b0c
commit 21fee92be6
7 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports/esp32/Makefile
View File

@ -26,6 +26,10 @@ endif
IDFPY_FLAGS += -D MICROPY_BOARD=$(BOARD) -B $(BUILD) $(CMAKE_ARGS) IDFPY_FLAGS += -D MICROPY_BOARD=$(BOARD) -B $(BUILD) $(CMAKE_ARGS)
ifdef FROZEN_MANIFEST
IDFPY_FLAGS += -D MICROPY_FROZEN_MANIFEST=$(FROZEN_MANIFEST)
endif
all: all:
idf.py $(IDFPY_FLAGS) build idf.py $(IDFPY_FLAGS) build
@$(PYTHON) makeimg.py \ @$(PYTHON) makeimg.py \

5
ports/esp32/boards/GENERIC/mpconfigboard.cmake
View File

@ -2,5 +2,6 @@ set(SDKCONFIG_DEFAULTS
boards/sdkconfig.base boards/sdkconfig.base
boards/sdkconfig.ble boards/sdkconfig.ble
) )
if(NOT MICROPY_FROZEN_MANIFEST)
set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py) set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
endif()

4
ports/esp32/boards/GENERIC_D2WD/mpconfigboard.cmake
View File

@ -4,4 +4,6 @@ set(SDKCONFIG_DEFAULTS
boards/GENERIC_D2WD/sdkconfig.board boards/GENERIC_D2WD/sdkconfig.board
) )
set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py) if(NOT MICROPY_FROZEN_MANIFEST)
set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
endif()

4
ports/esp32/boards/GENERIC_OTA/mpconfigboard.cmake
View File

@ -4,4 +4,6 @@ set(SDKCONFIG_DEFAULTS
boards/GENERIC_OTA/sdkconfig.board boards/GENERIC_OTA/sdkconfig.board
) )
set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py) if(NOT MICROPY_FROZEN_MANIFEST)
set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
endif()

4
ports/esp32/boards/GENERIC_S2/mpconfigboard.cmake
View File

@ -5,4 +5,6 @@ set(SDKCONFIG_DEFAULTS
boards/sdkconfig.usb boards/sdkconfig.usb
) )
set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py) if(NOT MICROPY_FROZEN_MANIFEST)
set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
endif()

4
ports/esp32/boards/GENERIC_SPIRAM/mpconfigboard.cmake
View File

@ -4,4 +4,6 @@ set(SDKCONFIG_DEFAULTS
boards/sdkconfig.spiram boards/sdkconfig.spiram
) )
set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py) if(NOT MICROPY_FROZEN_MANIFEST)
set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
endif()

4
ports/esp32/boards/TINYPICO/mpconfigboard.cmake
View File

@ -6,4 +6,6 @@ set(SDKCONFIG_DEFAULTS
boards/TINYPICO/sdkconfig.board boards/TINYPICO/sdkconfig.board
) )
set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py) if(NOT MICROPY_FROZEN_MANIFEST)
set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
endif()