Просмотр исходного кода

rename family.cmake to family_common.cmake

graham sanderson 4 лет назад
Родитель
Сommit
6e29bf6e54

+ 1 - 1
hw/bsp/esp32s2/family.cmake

@@ -7,4 +7,4 @@ set(SUPPORTED_TARGETS esp32s2)
 
 # include basic family CMake functionality
 set(FAMILY_MCUS ESP32S2)
-include(${CMAKE_CURRENT_LIST_DIR}/../family.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/../family_common.cmake)

+ 1 - 1
hw/bsp/esp32s3/family.cmake

@@ -7,4 +7,4 @@ set(SUPPORTED_TARGETS esp32s3)
 
 # include basic family CMake functionality
 set(FAMILY_MCUS ESP32S3)
-include(${CMAKE_CURRENT_LIST_DIR}/../family.cmake)
+include(${CMAKE_CURRENT_LIST_DIR}/../family_common.cmake)

+ 0 - 0
hw/bsp/family.cmake → hw/bsp/family_common.cmake


+ 2 - 1
hw/bsp/rp2040/family.cmake

@@ -8,7 +8,7 @@ if (NOT TARGET _rp2040_family_inclusion_marker)
 	# add the SDK in case we are standalone tinyusb example (noop if already present)
 	include(${CMAKE_CURRENT_LIST_DIR}/pico_sdk_import.cmake)
 
-	include(${CMAKE_CURRENT_LIST_DIR}/../family.cmake)
+	include(${CMAKE_CURRENT_LIST_DIR}/../family_common.cmake)
 
 	# todo should we default to pico_sdk?
 	if (NOT BOARD)
@@ -68,6 +68,7 @@ if (NOT TARGET _rp2040_family_inclusion_marker)
 	endfunction()
 
 	function(family_initialize_project PROJECT DIR)
+		# call the original version of this function from family_common.cmake
 		_family_initialize_project(${PROJECT} ${DIR})
 		enable_language(C CXX ASM)
 		pico_sdk_init()

+ 1 - 1
hw/mcu/microchip

@@ -1 +1 @@
-Subproject commit f7087f04783c896627061fc151fa3527b73733c7
+Subproject commit 66b5a11995025426224e0ba6f377322e6e8893b6

+ 1 - 1
hw/mcu/sony/cxd56/spresense-exported-sdk

@@ -1 +1 @@
-Subproject commit 2ec2a1538362696118dc3fdf56f33dacaf8f4067
+Subproject commit b473b28a14a03f3d416b6e2c071bcfd4fb92cb63

+ 1 - 1
lib/CMSIS_5

@@ -1 +1 @@
-Subproject commit 20285262657d1b482d132d20d755c8c330d55c1f
+Subproject commit b7b26f50d00072812aec8453f643e24bafedccb5

+ 1 - 1
lib/lwip

@@ -1 +1 @@
-Subproject commit 159e31b689577dbf69cf0683bbaffbd71fa5ee10
+Subproject commit 0192fe773ec28e11f66ec76f4e827fbb58b7e257