esp32: Allow overriding cmake frozen manifest from the command line.

iabdalkader · dpgeorge · commit 5682595d75c1 · 2022-04-04T23:49:10.000+10:00
If MICROPY_FROZEN_MANIFEST is set from the cmake command line, then it will
override the default and any manifest set by the board.
diff --git a/ports/esp32/CMakeLists.txt b/ports/esp32/CMakeLists.txt
@@ -24,9 +24,20 @@ include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 # Define the output sdkconfig so it goes in the build directory.
 set(SDKCONFIG ${CMAKE_BINARY_DIR}/sdkconfig)
 
+# Save the manifest file set from the cmake command line.
+set(MICROPY_USER_FROZEN_MANIFEST ${MICROPY_FROZEN_MANIFEST})
+
 # Include board config; this is expected to set SDKCONFIG_DEFAULTS (among other options).
 include(${MICROPY_BOARD_DIR}/mpconfigboard.cmake)
 
+# Set the frozen manifest file. Note if MICROPY_FROZEN_MANIFEST is set from the cmake
+# command line, then it will override the default and any manifest set by the board.
+if (MICROPY_USER_FROZEN_MANIFEST)
+    set(MICROPY_FROZEN_MANIFEST ${MICROPY_USER_FROZEN_MANIFEST})
+elseif (NOT MICROPY_FROZEN_MANIFEST)
+    set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
+endif()
+
 # Add sdkconfig fragments that depend on the IDF version.
 if(IDF_VERSION_MAJOR EQUAL 4 AND IDF_VERSION_MINOR LESS 2)
     set(SDKCONFIG_DEFAULTS ${SDKCONFIG_DEFAULTS} boards/sdkconfig.nimble_core0)
diff --git a/ports/esp32/boards/ESP32_S2_WROVER/mpconfigboard.cmake b/ports/esp32/boards/ESP32_S2_WROVER/mpconfigboard.cmake
@@ -6,7 +6,3 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.usb
     boards/ESP32_S2_WROVER/sdkconfig.board
 )
-
-if(NOT MICROPY_FROZEN_MANIFEST)
-    set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
-endif()
diff --git a/ports/esp32/boards/GENERIC/mpconfigboard.cmake b/ports/esp32/boards/GENERIC/mpconfigboard.cmake
@@ -2,6 +2,3 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
     boards/sdkconfig.ble
 )
-if(NOT MICROPY_FROZEN_MANIFEST)
-    set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
-endif()
diff --git a/ports/esp32/boards/GENERIC_C3/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_C3/mpconfigboard.cmake
@@ -4,7 +4,3 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
     boards/sdkconfig.ble
 )
-
-if(NOT MICROPY_FROZEN_MANIFEST)
-    set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
-endif()
diff --git a/ports/esp32/boards/GENERIC_C3_USB/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_C3_USB/mpconfigboard.cmake
@@ -5,7 +5,3 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.ble
     boards/GENERIC_C3_USB/sdkconfig.board
 )
-
-if(NOT MICROPY_FROZEN_MANIFEST)
-    set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
-endif()
diff --git a/ports/esp32/boards/GENERIC_D2WD/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_D2WD/mpconfigboard.cmake
@@ -3,7 +3,3 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.ble
     boards/GENERIC_D2WD/sdkconfig.board
 )
-
-if(NOT MICROPY_FROZEN_MANIFEST)
-    set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
-endif()
diff --git a/ports/esp32/boards/GENERIC_OTA/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_OTA/mpconfigboard.cmake
@@ -3,7 +3,3 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.ble
     boards/GENERIC_OTA/sdkconfig.board
 )
-
-if(NOT MICROPY_FROZEN_MANIFEST)
-    set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
-endif()
diff --git a/ports/esp32/boards/GENERIC_S2/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_S2/mpconfigboard.cmake
@@ -4,7 +4,3 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
     boards/sdkconfig.usb
 )
-
-if(NOT MICROPY_FROZEN_MANIFEST)
-    set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
-endif()
diff --git a/ports/esp32/boards/GENERIC_S3/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_S3/mpconfigboard.cmake
@@ -6,7 +6,3 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.ble
     boards/GENERIC_S3/sdkconfig.board
 )
-
-if(NOT MICROPY_FROZEN_MANIFEST)
-    set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
-endif()
diff --git a/ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_S3_SPIRAM/mpconfigboard.cmake
@@ -6,7 +6,3 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.spiram_sx
     boards/GENERIC_S3_SPIRAM/sdkconfig.board
 )
-
-if(NOT MICROPY_FROZEN_MANIFEST)
-    set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
-endif()
diff --git a/ports/esp32/boards/GENERIC_SPIRAM/mpconfigboard.cmake b/ports/esp32/boards/GENERIC_SPIRAM/mpconfigboard.cmake
@@ -3,7 +3,3 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.ble
     boards/sdkconfig.spiram
 )
-
-if(NOT MICROPY_FROZEN_MANIFEST)
-    set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
-endif()
diff --git a/ports/esp32/boards/LILYGO_TTGO_LORA32/mpconfigboard.cmake b/ports/esp32/boards/LILYGO_TTGO_LORA32/mpconfigboard.cmake
@@ -2,6 +2,5 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
     boards/sdkconfig.ble
 )
-if(NOT MICROPY_FROZEN_MANIFEST)
-    set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
-endif()
+
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
diff --git a/ports/esp32/boards/LOLIN_C3_MINI/mpconfigboard.cmake b/ports/esp32/boards/LOLIN_C3_MINI/mpconfigboard.cmake
@@ -6,6 +6,4 @@ set(SDKCONFIG_DEFAULTS
     boards/LOLIN_C3_MINI/sdkconfig.board
 )
 
