chore/m5stack: Modify build script

Author: lbuque

m5stack/CMakeLists.txt

@@ -21,15 +21,23 @@ if(NOT EXISTS ${MICROPY_BOARD_DIR}/mpconfigboard.cmake)
     message(FATAL_ERROR "Invalid MICROPY_BOARD specified: ${MICROPY_BOARD}")
 endif()
 
-# Include main IDF cmake file.
-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 ${CMAKE_CURRENT_LIST_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)
@@ -56,5 +64,11 @@ if(BUILD_WITH_LVGL)
     idf_build_set_property(COMPILE_DEFINITIONS "${LV_CFLAGS}" APPEND)
 endif()
 
+# Include main IDF cmake file.
+include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+
+# Set the location of the main component for the project (one per target).
+list(APPEND EXTRA_COMPONENT_DIRS main_${IDF_TARGET})
+
 # Define the project.
 project(micropython)

m5stack/main/CMakeListsDefault.cmake renamed to m5stack/CMakeListsDefault.cmake

@@ -129,41 +129,40 @@ set(MICROPY_SOURCE_QSTR
 
 set(IDF_COMPONENTS
     app_update
-    esp_app_format
     bootloader_support
     bt
     driver
-    # esp_adc_cal
     esp_adc
     esp_app_format
     esp_common
     esp_eth
     esp_event
     esp_hw_support
+    esp_netif
+    esp_partition
+    esp_pm
+    esp_psram
     esp_ringbuf
     esp_rom
+    esp_system
+    esp_timer
     esp_wifi
     freertos
+    hal
     heap
     log
     lwip
     mbedtls
-    mdns
     newlib
     nvs_flash
     sdmmc
     soc
     spi_flash
-    esp_psram
-    esp_partition
-    # tcpip_adapter
-    esp_netif
     ulp
     vfs
     xtensa
     esp_http_client
     esp-tls
-    nghttp
     libffi
     json
     M5Unified

m5stack/main/CMakeListsLvgl.cmake renamed to m5stack/CMakeListsLvgl.cmake

@@ -122,18 +122,14 @@ define pack_fw
 		$(BUILD)/uiflow-Sx-$(GIT_VERSION).uf2
 endef
 
-.PHONY: all target menu build deploy flash flash_all clean erase nvs fs pack pack_all littlefs mpy-cross submodules FORCE
+.PHONY: all menu build deploy flash flash_all clean erase nvs fs pack pack_all littlefs mpy-cross submodules FORCE
 
 all: nvs fs pack
 	@echo ""
 	@echo "Done, default packed firmware don't include vfs filesystem, if need vfs filesystem, please use 'make pack_all' command."
 
 $(BUILD)/bootloader/bootloader.bin $(BUILD)/partition_table/partition-table.bin $(BUILD)/micropython.bin: FORCE
 
-# set the target
-target:
-	idf.py $(IDFPY_FLAGS) set-target $(CHIP)
-
 # config the menu
 menu:
 	idf.py $(IDFPY_FLAGS) menuconfig
@@ -142,7 +138,7 @@ size:
 	idf.py $(IDFPY_FLAGS) size
 
 # Build the MicroPython firmware.
-build: target nvs
+build: nvs
 	idf.py $(IDFPY_FLAGS) build
 
 # Deploy the MicroPython.
@@ -237,9 +233,9 @@ mpy-cross:
 # TODO: need update this :)
 submodules:
 	git submodule update --init ../tools/littlefs/mbed-littlefs
-	# git submodule update --init ./components/esp32-camera
-	# git submodule update --init ./components/M5Unified/M5GFX
-	# git submodule update --init ./components/M5Unified/M5Unified
+	git submodule update --init ./components/esp32-camera
+	git submodule update --init ./components/M5Unified/M5GFX
+	git submodule update --init ./components/M5Unified/M5Unified
 	git submodule update --init --recursive ./components/lv_bindings
 	# git submodule update --init ../micropython
 	cd ./../micropython && git submodule update --init $(addprefix ./,$(GIT_SUBMODULES)) && cd -

m5stack/Makefile

@@ -23,7 +23,7 @@ file(GLOB SRCS
 
 set(COMPONENT_SRCS ${SRCS})
 if (IDF_VERSION_MAJOR GREATER_EQUAL 5)
-    set(COMPONENT_REQUIRES esp_adc nvs_flash efuse driver esp_timer main)
+    set(COMPONENT_REQUIRES esp_adc nvs_flash efuse driver esp_timer main_${IDF_TARGET})
 else()
     set(COMPONENT_REQUIRES esp_adc_cal nvs_flash efuse main)
 endif()

m5stack/components/M5Unified/CMakeLists.txt

@@ -0,0 +1,7 @@
+# LVGL support
+if(BUILD_WITH_LVGL)
+    message(STATUS "Build with LVGL enable...")
+    include(${PROJECT_DIR}/CMakeListsLvgl.cmake)
+else()
+    include(${PROJECT_DIR}/CMakeListsDefault.cmake)
+endif()

m5stack/esp32_common.cmake

@@ -0,0 +1,7 @@
+# Set location of base MicroPython directory.
+if(NOT MICROPY_DIR)
+    get_filename_component(MICROPY_DIR ${PROJECT_DIR}/../micropython/ ABSOLUTE)
+endif()
+
+# include(${MICROPY_PORT_DIR}/esp32_common.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/../esp32_common.cmake)

m5stack/main/CMakeLists.txt

@@ -0,0 +1,5 @@
+## IDF Component Manager Manifest File
+dependencies:
+  espressif/mdns: "~1.1.0"
+  idf:
+    version: ">=5.0.4"