Bump minimum CMake version

Compatibility with versions <3.10 is going away.
As it happens, we're not using any CMake features that have changed
between 3.7 and 3.16, so bump the lowest version to 3.16.

Also remove the minimum version statement from the platform config
files --- they're all very simple files that are version independent;
and the version is checked elsewhere anyway.

Also, Fix style issue

A commit to fix style to make the PR go through.

Signed-off-by: Peter Chubb <Peter.Chubb@unsw.edu.au>
This commit is contained in:
Peter Chubb 2025-02-26 11:46:58 +11:00 committed by Peter Chubb
parent 475f0911fc
commit e7bb62d2ce
59 changed files with 34 additions and 105 deletions

View File

@ -4,7 +4,7 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.8.2)
cmake_minimum_required(VERSION 3.16.0)
include(CheckCCompilerFlag)
include(${CMAKE_CURRENT_LIST_DIR}/configs/seL4Config.cmake)

View File

@ -4,7 +4,7 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
cmake_minimum_required(VERSION 3.16.0)
config_option(
KernelIsMCS KERNEL_MCS "Use the MCS kernel configuration, which is not verified."

View File

@ -4,7 +4,7 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
cmake_minimum_required(VERSION 3.16.0)
set(CMAKE_SYSTEM_NAME Generic)
# For a generic system this is unused, so define it to something that will be

View File

@ -4,6 +4,6 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
cmake_minimum_required(VERSION 3.16.0)
add_bf_source_old("Kernel32" "shared_types.bf" "libsel4/mode_include/32" "sel4")

View File

@ -4,6 +4,6 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
cmake_minimum_required(VERSION 3.16.0)
add_bf_source_old("Kernel64" "shared_types.bf" "libsel4/mode_include/64" "sel4")

View File

@ -4,7 +4,7 @@
# SPDX-License-Identifier: BSD-2-Clause
#
cmake_minimum_required(VERSION 3.7.2)
cmake_minimum_required(VERSION 3.16.0)
project(libsel4 C)

View File

@ -4,7 +4,7 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
cmake_minimum_required(VERSION 3.16.0)
set(CMAKE_SYSTEM_NAME Generic)
# For a generic system this is unused, so define it to something that will be

View File

@ -4,7 +4,7 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
cmake_minimum_required(VERSION 3.16.0)
add_sources(
DEP "KernelSel4ArchAarch32"

View File

@ -4,7 +4,7 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
cmake_minimum_required(VERSION 3.16.0)
add_sources(
DEP "KernelSel4ArchAarch64"

View File

@ -4,7 +4,7 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
cmake_minimum_required(VERSION 3.16.0)
add_sources(
DEP "KernelArchArmV7a"

View File

@ -4,7 +4,7 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
cmake_minimum_required(VERSION 3.16.0)
add_sources(
DEP "KernelArchArmV8a"

View File

@ -4,7 +4,7 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
cmake_minimum_required(VERSION 3.16.0)
if(KernelSel4ArchAarch32)
set_property(TARGET kernel_config_target APPEND PROPERTY TOPLEVELTYPES pde_C)

View File

@ -4,7 +4,7 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
cmake_minimum_required(VERSION 3.16.0)
config_string(
KernelPTLevels PT_LEVELS "Number of page \

View File

@ -4,7 +4,7 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
cmake_minimum_required(VERSION 3.16.0)
add_sources(
DEP "KernelSel4ArchIA32"

View File

@ -4,7 +4,7 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
cmake_minimum_required(VERSION 3.16.0)
add_sources(
DEP "KernelSel4ArchX86_64"

View File

@ -4,7 +4,7 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
cmake_minimum_required(VERSION 3.16.0)
if(KernelArchX86)
set_property(TARGET kernel_config_target APPEND PROPERTY TOPLEVELTYPES pde_C)
@ -72,8 +72,8 @@ config_option(
config_string(
KernelCacheLnSz CACHE_LN_SZ "Define cache line size for the current architecture"
DEFAULT 64
DEPENDS "KernelArchX86" UNDEF_DISABLED
UNQUOTE
DEPENDS "KernelArchX86"
UNDEF_DISABLED UNQUOTE
)
config_option(
@ -226,11 +226,11 @@ config_choice(
config_string(
KernelMultibootGFXDepth MULTIBOOT_GRAPHICS_MODE_DEPTH
"The bits per pixel of the linear graphics mode ot request. Value of zero indicates \
"The bits per pixel of the linear graphics mode to request. Value of zero indicates \
no preference."
DEFAULT 32
DEPENDS "KernelMultibootGFXModeLinear" UNDEF_DISABLED
UNQUOTE
DEPENDS "KernelMultibootGFXModeLinear"
UNDEF_DISABLED UNQUOTE
)
config_string(
@ -239,8 +239,8 @@ config_string(
number of pixels. For a text mode this is the number of characters, value of zero \
indicates no preference."
DEFAULT 0
DEPENDS "KernelMultibootGFXModeText OR KernelMultibootGFXModeLinear" UNDEF_DISABLED
UNQUOTE
DEPENDS "KernelMultibootGFXModeText OR KernelMultibootGFXModeLinear"
UNDEF_DISABLED UNQUOTE
)
config_string(
KernelMultibootGFXHeight MULTIBOOT_GRAPHICS_MODE_HEIGHT
@ -248,8 +248,8 @@ config_string(
number of pixels. For a text mode this is the number of characters, value of zero \
indicates no preference."
DEFAULT 0
DEPENDS "KernelMultibootGFXModeText OR KernelMultibootGFXModeLinear" UNDEF_DISABLED
UNQUOTE
DEPENDS "KernelMultibootGFXModeText OR KernelMultibootGFXModeLinear"
UNDEF_DISABLED UNQUOTE
)
config_option(

View File

@ -4,7 +4,7 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
cmake_minimum_required(VERSION 3.16.0)
add_sources(
CFILES

View File

@ -4,7 +4,7 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
cmake_minimum_required(VERSION 3.16.0)
macro(register_driver compatibility_strings match_strings)
foreach(match_string IN ITEMS ${match_strings})

View File

@ -5,7 +5,7 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
cmake_minimum_required(VERSION 3.16.0)
register_driver(
compatibility_strings "brcm,bcm2835-aux-uart"

View File

@ -4,6 +4,6 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
cmake_minimum_required(VERSION 3.16.0)
register_driver(compatibility_strings "arm,mmu-500" PREFIX src/drivers/smmu CFILES "smmuv2.c")

View File

@ -4,7 +4,7 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
cmake_minimum_required(VERSION 3.16.0)
register_driver(
compatibility_strings "ti,am335x-timer"

View File

@ -4,8 +4,6 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
declare_platform(allwinnerA20 KernelPlatformAllwinnerA20 PLAT_ALLWINNERA20 KernelSel4ArchAarch32)
if(KernelPlatformAllwinnerA20)

View File

@ -4,8 +4,6 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
declare_platform(am335x KernelPlatformAM335X PLAT_AM335X KernelSel4ArchAarch32)
set(c_configs PLAT_AM335X_BONEBLACK PLAT_AM335X_BONEBLUE PLAT_AM335X_BONE)
set(

View File

@ -4,8 +4,6 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
declare_platform(apq8064 KernelPlatformAPQ8064 PLAT_APQ8064 KernelSel4ArchAarch32)
if(KernelPlatformAPQ8064)

View File

@ -5,8 +5,6 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
declare_platform(ariane KernelPlatformAriane PLAT_ARIANE KernelArchRiscV)
if(KernelPlatformAriane)

View File

@ -5,8 +5,6 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
declare_platform(bcm2711 KernelPlatformRpi4 PLAT_BCM2711 KernelArchARM)
if(KernelPlatformRpi4)

View File

@ -4,8 +4,6 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
declare_platform(bcm2837 KernelPlatformRpi3 PLAT_BCM2837 KernelArchARM)
if(KernelPlatformRpi3)

View File

@ -6,8 +6,6 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
declare_platform(cheshire KernelPlatformCheshire PLAT_CHESHIRE KernelArchRiscV)
if(KernelPlatformCheshire)

View File

@ -4,8 +4,6 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
declare_platform(exynos4 KernelPlatformExynos4 PLAT_EXYNOS4 KernelSel4ArchAarch32)
if(KernelPlatformExynos4)

View File

@ -4,8 +4,6 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
# We introduce a variable to hold this long expression to prevent the
# code styler from line-wrapping the declare_platform() statement. We
# want to keep that on one line so the `griddle` tool (or humans) can

View File

@ -4,8 +4,6 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
declare_platform(fvp KernelPlatformFVP PLAT_FVP KernelSel4ArchAarch64)
if(KernelPlatformFVP)

View File

@ -5,8 +5,6 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
declare_platform(hifive KernelPlatformHifive PLAT_HIFIVE KernelSel4ArchRiscV64)
if(KernelPlatformHifive)

View File

@ -4,8 +4,6 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
declare_platform(hikey KernelPlatformHikey PLAT_HIKEY KernelArchARM)
if(KernelPlatformHikey)

View File

@ -5,8 +5,6 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
declare_platform(imx6 KernelPlatImx6 PLAT_IMX6 KernelSel4ArchAarch32)
# disable platform specific settings by default in cache, will be enabled below

View File

@ -4,8 +4,6 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
declare_platform(imx7 KernelPlatImx7 PLAT_IMX7_SABRE KernelSel4ArchAarch32)
if(KernelPlatImx7)

View File

@ -5,8 +5,6 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
declare_platform(imx8mq-evk KernelPlatformImx8mq-evk PLAT_IMX8MQ_EVK KernelArchARM)
declare_platform(imx8mm-evk KernelPlatformImx8mm-evk PLAT_IMX8MM_EVK KernelArchARM)
declare_platform(imx8mp-evk KernelPlatformImx8mp-evk PLAT_IMX8MP_EVK KernelArchARM)

View File

@ -3,9 +3,6 @@
#
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
declare_platform(imx93 KernelPlatformIMX93 PLAT_IMX93 KernelArchARM)
if(KernelPlatformIMX93)

View File

@ -5,8 +5,6 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
declare_platform(maaxboard KernelPlatformMaaxboard PLAT_MAAXBOARD KernelArchARM)
if(KernelPlatformMaaxboard)

View File

@ -4,8 +4,6 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
declare_platform(odroidc2 KernelPlatformOdroidc2 PLAT_ODROIDC2 KernelSel4ArchAarch64)
if(KernelPlatformOdroidc2)

View File

@ -4,8 +4,6 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
declare_platform(odroidc4 KernelPlatformOdroidc4 PLAT_ODROIDC4 KernelSel4ArchAarch64)
if(KernelPlatformOdroidc4)
@ -13,7 +11,7 @@ if(KernelPlatformOdroidc4)
set(KernelArmCortexA55 ON)
set(KernelArchArmV8a ON)
config_set(KernelARMPlatform ARM_PLAT odroidc4)
set(KernelArmMachFeatureModifiers "+crc" CACHE INTERNAL "")
set(KernelArmMachFeatureModifiers "+fp+simd+crc" CACHE INTERNAL "")
list(APPEND KernelDTSList "tools/dts/odroidc4.dts" "src/plat/odroidc4/overlay-odroidc4.dts")
# MAX_IRQ is based on the section 7.10.2 of the S905X3 SoC manual
declare_default_headers(

View File

@ -4,8 +4,6 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
declare_platform(omap3 KernelPlatformOMAP3 PLAT_OMAP3 KernelSel4ArchAarch32)
if(KernelPlatformOMAP3)

View File

@ -4,8 +4,6 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
declare_platform(pc99 KernelPlatPC99 PLAT_PC99 KernelArchX86)
if(KernelPlatPC99)

View File

@ -4,8 +4,6 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
declare_platform(polarfire KernelPlatformPolarfire PLAT_POLARFIRE KernelSel4ArchRiscV64)
if(KernelPlatformPolarfire)

View File

@ -5,8 +5,6 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
declare_platform(qemu-arm-virt KernelPlatformQEMUArmVirt PLAT_QEMU_ARM_VIRT KernelArchARM)
set(qemu_user_top 0xa0000000)

View File

@ -5,8 +5,6 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
declare_platform(qemu-riscv-virt KernelPlatformQEMURiscVVirt PLAT_QEMU_RISCV_VIRT KernelArchRiscV)
if(KernelPlatformQEMURiscVVirt)

View File

@ -4,8 +4,6 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
declare_platform(quartz64 KernelPlatformQuartz64 PLAT_QUARTZ64 KernelSel4ArchAarch64)
if(KernelPlatformQuartz64)

View File

@ -6,8 +6,6 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
declare_platform(rocketchip KernelPlatformRocketchip PLAT_ROCKETCHIP KernelArchRiscV)
set(c_configs PLAT_ROCKETCHIP_BASE PLAT_ROCKETCHIP_ZCU102)

View File

@ -4,8 +4,6 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
declare_platform(rockpro64 KernelPlatformRockpro64 PLAT_ROCKPRO64 KernelSel4ArchAarch64)
if(KernelPlatformRockpro64)

View File

@ -6,8 +6,6 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
declare_platform(spike KernelPlatformSpike PLAT_SPIKE KernelArchRiscV)
if(KernelPlatformSpike)

View File

@ -4,8 +4,6 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
declare_platform(star64 KernelPlatformStar64 PLAT_STAR64 KernelArchRiscV)
if(KernelPlatformStar64)

View File

@ -4,8 +4,6 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
declare_platform(tk1 KernelPlatformTK1 PLAT_TK1 "KernelSel4ArchAarch32 OR KernelSel4ArchArmHyp")
if(KernelPlatformTK1)

View File

@ -4,8 +4,6 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
declare_platform(tqma8xqp1gb KernelPlatformTqma8xqp1gb PLAT_TQMA8XQP1GB KernelArchARM)
if(KernelPlatformTqma8xqp1gb)

View File

@ -4,8 +4,6 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
declare_platform(tx1 KernelPlatformTx1 PLAT_TX1 KernelSel4ArchAarch64)
if(KernelPlatformTx1)

View File

@ -4,8 +4,6 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
declare_platform(tx2 KernelPlatformTx2 PLAT_TX2 KernelSel4ArchAarch64)
if(KernelPlatformTx2)

View File

@ -4,8 +4,6 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
declare_platform(zynq7000 KernelPlatformZynq7000 PLAT_ZYNQ7000 KernelSel4ArchAarch32)
if(KernelPlatformZynq7000)

View File

@ -4,8 +4,6 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
declare_platform(zynqmp KernelPlatformZynqmp PLAT_ZYNQMP KernelArchARM)
set(c_configs PLAT_ZYNQMP_ZCU102 PLAT_ZYNQMP_ULTRA96 PLAT_ZYNQMP_ULTRA96V2)

View File

@ -4,7 +4,7 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
cmake_minimum_required(VERSION 3.16.0)
# Set the cmake compilation flags with kernel base flags
# This allows, for example, user compilation to ensure they are building for the same

View File

@ -4,7 +4,7 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.8.2)
cmake_minimum_required(VERSION 3.16.0)
# Wrapper function around find_file that generates a fatal error if it isn't found
# Is equivalent to find_file except that it adds CMAKE_CURRENT_SOURCE_DIR as a path and sets

View File

@ -4,7 +4,7 @@
# SPDX-License-Identifier: GPL-2.0-only
#
cmake_minimum_required(VERSION 3.7.2)
cmake_minimum_required(VERSION 3.16.0)
# File for helpers that are very specific to the kernel