diff options
| author | graham sanderson <[email protected]> | 2021-06-01 09:09:25 -0500 |
|---|---|---|
| committer | graham sanderson <[email protected]> | 2021-06-01 09:09:25 -0500 |
| commit | 6e29bf6e54ce08edb2ad5936805af0746639ff39 (patch) | |
| tree | 8a05a2310e650587b4a513a823e60145de3d2137 | |
| parent | 8782d0b8df507a0d2e1f7a12a27a76d50e0d4477 (diff) | |
rename family.cmake to family_common.cmake
| -rw-r--r-- | hw/bsp/esp32s2/family.cmake | 2 | ||||
| -rw-r--r-- | hw/bsp/esp32s3/family.cmake | 2 | ||||
| -rw-r--r-- | hw/bsp/family_common.cmake (renamed from hw/bsp/family.cmake) | 0 | ||||
| -rw-r--r-- | hw/bsp/rp2040/family.cmake | 3 | ||||
| m--------- | hw/mcu/microchip | 0 | ||||
| m--------- | hw/mcu/sony/cxd56/spresense-exported-sdk | 0 | ||||
| m--------- | lib/CMSIS_5 | 0 | ||||
| m--------- | lib/lwip | 0 |
8 files changed, 4 insertions, 3 deletions
diff --git a/hw/bsp/esp32s2/family.cmake b/hw/bsp/esp32s2/family.cmake index 02957fa1d..9eb1627a1 100644 --- a/hw/bsp/esp32s2/family.cmake +++ b/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) diff --git a/hw/bsp/esp32s3/family.cmake b/hw/bsp/esp32s3/family.cmake index b530b326d..c99c3728b 100644 --- a/hw/bsp/esp32s3/family.cmake +++ b/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) diff --git a/hw/bsp/family.cmake b/hw/bsp/family_common.cmake index 124399675..124399675 100644 --- a/hw/bsp/family.cmake +++ b/hw/bsp/family_common.cmake diff --git a/hw/bsp/rp2040/family.cmake b/hw/bsp/rp2040/family.cmake index ee17d4d46..e791648a9 100644 --- a/hw/bsp/rp2040/family.cmake +++ b/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() diff --git a/hw/mcu/microchip b/hw/mcu/microchip -Subproject f7087f04783c896627061fc151fa3527b73733c +Subproject 66b5a11995025426224e0ba6f377322e6e8893b diff --git a/hw/mcu/sony/cxd56/spresense-exported-sdk b/hw/mcu/sony/cxd56/spresense-exported-sdk -Subproject 2ec2a1538362696118dc3fdf56f33dacaf8f406 +Subproject b473b28a14a03f3d416b6e2c071bcfd4fb92cb6 diff --git a/lib/CMSIS_5 b/lib/CMSIS_5 -Subproject 20285262657d1b482d132d20d755c8c330d55c1 +Subproject b7b26f50d00072812aec8453f643e24bafedccb diff --git a/lib/lwip b/lib/lwip -Subproject 159e31b689577dbf69cf0683bbaffbd71fa5ee1 +Subproject 0192fe773ec28e11f66ec76f4e827fbb58b7e25 |