From e482500bc852bf236d32ff9ec5070e130d72e2a1 Mon Sep 17 00:00:00 2001 From: Gerwin Klein Date: Thu, 14 Aug 2025 13:40:07 +0100 Subject: [PATCH 1/2] Bump minimum CMake version See seL4/seL4@e7bb62d2 for rationale. Signed-off-by: Gerwin Klein --- components/BenchUtiliz/CMakeLists.txt | 2 +- components/ClockServer/CMakeLists.txt | 2 +- components/ClockServer/libClockServer-client/CMakeLists.txt | 2 +- components/Ethdriver/CMakeLists.txt | 2 +- components/FileServer/CMakeLists.txt | 2 +- components/FileServer/libFileServer-client/CMakeLists.txt | 2 +- components/GPIOMUXServer/CMakeLists.txt | 2 +- components/GPIOMUXServer/libGPIOMUXServer-client/CMakeLists.txt | 2 +- components/PCIConfigIO/CMakeLists.txt | 2 +- components/PicoServer/CMakeLists.txt | 2 +- components/RTC/CMakeLists.txt | 2 +- components/ResetServer/CMakeLists.txt | 2 +- components/ResetServer/libResetServer-client/CMakeLists.txt | 2 +- components/SerialServer/CMakeLists.txt | 2 +- components/SerialServer/camkes-putchar-client/CMakeLists.txt | 2 +- components/TimeServer/CMakeLists.txt | 2 +- components/VirtQueue/CMakeLists.txt | 2 +- components/modules/dynamic-untyped-allocators/CMakeLists.txt | 2 +- components/modules/fdt-bind-driver/CMakeLists.txt | 2 +- components/modules/picotcp-base/CMakeLists.txt | 2 +- components/modules/single-threaded/CMakeLists.txt | 2 +- components/modules/x86-iospace-dma/CMakeLists.txt | 2 +- global-components.cmake | 2 +- global-connectors.cmake | 2 +- plat_components/tx2/BPMPServer/CMakeLists.txt | 2 +- .../tx2/BPMPServer/libBPMPServer-client/CMakeLists.txt | 2 +- remote-drivers/picotcp-ethernet-async/CMakeLists.txt | 2 +- remote-drivers/picotcp-socket-sync/CMakeLists.txt | 2 +- .../picotcp-socket-sync/client_include/CMakeLists.txt | 2 +- 29 files changed, 29 insertions(+), 29 deletions(-) diff --git a/components/BenchUtiliz/CMakeLists.txt b/components/BenchUtiliz/CMakeLists.txt index 27c158f..7a6cb8e 100644 --- a/components/BenchUtiliz/CMakeLists.txt +++ b/components/BenchUtiliz/CMakeLists.txt @@ -4,7 +4,7 @@ # SPDX-License-Identifier: BSD-2-Clause # -cmake_minimum_required(VERSION 3.8.2) +cmake_minimum_required(VERSION 3.16.0) CAmkESAddImportPath(camkes-include) CAmkESAddCPPInclude(camkes-include) diff --git a/components/ClockServer/CMakeLists.txt b/components/ClockServer/CMakeLists.txt index a99c77a..4b0c963 100644 --- a/components/ClockServer/CMakeLists.txt +++ b/components/ClockServer/CMakeLists.txt @@ -4,7 +4,7 @@ # SPDX-License-Identifier: BSD-2-Clause # -cmake_minimum_required(VERSION 3.8.2) +cmake_minimum_required(VERSION 3.16.0) project(ClockServer C) diff --git a/components/ClockServer/libClockServer-client/CMakeLists.txt b/components/ClockServer/libClockServer-client/CMakeLists.txt index 0c04486..35505ce 100644 --- a/components/ClockServer/libClockServer-client/CMakeLists.txt +++ b/components/ClockServer/libClockServer-client/CMakeLists.txt @@ -4,7 +4,7 @@ # SPDX-License-Identifier: BSD-2-Clause # -cmake_minimum_required(VERSION 3.8.2) +cmake_minimum_required(VERSION 3.16.0) project(libClockServer-client C) diff --git a/components/Ethdriver/CMakeLists.txt b/components/Ethdriver/CMakeLists.txt index a1be8bc..777b537 100644 --- a/components/Ethdriver/CMakeLists.txt +++ b/components/Ethdriver/CMakeLists.txt @@ -4,7 +4,7 @@ # SPDX-License-Identifier: BSD-2-Clause # -cmake_minimum_required(VERSION 3.8.2) +cmake_minimum_required(VERSION 3.16.0) project(Ethdriver C) diff --git a/components/FileServer/CMakeLists.txt b/components/FileServer/CMakeLists.txt index 01e642e..6cd8d1c 100644 --- a/components/FileServer/CMakeLists.txt +++ b/components/FileServer/CMakeLists.txt @@ -4,7 +4,7 @@ # SPDX-License-Identifier: BSD-2-Clause # -cmake_minimum_required(VERSION 3.8.2) +cmake_minimum_required(VERSION 3.16.0) project(FileServer C) diff --git a/components/FileServer/libFileServer-client/CMakeLists.txt b/components/FileServer/libFileServer-client/CMakeLists.txt index 913331f..14a2401 100644 --- a/components/FileServer/libFileServer-client/CMakeLists.txt +++ b/components/FileServer/libFileServer-client/CMakeLists.txt @@ -4,7 +4,7 @@ # SPDX-License-Identifier: BSD-2-Clause # -cmake_minimum_required(VERSION 3.8.2) +cmake_minimum_required(VERSION 3.16.0) project(libFileServer-client C) diff --git a/components/GPIOMUXServer/CMakeLists.txt b/components/GPIOMUXServer/CMakeLists.txt index a4a6ff2..ce3e7d1 100644 --- a/components/GPIOMUXServer/CMakeLists.txt +++ b/components/GPIOMUXServer/CMakeLists.txt @@ -4,7 +4,7 @@ # SPDX-License-Identifier: BSD-2-Clause # -cmake_minimum_required(VERSION 3.8.2) +cmake_minimum_required(VERSION 3.16.0) project(GPIOMUXServer C) diff --git a/components/GPIOMUXServer/libGPIOMUXServer-client/CMakeLists.txt b/components/GPIOMUXServer/libGPIOMUXServer-client/CMakeLists.txt index 3425103..34a45a9 100644 --- a/components/GPIOMUXServer/libGPIOMUXServer-client/CMakeLists.txt +++ b/components/GPIOMUXServer/libGPIOMUXServer-client/CMakeLists.txt @@ -4,7 +4,7 @@ # SPDX-License-Identifier: BSD-2-Clause # -cmake_minimum_required(VERSION 3.8.2) +cmake_minimum_required(VERSION 3.16.0) project(libGPIOMUXServer-client C) diff --git a/components/PCIConfigIO/CMakeLists.txt b/components/PCIConfigIO/CMakeLists.txt index 3c7fc16..4cf43d2 100644 --- a/components/PCIConfigIO/CMakeLists.txt +++ b/components/PCIConfigIO/CMakeLists.txt @@ -4,7 +4,7 @@ # SPDX-License-Identifier: BSD-2-Clause # -cmake_minimum_required(VERSION 3.8.2) +cmake_minimum_required(VERSION 3.16.0) project(PCIConfigIO C) diff --git a/components/PicoServer/CMakeLists.txt b/components/PicoServer/CMakeLists.txt index edfaae1..7da5570 100644 --- a/components/PicoServer/CMakeLists.txt +++ b/components/PicoServer/CMakeLists.txt @@ -4,7 +4,7 @@ # SPDX-License-Identifier: BSD-2-Clause # -cmake_minimum_required(VERSION 3.8.2) +cmake_minimum_required(VERSION 3.16.0) project(PicoServer C) diff --git a/components/RTC/CMakeLists.txt b/components/RTC/CMakeLists.txt index 05faaa9..d73a904 100644 --- a/components/RTC/CMakeLists.txt +++ b/components/RTC/CMakeLists.txt @@ -4,7 +4,7 @@ # SPDX-License-Identifier: BSD-2-Clause # -cmake_minimum_required(VERSION 3.8.2) +cmake_minimum_required(VERSION 3.16.0) project(RTC C) diff --git a/components/ResetServer/CMakeLists.txt b/components/ResetServer/CMakeLists.txt index 8539aae..8d58e0b 100644 --- a/components/ResetServer/CMakeLists.txt +++ b/components/ResetServer/CMakeLists.txt @@ -4,7 +4,7 @@ # SPDX-License-Identifier: BSD-2-Clause # -cmake_minimum_required(VERSION 3.8.2) +cmake_minimum_required(VERSION 3.16.0) project(ResetServer C) diff --git a/components/ResetServer/libResetServer-client/CMakeLists.txt b/components/ResetServer/libResetServer-client/CMakeLists.txt index d5a2cf3..e1d4ebe 100644 --- a/components/ResetServer/libResetServer-client/CMakeLists.txt +++ b/components/ResetServer/libResetServer-client/CMakeLists.txt @@ -4,7 +4,7 @@ # SPDX-License-Identifier: BSD-2-Clause # -cmake_minimum_required(VERSION 3.8.2) +cmake_minimum_required(VERSION 3.16.0) project(libResetServer-client C) diff --git a/components/SerialServer/CMakeLists.txt b/components/SerialServer/CMakeLists.txt index 44e94dc..7f084b6 100644 --- a/components/SerialServer/CMakeLists.txt +++ b/components/SerialServer/CMakeLists.txt @@ -5,7 +5,7 @@ # SPDX-License-Identifier: BSD-2-Clause # -cmake_minimum_required(VERSION 3.8.2) +cmake_minimum_required(VERSION 3.16.0) project(SerialServer C) diff --git a/components/SerialServer/camkes-putchar-client/CMakeLists.txt b/components/SerialServer/camkes-putchar-client/CMakeLists.txt index 9a76977..38dc4f2 100644 --- a/components/SerialServer/camkes-putchar-client/CMakeLists.txt +++ b/components/SerialServer/camkes-putchar-client/CMakeLists.txt @@ -4,7 +4,7 @@ # SPDX-License-Identifier: BSD-2-Clause # -cmake_minimum_required(VERSION 3.8.2) +cmake_minimum_required(VERSION 3.16.0) project(SerialServer-camkes-putchar-client C) diff --git a/components/TimeServer/CMakeLists.txt b/components/TimeServer/CMakeLists.txt index df99485..8cca535 100644 --- a/components/TimeServer/CMakeLists.txt +++ b/components/TimeServer/CMakeLists.txt @@ -4,7 +4,7 @@ # SPDX-License-Identifier: BSD-2-Clause # -cmake_minimum_required(VERSION 3.8.2) +cmake_minimum_required(VERSION 3.16.0) project(TimeServer C) diff --git a/components/VirtQueue/CMakeLists.txt b/components/VirtQueue/CMakeLists.txt index b612b17..65ad9e1 100644 --- a/components/VirtQueue/CMakeLists.txt +++ b/components/VirtQueue/CMakeLists.txt @@ -4,7 +4,7 @@ # SPDX-License-Identifier: BSD-2-Clause # -cmake_minimum_required(VERSION 3.8.2) +cmake_minimum_required(VERSION 3.16.0) project(VirtQueue C) diff --git a/components/modules/dynamic-untyped-allocators/CMakeLists.txt b/components/modules/dynamic-untyped-allocators/CMakeLists.txt index a075cae..68a85cd 100644 --- a/components/modules/dynamic-untyped-allocators/CMakeLists.txt +++ b/components/modules/dynamic-untyped-allocators/CMakeLists.txt @@ -4,7 +4,7 @@ # SPDX-License-Identifier: BSD-2-Clause # -cmake_minimum_required(VERSION 3.8.2) +cmake_minimum_required(VERSION 3.16.0) project(dynamic-untyped-allocators-package C) diff --git a/components/modules/fdt-bind-driver/CMakeLists.txt b/components/modules/fdt-bind-driver/CMakeLists.txt index 13693db..d7b8c40 100644 --- a/components/modules/fdt-bind-driver/CMakeLists.txt +++ b/components/modules/fdt-bind-driver/CMakeLists.txt @@ -4,7 +4,7 @@ # SPDX-License-Identifier: BSD-2-Clause # -cmake_minimum_required(VERSION 3.8.2) +cmake_minimum_required(VERSION 3.16.0) project(fdt-bind-driver C) diff --git a/components/modules/picotcp-base/CMakeLists.txt b/components/modules/picotcp-base/CMakeLists.txt index 0dcec77..7e3e820 100644 --- a/components/modules/picotcp-base/CMakeLists.txt +++ b/components/modules/picotcp-base/CMakeLists.txt @@ -4,7 +4,7 @@ # SPDX-License-Identifier: BSD-2-Clause # -cmake_minimum_required(VERSION 3.8.2) +cmake_minimum_required(VERSION 3.16.0) project(picotcp-base-package C) diff --git a/components/modules/single-threaded/CMakeLists.txt b/components/modules/single-threaded/CMakeLists.txt index 90db8cd..63288ca 100644 --- a/components/modules/single-threaded/CMakeLists.txt +++ b/components/modules/single-threaded/CMakeLists.txt @@ -4,7 +4,7 @@ # SPDX-License-Identifier: BSD-2-Clause # -cmake_minimum_required(VERSION 3.8.2) +cmake_minimum_required(VERSION 3.16.0) project(single-threaded C) diff --git a/components/modules/x86-iospace-dma/CMakeLists.txt b/components/modules/x86-iospace-dma/CMakeLists.txt index 534b1aa..91c1336 100644 --- a/components/modules/x86-iospace-dma/CMakeLists.txt +++ b/components/modules/x86-iospace-dma/CMakeLists.txt @@ -4,7 +4,7 @@ # SPDX-License-Identifier: BSD-2-Clause # -cmake_minimum_required(VERSION 3.8.2) +cmake_minimum_required(VERSION 3.16.0) project(dynamic-untyped-allocators-package C) diff --git a/global-components.cmake b/global-components.cmake index 5c9787b..a263276 100644 --- a/global-components.cmake +++ b/global-components.cmake @@ -4,7 +4,7 @@ # SPDX-License-Identifier: BSD-2-Clause # -cmake_minimum_required(VERSION 3.8.2) +cmake_minimum_required(VERSION 3.16.0) include("${CMAKE_CURRENT_LIST_DIR}/global-connectors.cmake") diff --git a/global-connectors.cmake b/global-connectors.cmake index e3af9dc..059f374 100644 --- a/global-connectors.cmake +++ b/global-connectors.cmake @@ -5,7 +5,7 @@ # SPDX-License-Identifier: BSD-2-Clause # -cmake_minimum_required(VERSION 3.8.2) +cmake_minimum_required(VERSION 3.16.0) CAmkESAddImportPath(interfaces plat_interfaces/${KernelPlatform}) diff --git a/plat_components/tx2/BPMPServer/CMakeLists.txt b/plat_components/tx2/BPMPServer/CMakeLists.txt index 8bad7d8..6961d82 100644 --- a/plat_components/tx2/BPMPServer/CMakeLists.txt +++ b/plat_components/tx2/BPMPServer/CMakeLists.txt @@ -4,7 +4,7 @@ # SPDX-License-Identifier: BSD-2-Clause # -cmake_minimum_required(VERSION 3.8.2) +cmake_minimum_required(VERSION 3.16.0) project(BPMPServer C) diff --git a/plat_components/tx2/BPMPServer/libBPMPServer-client/CMakeLists.txt b/plat_components/tx2/BPMPServer/libBPMPServer-client/CMakeLists.txt index da9ce85..4a8e448 100644 --- a/plat_components/tx2/BPMPServer/libBPMPServer-client/CMakeLists.txt +++ b/plat_components/tx2/BPMPServer/libBPMPServer-client/CMakeLists.txt @@ -4,7 +4,7 @@ # SPDX-License-Identifier: BSD-2-Clause # -cmake_minimum_required(VERSION 3.8.2) +cmake_minimum_required(VERSION 3.16.0) project(libBPMPServer-client C) diff --git a/remote-drivers/picotcp-ethernet-async/CMakeLists.txt b/remote-drivers/picotcp-ethernet-async/CMakeLists.txt index 1ca7f7c..343684a 100644 --- a/remote-drivers/picotcp-ethernet-async/CMakeLists.txt +++ b/remote-drivers/picotcp-ethernet-async/CMakeLists.txt @@ -4,7 +4,7 @@ # SPDX-License-Identifier: BSD-2-Clause # -cmake_minimum_required(VERSION 3.8.2) +cmake_minimum_required(VERSION 3.16.0) project(picotcp-ethernet-async-package C) diff --git a/remote-drivers/picotcp-socket-sync/CMakeLists.txt b/remote-drivers/picotcp-socket-sync/CMakeLists.txt index fe44298..6d55ca8 100644 --- a/remote-drivers/picotcp-socket-sync/CMakeLists.txt +++ b/remote-drivers/picotcp-socket-sync/CMakeLists.txt @@ -4,7 +4,7 @@ # SPDX-License-Identifier: BSD-2-Clause # -cmake_minimum_required(VERSION 3.8.2) +cmake_minimum_required(VERSION 3.16.0) project(picotcp-socket-sync-package C) diff --git a/remote-drivers/picotcp-socket-sync/client_include/CMakeLists.txt b/remote-drivers/picotcp-socket-sync/client_include/CMakeLists.txt index 764dcfb..74a2543 100644 --- a/remote-drivers/picotcp-socket-sync/client_include/CMakeLists.txt +++ b/remote-drivers/picotcp-socket-sync/client_include/CMakeLists.txt @@ -4,7 +4,7 @@ # SPDX-License-Identifier: BSD-2-Clause # -cmake_minimum_required(VERSION 3.8.2) +cmake_minimum_required(VERSION 3.16.0) project(libPicoServer-client C) From 4b24148b197fd0e23c9a4d06357a1aaa36cd4e97 Mon Sep 17 00:00:00 2001 From: Gerwin Klein Date: Thu, 14 Aug 2025 13:45:13 +0100 Subject: [PATCH 2/2] trivial: update style to new cmake-format Signed-off-by: Gerwin Klein --- Findglobal-components.cmake | 15 +++--- components/Ethdriver/CMakeLists.txt | 10 +++- components/SerialServer/CMakeLists.txt | 10 +++- .../camkes-putchar-client/CMakeLists.txt | 6 +-- components/TimeServer/CMakeLists.txt | 10 +++- .../modules/picotcp-base/CMakeLists.txt | 10 +++- global-components.cmake | 48 +++++++++---------- global-connectors.cmake | 39 +++------------ plat_components/tx2/BPMPServer/CMakeLists.txt | 5 +- .../picotcp-socket-sync/CMakeLists.txt | 6 +-- 10 files changed, 78 insertions(+), 81 deletions(-) diff --git a/Findglobal-components.cmake b/Findglobal-components.cmake index 796543a..82fb3ae 100644 --- a/Findglobal-components.cmake +++ b/Findglobal-components.cmake @@ -4,8 +4,14 @@ # SPDX-License-Identifier: BSD-2-Clause # -set(GLOBAL_COMPONENTS_DIR "${CMAKE_CURRENT_LIST_DIR}" CACHE STRING "") -set(GLOBAL_COMPONENTS_PATH "${CMAKE_CURRENT_LIST_DIR}/global-components.cmake" CACHE STRING "") +set(GLOBAL_COMPONENTS_DIR + "${CMAKE_CURRENT_LIST_DIR}" + CACHE STRING "" +) +set(GLOBAL_COMPONENTS_PATH + "${CMAKE_CURRENT_LIST_DIR}/global-components.cmake" + CACHE STRING "" +) mark_as_advanced(GLOBAL_COMPONENTS_DIR GLOBAL_COMPONENTS_PATH) macro(global_components_import_project) @@ -14,8 +20,5 @@ endmacro() include(FindPackageHandleStandardArgs) FIND_PACKAGE_HANDLE_STANDARD_ARGS( - global-components - DEFAULT_MSG - GLOBAL_COMPONENTS_DIR - GLOBAL_COMPONENTS_PATH + global-components DEFAULT_MSG GLOBAL_COMPONENTS_DIR GLOBAL_COMPONENTS_PATH ) diff --git a/components/Ethdriver/CMakeLists.txt b/components/Ethdriver/CMakeLists.txt index 777b537..0060215 100644 --- a/components/Ethdriver/CMakeLists.txt +++ b/components/Ethdriver/CMakeLists.txt @@ -10,7 +10,15 @@ project(Ethdriver C) CAmkESAddCPPInclude("${CMAKE_CURRENT_LIST_DIR}/include/plat/${KernelPlatform}/") -set(ETHDRIVER_LIBS sel4utils sel4vka sel4allocman sel4vspace sel4simple sel4platsupport ethdrivers) +set(ETHDRIVER_LIBS + sel4utils + sel4vka + sel4allocman + sel4vspace + sel4simple + sel4platsupport + ethdrivers +) DeclareCAmkESComponent( Ethdriver82574 diff --git a/components/SerialServer/CMakeLists.txt b/components/SerialServer/CMakeLists.txt index 7f084b6..be37517 100644 --- a/components/SerialServer/CMakeLists.txt +++ b/components/SerialServer/CMakeLists.txt @@ -10,10 +10,16 @@ cmake_minimum_required(VERSION 3.16.0) project(SerialServer C) if(KernelArchARM) - set(CAmkESDTS ON CACHE BOOL "" FORCE) + set(CAmkESDTS + ON + CACHE BOOL "" FORCE + ) endif() -set(CAmkESCPP ON CACHE BOOL "" FORCE) +set(CAmkESCPP + ON + CACHE BOOL "" FORCE +) # ARM platforms have similar serial configurations in their DTSes and can share # similar headers and code diff --git a/components/SerialServer/camkes-putchar-client/CMakeLists.txt b/components/SerialServer/camkes-putchar-client/CMakeLists.txt index 38dc4f2..a1391d6 100644 --- a/components/SerialServer/camkes-putchar-client/CMakeLists.txt +++ b/components/SerialServer/camkes-putchar-client/CMakeLists.txt @@ -13,9 +13,5 @@ CAmkESAddCPPInclude(camkes-include) CAmkESAddTemplatesPath(templates) DeclareCAmkESConnector( - SerialServerCamkesPutcharClient - FROM - SerialServer-camkes-putchar-client.template.c - TO - empty.c + SerialServerCamkesPutcharClient FROM SerialServer-camkes-putchar-client.template.c TO empty.c ) diff --git a/components/TimeServer/CMakeLists.txt b/components/TimeServer/CMakeLists.txt index 8cca535..44a1d28 100644 --- a/components/TimeServer/CMakeLists.txt +++ b/components/TimeServer/CMakeLists.txt @@ -9,9 +9,15 @@ cmake_minimum_required(VERSION 3.16.0) project(TimeServer C) if(KernelArchARM) - set(CAmkESDTS ON CACHE BOOL "" FORCE) + set(CAmkESDTS + ON + CACHE BOOL "" FORCE + ) endif() -set(CAmkESCPP ON CACHE BOOL "" FORCE) +set(CAmkESCPP + ON + CACHE BOOL "" FORCE +) if("${KernelPlatform}" STREQUAL "pc99") list(APPEND TimeServerPlatSources src/plat/pc99/plat.c) diff --git a/components/modules/picotcp-base/CMakeLists.txt b/components/modules/picotcp-base/CMakeLists.txt index 7e3e820..549111e 100644 --- a/components/modules/picotcp-base/CMakeLists.txt +++ b/components/modules/picotcp-base/CMakeLists.txt @@ -12,7 +12,15 @@ CAmkESAddImportPath(camkes-include) CAmkESAddCPPInclude(camkes-include) CAmkESAddTemplatesPath(templates) -DeclareCAmkESConnector(PicotcpBaseInit FROM pico-init.template.c FROM_LIBS picotcp-init TO empty.c) +DeclareCAmkESConnector( + PicotcpBaseInit + FROM + pico-init.template.c + FROM_LIBS + picotcp-init + TO + empty.c +) add_library(picotcp-init EXCLUDE_FROM_ALL picotcp-init.c) target_link_libraries(picotcp-init sel4camkes picotcp) diff --git a/global-components.cmake b/global-components.cmake index a263276..d45dbb6 100644 --- a/global-components.cmake +++ b/global-components.cmake @@ -11,37 +11,33 @@ include("${CMAKE_CURRENT_LIST_DIR}/global-connectors.cmake") CAmkESAddImportPath(components plat_components/${KernelPlatform}) foreach( - comp - IN - ITEMS - remote-drivers/picotcp-ethernet-async - remote-drivers/picotcp-socket-sync - components/modules/fdt-bind-driver - components/modules/dynamic-untyped-allocators - components/modules/single-threaded - components/modules/x86-iospace-dma - components/modules/picotcp-base - components/ClockServer - components/GPIOMUXServer - components/ResetServer - plat_components/tx2/BPMPServer + comp IN + ITEMS remote-drivers/picotcp-ethernet-async + remote-drivers/picotcp-socket-sync + components/modules/fdt-bind-driver + components/modules/dynamic-untyped-allocators + components/modules/single-threaded + components/modules/x86-iospace-dma + components/modules/picotcp-base + components/ClockServer + components/GPIOMUXServer + components/ResetServer + plat_components/tx2/BPMPServer ) add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/${comp}" ${comp}) endforeach() foreach( - comp - IN - ITEMS - PCIConfigIO - RTC - SerialServer - TimeServer - FileServer - VirtQueue - BenchUtiliz - Ethdriver - PicoServer + comp IN + ITEMS PCIConfigIO + RTC + SerialServer + TimeServer + FileServer + VirtQueue + BenchUtiliz + Ethdriver + PicoServer ) include("${CMAKE_CURRENT_LIST_DIR}/components/${comp}/CMakeLists.txt") endforeach() diff --git a/global-connectors.cmake b/global-connectors.cmake index 059f374..6fee5df 100644 --- a/global-connectors.cmake +++ b/global-connectors.cmake @@ -12,35 +12,17 @@ CAmkESAddImportPath(interfaces plat_interfaces/${KernelPlatform}) CAmkESAddTemplatesPath(templates) # Connector templates with FROM and TO only -foreach( - connector - IN - ITEMS - seL4GlobalAsynch - seL4GlobalAsynchCallback - seL4MessageQueue - seL4RPCOverMultiSharedData +foreach(connector IN ITEMS seL4GlobalAsynch seL4GlobalAsynchCallback seL4MessageQueue + seL4RPCOverMultiSharedData ) DeclareCAmkESConnector( - ${connector} - FROM - ${connector}-from.template.c - TO - ${connector}-to.template.c + ${connector} FROM ${connector}-from.template.c TO ${connector}-to.template.c ) endforeach() # Connector templates with FROM, FROM_HEADER, TO and TO_HEADER -foreach( - connector - IN - ITEMS - seL4RPCCallSignal - seL4RPCDataport - seL4RPCDataportSignal - seL4RPCNoThreads - seL4GPIOServer - seL4Ethdriver +foreach(connector IN ITEMS seL4RPCCallSignal seL4RPCDataport seL4RPCDataportSignal seL4RPCNoThreads + seL4GPIOServer seL4Ethdriver ) DeclareCAmkESConnector( ${connector} @@ -57,10 +39,7 @@ endforeach() # Specific connector templates not fitting with the schemes above DeclareCAmkESConnector( - seL4SharedDataWithCaps - FROM - seL4SharedDataWithCaps.template.c - TO + seL4SharedDataWithCaps FROM seL4SharedDataWithCaps.template.c TO seL4SharedDataWithCaps.template.c ) @@ -139,11 +118,7 @@ DeclareCAmkESConnector( ) DeclareCAmkESConnector( - seL4DTBHardwareThreadless - FROM - empty.c - TO - seL4DTBHardwareThreadless.template.c + seL4DTBHardwareThreadless FROM empty.c TO seL4DTBHardwareThreadless.template.c ) DeclareCAmkESConnector(seL4DTBHWThreadless TO seL4DTBHardwareThreadless.template.c) diff --git a/plat_components/tx2/BPMPServer/CMakeLists.txt b/plat_components/tx2/BPMPServer/CMakeLists.txt index 6961d82..6d76e4b 100644 --- a/plat_components/tx2/BPMPServer/CMakeLists.txt +++ b/plat_components/tx2/BPMPServer/CMakeLists.txt @@ -12,7 +12,10 @@ CAmkESAddImportPath(camkes-include) CAmkESAddCPPInclude(camkes-include) CAmkESAddTemplatesPath(templates) -set(CAmkESDTS ON CACHE BOOL "" FORCE) +set(CAmkESDTS + ON + CACHE BOOL "" FORCE +) DeclareCAmkESConnector( BPMPServerInit diff --git a/remote-drivers/picotcp-socket-sync/CMakeLists.txt b/remote-drivers/picotcp-socket-sync/CMakeLists.txt index 6d55ca8..66e889b 100644 --- a/remote-drivers/picotcp-socket-sync/CMakeLists.txt +++ b/remote-drivers/picotcp-socket-sync/CMakeLists.txt @@ -42,9 +42,5 @@ target_link_libraries(PicoServer-client INTERFACE picotcp-socket-sync) add_library(picotcp-socket-sync-server EXCLUDE_FROM_ALL server/server.c server/picoserver_client.c) target_link_libraries( - picotcp-socket-sync-server - sel4camkes - picotcp - picotcp-socket-sync - PicoServer-client + picotcp-socket-sync-server sel4camkes picotcp picotcp-socket-sync PicoServer-client )