-if(NOT MICROPY_FROZEN_MANIFEST)
-    set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
-endif()
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
diff --git a/ports/esp32/boards/LOLIN_S2_MINI/mpconfigboard.cmake b/ports/esp32/boards/LOLIN_S2_MINI/mpconfigboard.cmake
@@ -6,6 +6,4 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.usb
 )
 
-if(NOT MICROPY_FROZEN_MANIFEST)
-    set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
-endif()
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
diff --git a/ports/esp32/boards/LOLIN_S2_PICO/mpconfigboard.cmake b/ports/esp32/boards/LOLIN_S2_PICO/mpconfigboard.cmake
@@ -6,6 +6,4 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.usb
 )
 
-if(NOT MICROPY_FROZEN_MANIFEST)
-    set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
-endif()
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
diff --git a/ports/esp32/boards/M5STACK_ATOM/mpconfigboard.cmake b/ports/esp32/boards/M5STACK_ATOM/mpconfigboard.cmake
@@ -5,6 +5,4 @@ set(SDKCONFIG_DEFAULTS
     boards/M5STACK_ATOM/sdkconfig.board
 )
 
-if(NOT MICROPY_FROZEN_MANIFEST)
-    set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
-endif()
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
diff --git a/ports/esp32/boards/SIL_WESP32/mpconfigboard.cmake b/ports/esp32/boards/SIL_WESP32/mpconfigboard.cmake
@@ -4,7 +4,3 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.240mhz
     boards/SIL_WESP32/sdkconfig.board
 )
-
-if(NOT MICROPY_FROZEN_MANIFEST)
-    set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)
-endif()
diff --git a/ports/esp32/boards/UM_TINYPICO/mpconfigboard.cmake b/ports/esp32/boards/UM_TINYPICO/mpconfigboard.cmake
@@ -6,6 +6,4 @@ set(SDKCONFIG_DEFAULTS
     boards/UM_TINYPICO/sdkconfig.board
 )
 
-if(NOT MICROPY_FROZEN_MANIFEST)
-    set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
-endif()
+set(MICROPY_FROZEN_MANIFEST ${MICROPY_BOARD_DIR}/manifest.py)
diff --git a/ports/esp32/boards/UM_TINYS2/mpconfigboard.cmake b/ports/esp32/boards/UM_TINYS2/mpconfigboard.cmake
@@ -4,5 +4,3 @@ set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.spiram_sx
     boards/sdkconfig.usb
 )
-
-set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,3 @@ set(SDKCONFIG_DEFAULTS`
`6`	`6`	`boards/sdkconfig.usb`
`7`	`7`	`boards/ESP32_S2_WROVER/sdkconfig.board`
`8`	`8`	`)`
`9`		`-`
`10`		`-if(NOT MICROPY_FROZEN_MANIFEST)`
`11`		`- set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)`
`12`		`-endif()`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,3 @@ set(SDKCONFIG_DEFAULTS`
`2`	`2`	`boards/sdkconfig.base`
`3`	`3`	`boards/sdkconfig.ble`
`4`	`4`	`)`
`5`		`-if(NOT MICROPY_FROZEN_MANIFEST)`
`6`		`- set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)`
`7`		`-endif()`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,3 @@ set(SDKCONFIG_DEFAULTS`
`4`	`4`	`boards/sdkconfig.base`
`5`	`5`	`boards/sdkconfig.ble`
`6`	`6`	`)`
`7`		`-`
`8`		`-if(NOT MICROPY_FROZEN_MANIFEST)`
`9`		`- set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)`
`10`		`-endif()`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,3 @@ set(SDKCONFIG_DEFAULTS`
`5`	`5`	`boards/sdkconfig.ble`
`6`	`6`	`boards/GENERIC_C3_USB/sdkconfig.board`
`7`	`7`	`)`
`8`		`-`
`9`		`-if(NOT MICROPY_FROZEN_MANIFEST)`
`10`		`- set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)`
`11`		`-endif()`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,3 @@ set(SDKCONFIG_DEFAULTS`
`3`	`3`	`boards/sdkconfig.ble`
`4`	`4`	`boards/GENERIC_D2WD/sdkconfig.board`
`5`	`5`	`)`
`6`		`-`
`7`		`-if(NOT MICROPY_FROZEN_MANIFEST)`
`8`		`- set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)`
`9`		`-endif()`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,3 @@ set(SDKCONFIG_DEFAULTS`
`3`	`3`	`boards/sdkconfig.ble`
`4`	`4`	`boards/GENERIC_OTA/sdkconfig.board`
`5`	`5`	`)`
`6`		`-`
`7`		`-if(NOT MICROPY_FROZEN_MANIFEST)`
`8`		`- set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)`
`9`		`-endif()`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,3 @@ set(SDKCONFIG_DEFAULTS`
`6`	`6`	`boards/sdkconfig.ble`
`7`	`7`	`boards/GENERIC_S3/sdkconfig.board`
`8`	`8`	`)`
`9`		`-`
`10`		`-if(NOT MICROPY_FROZEN_MANIFEST)`
`11`		`- set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)`
`12`		`-endif()`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,3 @@ set(SDKCONFIG_DEFAULTS`
`6`	`6`	`boards/sdkconfig.spiram_sx`
`7`	`7`	`boards/GENERIC_S3_SPIRAM/sdkconfig.board`
`8`	`8`	`)`
`9`		`-`
`10`		`-if(NOT MICROPY_FROZEN_MANIFEST)`
`11`		`- set(MICROPY_FROZEN_MANIFEST ${MICROPY_PORT_DIR}/boards/manifest.py)`
`12`		`-endif()`