cmake change apps/blinky more ports' generic executable target

hathach · hathach · commit 717763c9f0e1 · 2025-05-23T11:22:06.000+07:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -129,6 +129,7 @@ jobs:
           - 'metro_m7_1011'
           # - 'stm32f303disco' # overflows flash
           - 'stm32f411ve_discovery'
+          - 'stm32h563_nucleo'
 
     steps:
       - name: Checkout
diff --git a/apps/blinky/CMakeLists.txt b/apps/blinky/CMakeLists.txt
@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 3.17)
 include(${FAMILY_PATH}/app.cmake)
 
 add_executable(blinky
-  blinky.c
+  src/blinky.c
   ${FAMILY_PATH}/boards.c
 #  ${FAMILY_PATH}/board_flash.c
   )
diff --git a/apps/blinky/src/blinky.c b/apps/blinky/src/blinky.c
diff --git a/ports/ch32v20x/family.cmake b/ports/ch32v20x/family.cmake
@@ -1,4 +1,4 @@
-include_guard()
+include_guard(GLOBAL)
 
 set(UF2_FAMILY_ID 0x699b62ec)
 set(CH32_FAMILY ch32v20x)
diff --git a/ports/espressif/CMakeLists.txt b/ports/espressif/CMakeLists.txt
@@ -3,7 +3,6 @@
 cmake_minimum_required(VERSION 3.17)
 
 include(${CMAKE_CURRENT_LIST_DIR}/../family_support.cmake)
-include(${CMAKE_CURRENT_LIST_DIR}/boards/${BOARD}/board.cmake)
 
 # Must be set before including IDF project.cmake
 set(EXTRA_COMPONENT_DIRS ${TOP}/src ${CMAKE_CURRENT_LIST_DIR}/boards)
@@ -34,6 +33,7 @@ project(tinyuf2)
 
 set(ARTIFACT_PATH ${CMAKE_CURRENT_LIST_DIR}/_bin/${BOARD})
 execute_process(COMMAND mkdir -p ${ARTIFACT_PATH})
