diff --git a/CMakeLists.txt b/CMakeLists.txt
index dcdf92b2b..f7a8313ea 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)
diff --git a/config.cmake b/config.cmake
index 57eadaf3e..7c97174af 100644
--- a/config.cmake
+++ b/config.cmake
@@ -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."
diff --git a/gcc.cmake b/gcc.cmake
index a96be34e2..49e8b7862 100644
--- a/gcc.cmake
+++ b/gcc.cmake
@@ -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
diff --git a/include/32/mode/config.cmake b/include/32/mode/config.cmake
index 9897979d2..ba9fe39f1 100644
--- a/include/32/mode/config.cmake
+++ b/include/32/mode/config.cmake
@@ -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")
diff --git a/include/64/mode/config.cmake b/include/64/mode/config.cmake
index 6a6789513..d495706cf 100644
--- a/include/64/mode/config.cmake
+++ b/include/64/mode/config.cmake
@@ -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")
diff --git a/libsel4/CMakeLists.txt b/libsel4/CMakeLists.txt
index 61415a7fc..a75ba8245 100644
--- a/libsel4/CMakeLists.txt
+++ b/libsel4/CMakeLists.txt
@@ -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)
 
diff --git a/llvm.cmake b/llvm.cmake
index 8286896c5..fbba2363d 100644
--- a/llvm.cmake
+++ b/llvm.cmake
@@ -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
diff --git a/src/arch/arm/32/config.cmake b/src/arch/arm/32/config.cmake
index 88033b7b4..77b0f74e1 100644
--- a/src/arch/arm/32/config.cmake
+++ b/src/arch/arm/32/config.cmake
@@ -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"
diff --git a/src/arch/arm/64/config.cmake b/src/arch/arm/64/config.cmake
index 93a1158fe..131b283d4 100644
--- a/src/arch/arm/64/config.cmake
+++ b/src/arch/arm/64/config.cmake
@@ -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"
diff --git a/src/arch/arm/armv/armv7-a/config.cmake b/src/arch/arm/armv/armv7-a/config.cmake
index 8b24738b8..cf1e75b4d 100644
--- a/src/arch/arm/armv/armv7-a/config.cmake
+++ b/src/arch/arm/armv/armv7-a/config.cmake
@@ -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"
diff --git a/src/arch/arm/armv/armv8-a/config.cmake b/src/arch/arm/armv/armv8-a/config.cmake
index b4de9c37e..09de51d27 100644
--- a/src/arch/arm/armv/armv8-a/config.cmake
+++ b/src/arch/arm/armv/armv8-a/config.cmake
@@ -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"
diff --git a/src/arch/arm/config.cmake b/src/arch/arm/config.cmake
index 238a78290..b775e0253 100644
--- a/src/arch/arm/config.cmake
+++ b/src/arch/arm/config.cmake
@@ -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)
diff --git a/src/arch/riscv/config.cmake b/src/arch/riscv/config.cmake
index 705c7cb60..6a02980a5 100644
--- a/src/arch/riscv/config.cmake
+++ b/src/arch/riscv/config.cmake
@@ -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 \
diff --git a/src/arch/x86/32/config.cmake b/src/arch/x86/32/config.cmake
index 10d231fa4..4eb7d5eb9 100644
--- a/src/arch/x86/32/config.cmake
+++ b/src/arch/x86/32/config.cmake
@@ -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"
diff --git a/src/arch/x86/64/config.cmake b/src/arch/x86/64/config.cmake
index fa81aa2e1..5352e66c4 100644
--- a/src/arch/x86/64/config.cmake
+++ b/src/arch/x86/64/config.cmake
@@ -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"
diff --git a/src/arch/x86/config.cmake b/src/arch/x86/config.cmake
index 2c170bd09..85d61f8ca 100644
--- a/src/arch/x86/config.cmake
+++ b/src/arch/x86/config.cmake
@@ -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(
diff --git a/src/config.cmake b/src/config.cmake
index 492c04ff8..2be645c3d 100644
--- a/src/config.cmake
+++ b/src/config.cmake
@@ -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
diff --git a/src/drivers/config.cmake b/src/drivers/config.cmake
index 04f536d9e..34c14416a 100644
--- a/src/drivers/config.cmake
+++ b/src/drivers/config.cmake
@@ -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})
diff --git a/src/drivers/serial/config.cmake b/src/drivers/serial/config.cmake
index 0c99a8c1a..27aef66bf 100644
--- a/src/drivers/serial/config.cmake
+++ b/src/drivers/serial/config.cmake
@@ -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"
diff --git a/src/drivers/smmu/config.cmake b/src/drivers/smmu/config.cmake
index 0777cb286..a938fbd3a 100644
--- a/src/drivers/smmu/config.cmake
+++ b/src/drivers/smmu/config.cmake
@@ -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")
diff --git a/src/drivers/timer/config.cmake b/src/drivers/timer/config.cmake
index f9d471afb..a6f2a2793 100644
--- a/src/drivers/timer/config.cmake
+++ b/src/drivers/timer/config.cmake
@@ -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"
diff --git a/src/plat/allwinnerA20/config.cmake b/src/plat/allwinnerA20/config.cmake
index 9032a248d..f8377f10e 100644
--- a/src/plat/allwinnerA20/config.cmake
+++ b/src/plat/allwinnerA20/config.cmake
@@ -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)
diff --git a/src/plat/am335x/config.cmake b/src/plat/am335x/config.cmake
index 89f362f19..afa881f72 100644
--- a/src/plat/am335x/config.cmake
+++ b/src/plat/am335x/config.cmake
@@ -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(
diff --git a/src/plat/apq8064/config.cmake b/src/plat/apq8064/config.cmake
index 67a01f5db..705f95915 100644
--- a/src/plat/apq8064/config.cmake
+++ b/src/plat/apq8064/config.cmake
@@ -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)
diff --git a/src/plat/ariane/config.cmake b/src/plat/ariane/config.cmake
index cf956d7d2..92b78278c 100644
--- a/src/plat/ariane/config.cmake
+++ b/src/plat/ariane/config.cmake
@@ -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)
diff --git a/src/plat/bcm2711/config.cmake b/src/plat/bcm2711/config.cmake
index d66df9de9..66d402fe6 100644
--- a/src/plat/bcm2711/config.cmake
+++ b/src/plat/bcm2711/config.cmake
@@ -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)
diff --git a/src/plat/bcm2837/config.cmake b/src/plat/bcm2837/config.cmake
index 56d0098ed..98d768523 100644
--- a/src/plat/bcm2837/config.cmake
+++ b/src/plat/bcm2837/config.cmake
@@ -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)
diff --git a/src/plat/cheshire/config.cmake b/src/plat/cheshire/config.cmake
index f6ee136fa..346f34f15 100644
--- a/src/plat/cheshire/config.cmake
+++ b/src/plat/cheshire/config.cmake
@@ -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)
diff --git a/src/plat/exynos4/config.cmake b/src/plat/exynos4/config.cmake
index b260f1779..c6c1be4b0 100644
--- a/src/plat/exynos4/config.cmake
+++ b/src/plat/exynos4/config.cmake
@@ -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)
diff --git a/src/plat/exynos5/config.cmake b/src/plat/exynos5/config.cmake
index dbb6ec02e..087f5c2e7 100644
--- a/src/plat/exynos5/config.cmake
+++ b/src/plat/exynos5/config.cmake
@@ -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
diff --git a/src/plat/fvp/config.cmake b/src/plat/fvp/config.cmake
index 70ba4e68e..32b0ef983 100644
--- a/src/plat/fvp/config.cmake
+++ b/src/plat/fvp/config.cmake
@@ -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)
diff --git a/src/plat/hifive/config.cmake b/src/plat/hifive/config.cmake
index 0b891b3d7..7bf506080 100644
--- a/src/plat/hifive/config.cmake
+++ b/src/plat/hifive/config.cmake
@@ -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)
diff --git a/src/plat/hikey/config.cmake b/src/plat/hikey/config.cmake
index 3eff84c5d..0414ae6aa 100644
--- a/src/plat/hikey/config.cmake
+++ b/src/plat/hikey/config.cmake
@@ -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)
diff --git a/src/plat/imx6/config.cmake b/src/plat/imx6/config.cmake
index e5b01420c..6240a24ea 100644
--- a/src/plat/imx6/config.cmake
+++ b/src/plat/imx6/config.cmake
@@ -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
diff --git a/src/plat/imx7/config.cmake b/src/plat/imx7/config.cmake
index 4ba6e7c87..b4ea45174 100644
--- a/src/plat/imx7/config.cmake
+++ b/src/plat/imx7/config.cmake
@@ -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)
diff --git a/src/plat/imx8m-evk/config.cmake b/src/plat/imx8m-evk/config.cmake
index 73acd3979..bb189b415 100644
--- a/src/plat/imx8m-evk/config.cmake
+++ b/src/plat/imx8m-evk/config.cmake
@@ -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)
diff --git a/src/plat/imx93/config.cmake b/src/plat/imx93/config.cmake
index 5d6ed8faf..f41b1d5a9 100644
--- a/src/plat/imx93/config.cmake
+++ b/src/plat/imx93/config.cmake
@@ -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)
diff --git a/src/plat/maaxboard/config.cmake b/src/plat/maaxboard/config.cmake
index 32b1f17e0..a0ff50e90 100644
--- a/src/plat/maaxboard/config.cmake
+++ b/src/plat/maaxboard/config.cmake
@@ -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)
diff --git a/src/plat/odroidc2/config.cmake b/src/plat/odroidc2/config.cmake
index 2ffb76643..de4098ad8 100644
--- a/src/plat/odroidc2/config.cmake
+++ b/src/plat/odroidc2/config.cmake
@@ -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)
diff --git a/src/plat/odroidc4/config.cmake b/src/plat/odroidc4/config.cmake
index 06b5efdb1..3ba86f1bd 100644
--- a/src/plat/odroidc4/config.cmake
+++ b/src/plat/odroidc4/config.cmake
@@ -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(
diff --git a/src/plat/omap3/config.cmake b/src/plat/omap3/config.cmake
index 0bf16034c..7144dce2f 100644
--- a/src/plat/omap3/config.cmake
+++ b/src/plat/omap3/config.cmake
@@ -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)
diff --git a/src/plat/pc99/config.cmake b/src/plat/pc99/config.cmake
index aebdbe94e..6a382b203 100644
--- a/src/plat/pc99/config.cmake
+++ b/src/plat/pc99/config.cmake
@@ -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)
diff --git a/src/plat/polarfire/config.cmake b/src/plat/polarfire/config.cmake
index dd6f289e9..2f4618331 100644
--- a/src/plat/polarfire/config.cmake
+++ b/src/plat/polarfire/config.cmake
@@ -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)
diff --git a/src/plat/qemu-arm-virt/config.cmake b/src/plat/qemu-arm-virt/config.cmake
index 775ea9dd9..af98c16e9 100644
--- a/src/plat/qemu-arm-virt/config.cmake
+++ b/src/plat/qemu-arm-virt/config.cmake
@@ -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)
diff --git a/src/plat/qemu-riscv-virt/config.cmake b/src/plat/qemu-riscv-virt/config.cmake
index a5b960be5..de62061d6 100644
--- a/src/plat/qemu-riscv-virt/config.cmake
+++ b/src/plat/qemu-riscv-virt/config.cmake
@@ -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)
diff --git a/src/plat/quartz64/config.cmake b/src/plat/quartz64/config.cmake
index 4bf4e2d2d..51ef0a6ff 100644
--- a/src/plat/quartz64/config.cmake
+++ b/src/plat/quartz64/config.cmake
@@ -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)
diff --git a/src/plat/rocketchip/config.cmake b/src/plat/rocketchip/config.cmake
index 44f1c6129..dbb2bfcd0 100644
--- a/src/plat/rocketchip/config.cmake
+++ b/src/plat/rocketchip/config.cmake
@@ -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)
diff --git a/src/plat/rockpro64/config.cmake b/src/plat/rockpro64/config.cmake
index 5959c6d69..ac4ec6067 100644
--- a/src/plat/rockpro64/config.cmake
+++ b/src/plat/rockpro64/config.cmake
@@ -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)
diff --git a/src/plat/spike/config.cmake b/src/plat/spike/config.cmake
index e948120da..27271f604 100644
--- a/src/plat/spike/config.cmake
+++ b/src/plat/spike/config.cmake
@@ -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)
diff --git a/src/plat/star64/config.cmake b/src/plat/star64/config.cmake
index 46a0a27b0..c6a3f5336 100644
--- a/src/plat/star64/config.cmake
+++ b/src/plat/star64/config.cmake
@@ -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)
diff --git a/src/plat/tk1/config.cmake b/src/plat/tk1/config.cmake
index 024b19159..be81ebd3b 100644
--- a/src/plat/tk1/config.cmake
+++ b/src/plat/tk1/config.cmake
@@ -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)
diff --git a/src/plat/tqma8xqp1gb/config.cmake b/src/plat/tqma8xqp1gb/config.cmake
index 75e971c99..5b67e5049 100644
--- a/src/plat/tqma8xqp1gb/config.cmake
+++ b/src/plat/tqma8xqp1gb/config.cmake
@@ -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)
diff --git a/src/plat/tx1/config.cmake b/src/plat/tx1/config.cmake
index e311b23be..d348d149b 100644
--- a/src/plat/tx1/config.cmake
+++ b/src/plat/tx1/config.cmake
@@ -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)
diff --git a/src/plat/tx2/config.cmake b/src/plat/tx2/config.cmake
index 0bd153121..44d78e738 100644
--- a/src/plat/tx2/config.cmake
+++ b/src/plat/tx2/config.cmake
@@ -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)
diff --git a/src/plat/zynq7000/config.cmake b/src/plat/zynq7000/config.cmake
index 1491dfb6c..5f640d5b9 100644
--- a/src/plat/zynq7000/config.cmake
+++ b/src/plat/zynq7000/config.cmake
@@ -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)
diff --git a/src/plat/zynqmp/config.cmake b/src/plat/zynqmp/config.cmake
index 67d839e55..76853a4ce 100644
--- a/src/plat/zynqmp/config.cmake
+++ b/src/plat/zynqmp/config.cmake
@@ -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)
diff --git a/tools/flags.cmake b/tools/flags.cmake
index d72c645a5..5895e8354 100644
--- a/tools/flags.cmake
+++ b/tools/flags.cmake
@@ -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
diff --git a/tools/helpers.cmake b/tools/helpers.cmake
index 312ad4898..0c7768a35 100644
--- a/tools/helpers.cmake
+++ b/tools/helpers.cmake
@@ -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
diff --git a/tools/internal.cmake b/tools/internal.cmake
index 2ae3e42c6..e47f4853f 100644
--- a/tools/internal.cmake
+++ b/tools/internal.cmake
@@ -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