From 4beafe9ad9141c32a4ba72acb2f7c54a1a49a467 Mon Sep 17 00:00:00 2001
From: Kent McLeod <Kent.Mcleod@data61.csiro.au>
Date: Tue, 7 May 2019 10:35:27 +1000
Subject: [PATCH] CMake: KernelHaveFPU is valid for all aarch64
Instead of setting this option on each platform that supports aarch64,
we set it for all aarch64 platforms. It is expected that every valid
aarch64 platform has an FPU and will be correctly context switched by
the kernel.
---
src/arch/arm/config.cmake | 2 +-
src/plat/bcm2837/config.cmake | 3 ---
src/plat/hikey/config.cmake | 3 ---
src/plat/odroidc2/config.cmake | 3 ---
src/plat/tx1/config.cmake | 1 -
src/plat/tx2/config.cmake | 1 -
src/plat/zynqmp/config.cmake | 3 ---
7 files changed, 1 insertion(+), 15 deletions(-)
diff --git a/src/arch/arm/config.cmake b/src/arch/arm/config.cmake
index 2e81703a1..80d32d594 100644
--- a/src/arch/arm/config.cmake
+++ b/src/arch/arm/config.cmake
@@ -311,7 +311,7 @@ config_option(
DEFAULT_DISABLED OFF
)
-if(KernelAArch32FPUEnableContextSwitch)
+if(KernelAArch32FPUEnableContextSwitch OR KernelSel4ArchAarch64)
set(KernelHaveFPU ON)
endif()
diff --git a/src/plat/bcm2837/config.cmake b/src/plat/bcm2837/config.cmake
index e700a5d6e..df284a119 100644
--- a/src/plat/bcm2837/config.cmake
+++ b/src/plat/bcm2837/config.cmake
@@ -17,9 +17,6 @@ if(KernelPlatformRpi3)
set(KernelArchArmV8a ON)
config_set(KernelPlatform PLAT "bcm2837")
set(KernelArmMachFeatureModifiers "+crc" CACHE INTERNAL "")
- if(KernelSel4ArchAarch64)
- set(KernelHaveFPU ON)
- endif()
list(APPEND KernelDTSList "tools/dts/rpi3.dts")
list(APPEND KernelDTSList "src/plat/bcm2837/overlay-rpi3.dts")
diff --git a/src/plat/hikey/config.cmake b/src/plat/hikey/config.cmake
index 72e0cc1a5..675911344 100644
--- a/src/plat/hikey/config.cmake
+++ b/src/plat/hikey/config.cmake
@@ -69,9 +69,6 @@ if(KernelPlatformHikey)
set(KernelArchArmV8a ON)
config_set(KernelPlatform PLAT "hikey")
set(KernelArmMachFeatureModifiers "+crc" CACHE INTERNAL "")
- if(KernelSel4ArchAarch64)
- set(KernelHaveFPU ON)
- endif()
list(APPEND KernelDTSList "tools/dts/hikey.dts")
list(APPEND KernelDTSList "src/plat/hikey/overlay-hikey.dts")
declare_default_headers(
diff --git a/src/plat/odroidc2/config.cmake b/src/plat/odroidc2/config.cmake
index 6ed5414bd..f19cb3a91 100644
--- a/src/plat/odroidc2/config.cmake
+++ b/src/plat/odroidc2/config.cmake
@@ -17,9 +17,6 @@ if(KernelPlatformOdroidc2)
set(KernelArchArmV8a ON)
config_set(KernelPlatform PLAT "odroidc2")
set(KernelArmMachFeatureModifiers "+crc" CACHE INTERNAL "")
- if(KernelSel4ArchAarch64)
- set(KernelHaveFPU ON)
- endif()
list(APPEND KernelDTSList "tools/dts/odroidc2.dts")
declare_default_headers(
TIMER_FREQUENCY 24000000llu
diff --git a/src/plat/tx1/config.cmake b/src/plat/tx1/config.cmake
index b5756ea94..677c35883 100644
--- a/src/plat/tx1/config.cmake
+++ b/src/plat/tx1/config.cmake
@@ -17,7 +17,6 @@ if(KernelPlatformTx1)
set(KernelArchArmV8a ON)
config_set(KernelPlatform PLAT "tx1")
config_set(KernelArmMach MACH "nvidia")
- set(KernelHaveFPU ON)
set(KernelArmPASizeBits44 ON)
list(APPEND KernelDTSList "tools/dts/tx1.dts")
list(APPEND KernelDTSList "src/plat/tx1/overlay-tx1.dts")
diff --git a/src/plat/tx2/config.cmake b/src/plat/tx2/config.cmake
index ae299f14a..3a339be7f 100644
--- a/src/plat/tx2/config.cmake
+++ b/src/plat/tx2/config.cmake
@@ -17,7 +17,6 @@ if(KernelPlatformTx2)
set(KernelArchArmV8a ON)
config_set(KernelPlatform PLAT "tx2")
config_set(KernelArmMach MACH "nvidia")
- set(KernelHaveFPU ON)
# Note that the 44-bit PA is only for Cortex-A57 cores.
# If we enable the Denver 2 cores, which support 40-bit PA,
# KernelArmPASizeBits40 should be enabled instead.
diff --git a/src/plat/zynqmp/config.cmake b/src/plat/zynqmp/config.cmake
index d4ffed135..bb71f16f4 100644
--- a/src/plat/zynqmp/config.cmake
+++ b/src/plat/zynqmp/config.cmake
@@ -24,9 +24,6 @@ if(KernelPlatformZynqmp)
set(KernelArchArmV8a ON)
config_set(KernelPlatform PLAT "zynqmp")
config_set(KernelArmMach MACH "zynq")
- if(KernelSel4ArchAarch64)
- set(KernelHaveFPU ON)
- endif()
if(NOT KernelPlatformUltra96)
list(APPEND KernelDTSList "tools/dts/zynqmp.dts")
--
GitLab