+execute_process(COMMAND mkdir -p ${ARTIFACT_PATH}/apps)
 
 # Create post-build script for combined.bin / combined-ota.bin
 file(WRITE ${CMAKE_BINARY_DIR}/tinyuf2.postbuild.sh
@@ -73,15 +73,26 @@ add_custom_command(TARGET app POST_BUILD
   VERBATIM
   )
 
-# External project for self-update
+# flash combined.bin
+add_custom_target(combined-flash
+  DEPENDS tinyuf2.elf
+  COMMAND ${CMAKE_COMMAND} -E echo "Flashing combined.bin"
+  COMMAND esptool.py --chip ${IDF_TARGET} write_flash 0x0 combined.bin
+  VERBATIM
+  )
+
+#------------------------------
+# External project (self_update, blinky etc ...)
+#------------------------------
+
 # Post build: generate bootloader_bin.c for self-update and combined.bin
 add_custom_command(TARGET app POST_BUILD
   COMMAND ${Python_EXECUTABLE} ${UF2CONV_PY} --carray -o ${CMAKE_CURRENT_LIST_DIR}/apps/self_update/main/bootloader_bin.c ${CMAKE_BINARY_DIR}/tinyuf2.bin
   )
 
 externalproject_add(self_update
   SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/apps/self_update
-  BINARY_DIR ${CMAKE_BINARY_DIR}/self_update
+  BINARY_DIR ${CMAKE_BINARY_DIR}/apps/self_update
   # Modifying the list separator for the arguments, as such, we won't need to manually
   # replace the new separator by the default ';' in the subproject
   CMAKE_ARGS -DBOARD=${BOARD}
@@ -90,12 +101,14 @@ externalproject_add(self_update
   DEPENDS tinyuf2.elf
   )
 
-# flash combined.bin
-add_custom_target(combined-flash
-  DEPENDS tinyuf2.elf
-  COMMAND ${CMAKE_COMMAND} -E echo "Flashing combined.bin"
-  COMMAND esptool.py --chip ${IDF_TARGET} write_flash 0x0 combined.bin
-  VERBATIM
+externalproject_add(blinky
+  SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/apps/blinky
+  BINARY_DIR ${CMAKE_BINARY_DIR}/apps/blinky
+  # Modifying the list separator for the arguments, as such, we won't need to manually
+  # replace the new separator by the default ';' in the subproject
+  CMAKE_ARGS -DBOARD=${BOARD}
+  INSTALL_COMMAND ""
+  BUILD_ALWAYS 1
   )
 
 # -------------------------------------------------------------
diff --git a/ports/espressif/apps/blinky/CMakeLists.txt b/ports/espressif/apps/blinky/CMakeLists.txt
@@ -0,0 +1,26 @@
+# The following five lines of boilerplate have to be in your project's
+# CMakeLists in this exact order for cmake to work correctly
+cmake_minimum_required(VERSION 3.17)
+
+include(${CMAKE_CURRENT_LIST_DIR}/../../../family_support.cmake)
+
+# Must be set before including IDF project.cmake
+set(EXTRA_COMPONENT_DIRS "../../boards" "../../components")
+set(SDKCONFIG ${CMAKE_BINARY_DIR}/sdkconfig)
+
+include($ENV{IDF_PATH}/tools/cmake/project.cmake)
+
+add_compile_definitions(
+  BUILD_APPLICATION
+  BUILD_NO_TINYUSB
+  )
+
+project(blinky)
+
+set(ARTIFACT_PATH ${CMAKE_CURRENT_LIST_DIR}/../../_bin/${BOARD})
+cmake_print_variables(UF2_FAMILY_ID)
+add_custom_command(TARGET app POST_BUILD
+  COMMAND ${Python_EXECUTABLE} ${UF2CONV_PY} -f ${UF2_FAMILY_ID} -b 0x0 -c -o ${CMAKE_BINARY_DIR}/blinky.uf2 ${CMAKE_BINARY_DIR}/blinky.bin
+  COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/blinky.uf2 ${ARTIFACT_PATH}/apps/blinky.uf2
+  VERBATIM
+  )
diff --git a/ports/espressif/apps/blinky/main/CMakeLists.txt b/ports/espressif/apps/blinky/main/CMakeLists.txt
@@ -0,0 +1,6 @@
+# Note: bootloader_bin.c is generated by tinyuf2 app target
+idf_component_register(
+  SRCS ${TOP}/apps/blinky/src/blinky.c
+  INCLUDE_DIRS ${TOP}/src
+  REQUIRES boards
+  )
diff --git a/ports/espressif/apps/self_update/CMakeLists.txt b/ports/espressif/apps/self_update/CMakeLists.txt
@@ -3,28 +3,24 @@
 cmake_minimum_required(VERSION 3.17)
 
 include(${CMAKE_CURRENT_LIST_DIR}/../../../family_support.cmake)
-include(${CMAKE_CURRENT_LIST_DIR}/../../boards/${BOARD}/board.cmake)
 
 # Must be set before including IDF project.cmake
 set(EXTRA_COMPONENT_DIRS "../../boards" "../../components")
 set(SDKCONFIG ${CMAKE_BINARY_DIR}/sdkconfig)
 
-set(SELFUPDATE_BUILD 1)
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 
-add_compile_definitions(TINYUF2_SELF_UPDATE)
+add_compile_definitions(
+  TINYUF2_SELF_UPDATE
+  BUILD_APPLICATION
+  BUILD_NO_TINYUSB
+  )
 
 project(update-tinyuf2)
 
 set(ARTIFACT_PATH ${CMAKE_CURRENT_LIST_DIR}/../../_bin/${BOARD})
 add_custom_command(TARGET app POST_BUILD
-  COMMAND ${Python_EXECUTABLE} ${UF2CONV_PY} -f ${UF2_FAMILY_ID_${IDF_TARGET}} -b 0x0 -c -o ${CMAKE_BINARY_DIR}/update-tinyuf2.uf2 ${CMAKE_BINARY_DIR}/update-tinyuf2.bin
+  COMMAND ${Python_EXECUTABLE} ${UF2CONV_PY} -f ${UF2_FAMILY_ID} -b 0x0 -c -o ${CMAKE_BINARY_DIR}/update-tinyuf2.uf2 ${CMAKE_BINARY_DIR}/update-tinyuf2.bin
   COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_BINARY_DIR}/update-tinyuf2.uf2 ${ARTIFACT_PATH}/update-tinyuf2.uf2
   VERBATIM
   )
-
-add_custom_target(flash-update-tinyuf2
-  DEPENDS app
-  COMMAND ${Python_EXECUTABLE} ${UF2CONV_PY} -f ${UF2_FAMILY_ID_${IDF_TARGET}} --deploy ${CMAKE_BINARY_DIR}/update-tinyuf2.uf2
-  VERBATIM
-  )
diff --git a/ports/espressif/boards/boards.c b/ports/espressif/boards/boards.c
@@ -44,7 +44,7 @@
 
 #include "board_api.h"
 
-#ifndef TINYUF2_SELF_UPDATE
+#ifndef BUILD_NO_TINYUSB
 #include "tusb.h"
 #endif
 
@@ -98,7 +98,7 @@ static void internal_timer_cb(void* arg);
 // TinyUSB thread
 //--------------------------------------------------------------------+
 
-#ifdef TINYUF2_SELF_UPDATE
+#ifdef BUILD_NO_TINYUSB
 void app_main(void) {
   main();
 }
@@ -346,7 +346,7 @@ void board_timer_stop(void) {
 //--------------------------------------------------------------------+
 // CDC Touch1200
 //--------------------------------------------------------------------+
-#ifndef TINYUF2_SELF_UPDATE
+#ifndef BUILD_NO_TINYUSB
 
 #if CONFIG_IDF_TARGET_ESP32S3
 #include "hal/usb_serial_jtag_ll.h"
@@ -458,7 +458,7 @@ void tud_cdc_line_state_cb(uint8_t instance, bool dtr, bool rts) {
     }
   }
 }
-#endif // TINYUF2_SELF_UPDATE
+#endif
 
 //--------------------------------------------------------------------+
 // Display
diff --git a/ports/espressif/family.cmake b/ports/espressif/family.cmake
@@ -1,2 +1,5 @@
+include(${CMAKE_CURRENT_LIST_DIR}/boards/${BOARD}/board.cmake)
+
 set(UF2_FAMILY_ID_esp32s2 0xbfdd4eee)
 set(UF2_FAMILY_ID_esp32s3 0xc47e5767)
+set(UF2_FAMILY_ID ${UF2_FAMILY_ID_${IDF_TARGET}})
diff --git a/ports/family_support.cmake b/ports/family_support.cmake
@@ -111,21 +111,6 @@ function(family_add_default_warnings TARGET)
     if (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 12.0)
       target_link_options(${TARGET} PUBLIC "LINKER:--no-warn-rwx-segments")
     endif ()
-
-    # GCC 10
-    if (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 10.0)
-      target_compile_options(${TARGET} PUBLIC -Wconversion)
-    endif ()
-
-    # GCC 8
-    if (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 8.0)
-      target_compile_options(${TARGET} PUBLIC -Wcast-function-type -Wstrict-overflow)
-    endif ()
-
-    # GCC 6
-    if (CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 6.0)
-      target_compile_options(${TARGET} PUBLIC -Wno-strict-aliasing)
-    endif ()
   endif ()
 endfunction()
 
diff --git a/ports/mimxrt10xx/app.cmake b/ports/mimxrt10xx/app.cmake
@@ -1,4 +1,4 @@
-include_guard()
+include_guard(GLOBAL)
 
 # override bin hex output
 function(family_gen_bin_hex TARGET)
diff --git a/ports/mimxrt10xx/apps/app.mk b/ports/mimxrt10xx/apps/app.mk
@@ -6,7 +6,7 @@ BUILD_APPLICATION = 1
 include ../../../make.mk
 include $(TOP)/$(PORT_DIR)/port.mk
 
-LD_FILES ?= $(PORT_DIR)/linker/$(MCU)_ram.ld $(PORT_DIR)/apps/memory.ld $(PORT_DIR)/linker/common.ld
+LD_FILES ?= $(PORT_DIR)/linker/$(MCU)_ram.ld $(PORT_DIR)/linker/app.ld $(PORT_DIR)/linker/common.ld
 
 include $(TOP)/ports/rules.mk
 
diff --git a/ports/mimxrt10xx/apps/factory_test_metro_sd/middleware-sdmmc/CMakeLists.txt b/ports/mimxrt10xx/apps/factory_test_metro_sd/middleware-sdmmc/CMakeLists.txt
@@ -1,4 +1,4 @@
-include_guard()
+include_guard(GLOBAL)
 
 function(add_sdmmc TARGET)
   target_sources(${TARGET} PUBLIC
diff --git a/ports/stm32f3/family.cmake b/ports/stm32f3/family.cmake
@@ -1,4 +1,4 @@
-include_guard()
+include_guard(GLOBAL)
 
 #------------------------------------
 # Config
diff --git a/ports/stm32f4/CMakeLists.txt b/ports/stm32f4/CMakeLists.txt
@@ -22,6 +22,7 @@ family_configure_tinyuf2(tinyuf2 OPT_MCU_STM32F4)
 family_flash_jlink(tinyuf2)
 
 #------------------------------------
-# Application (e.g self update)
+# Application
 #------------------------------------
 add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/apps/self_update)
+add_subdirectory(${TOP}/apps/blinky ${CMAKE_BINARY_DIR}/apps/blinky)
diff --git a/ports/stm32f4/app.cmake b/ports/stm32f4/app.cmake
@@ -0,0 +1,14 @@
+include_guard(GLOBAL)
+
+function(family_configure_app TARGET)
+  family_configure_common(${TARGET})
+  target_compile_definitions(${TARGET} PUBLIC
+    BUILD_APPLICATION
+    )
+  target_link_options(${TARGET} PUBLIC
+    "LINKER:--script=${CMAKE_CURRENT_FUNCTION_LIST_DIR}/linker/stm32f4_app.ld"
+    )
+
+  family_gen_uf2(${TARGET} ${UF2_FAMILY_ID})
+  family_flash_uf2(${TARGET} ${UF2_FAMILY_ID})
+endfunction()
diff --git a/ports/stm32f4/boards.c b/ports/stm32f4/boards.c
@@ -36,8 +36,12 @@
 
 UART_HandleTypeDef UartHandle;
 
-void board_init(void)
-{
+void board_init(void) {
+#ifdef BUILD_APPLICATION
+  // system_stm32h5xx.c: SystemInit() will reset vector table, set it here if we are building application
+  SCB->VTOR = (uint32_t) BOARD_FLASH_APP_START;
+#endif
+
   clock_init();
   SystemCoreClockUpdate();
 
diff --git a/ports/stm32f4/family.cmake b/ports/stm32f4/family.cmake
@@ -1,4 +1,4 @@
-include_guard()
+include_guard(GLOBAL)
 
 #------------------------------------
 # Config
@@ -21,8 +21,6 @@ set(CMAKE_TOOLCHAIN_FILE ${TOP}/cmake/toolchain/arm_${TOOLCHAIN}.cmake)
 #------------------------------------
 # BOARD_TARGET
 #------------------------------------
-# used by all executable targets
-
 function(family_add_board_target BOARD_TARGET)
   if (TARGET ${BOARD_TARGET})
     return()
@@ -61,7 +59,3 @@ function(family_add_board_target BOARD_TARGET)
     --specs=nosys.specs --specs=nano.specs
     )
 endfunction()
-
-#------------------------------------
-# Main target
-#------------------------------------
diff --git a/ports/stm32h5/CMakeLists.txt b/ports/stm32h5/CMakeLists.txt
@@ -25,4 +25,4 @@ family_flash_stlink(tinyuf2)
 # Application (e.g self update)
 #------------------------------------
 add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/apps/self_update)
-add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/apps/blinky)
+add_subdirectory(${TOP}/apps/blinky ${CMAKE_BINARY_DIR}/apps/blinky)
diff --git a/ports/stm32h5/app.cmake b/ports/stm32h5/app.cmake
@@ -0,0 +1,14 @@
+include_guard(GLOBAL)
+
+function(family_configure_app TARGET)
+  family_configure_common(${TARGET})
+  target_compile_definitions(${TARGET} PUBLIC
+    BUILD_APPLICATION
+    )
+  target_link_options(${TARGET} PUBLIC
+    "LINKER:--script=${CMAKE_CURRENT_FUNCTION_LIST_DIR}/linker/stm32h5_app.ld"
+    )
+
+  family_gen_uf2(${TARGET} ${UF2_FAMILY_ID})
+  family_flash_uf2(${TARGET} ${UF2_FAMILY_ID})
+endfunction()
diff --git a/ports/stm32h5/apps/blinky/CMakeLists.txt b/ports/stm32h5/apps/blinky/CMakeLists.txt
diff --git a/ports/stm32h5/apps/blinky/Makefile b/ports/stm32h5/apps/blinky/Makefile
diff --git a/ports/stm32h5/family.cmake b/ports/stm32h5/family.cmake
@@ -1,4 +1,4 @@
-include_guard()
+include_guard(GLOBAL)
 
 #------------------------------------
 # Config

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 3.17)`
`7`	`7`	`include(${FAMILY_PATH}/app.cmake)`
`8`	`8`
`9`	`9`	`add_executable(blinky`
`10`		`- blinky.c`
	`10`	`+ src/blinky.c`
`11`	`11`	`${FAMILY_PATH}/boards.c`
`12`	`12`	`# ${FAMILY_PATH}/board_flash.c`
`13`	`13`	`)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-include_guard()`
	`1`	`+include_guard(GLOBAL)`
`2`	`2`
`3`	`3`	`set(UF2_FAMILY_ID 0x699b62ec)`
`4`	`4`	`set(CH32_FAMILY ch32v20x)`