From 7f75b104579a5b44e0a1613ada0497a603a8efee Mon Sep 17 00:00:00 2001 From: Alban Bedel Date: Thu, 15 Aug 2019 11:28:57 +0200 Subject: [PATCH] optee: Add optee as a machine feature to all supported boards Currently we assume that all qoriq arm64 boards support optee, however that might not be the case for boards added by other layers building on top of meta-freescale. To better support this case add a machine feature to indicate if a given machine has optee support. Add the new optee feature to all qoriq arm64 except ls2080ardb as it doesn't seems to be supported by optee. Signed-off-by: Alban Bedel --- conf/machine/ls1012afrwy.conf | 2 ++ conf/machine/ls1012ardb.conf | 2 ++ conf/machine/ls1021atwr.conf | 2 ++ conf/machine/ls1043ardb.conf | 2 ++ conf/machine/ls1046ardb.conf | 2 ++ conf/machine/ls1088ardb-pb.conf | 2 ++ conf/machine/ls1088ardb.conf | 2 ++ conf/machine/ls2088ardb.conf | 2 ++ conf/machine/lx2160ardb.conf | 2 ++ 9 files changed, 18 insertions(+) diff --git a/conf/machine/ls1012afrwy.conf b/conf/machine/ls1012afrwy.conf index 13b6138a..449e518c 100644 --- a/conf/machine/ls1012afrwy.conf +++ b/conf/machine/ls1012afrwy.conf @@ -10,6 +10,8 @@ MACHINEOVERRIDES =. "fsl-lsch2:ls1012a:" require conf/machine/include/qoriq-arm64.inc require conf/machine/include/arm/arch-arm64.inc +MACHINE_FEATURES += "optee" + KERNEL_CLASSES = " kernel-fitimage " KERNEL_IMAGETYPES = "fitImage" diff --git a/conf/machine/ls1012ardb.conf b/conf/machine/ls1012ardb.conf index 85b01af6..6dbb1bda 100644 --- a/conf/machine/ls1012ardb.conf +++ b/conf/machine/ls1012ardb.conf @@ -10,6 +10,8 @@ MACHINEOVERRIDES =. "fsl-lsch2:ls1012a:" require conf/machine/include/qoriq-arm64.inc require conf/machine/include/arm/arch-arm64.inc +MACHINE_FEATURES += "optee" + KERNEL_CLASSES = " kernel-fitimage " KERNEL_IMAGETYPES = "fitImage" diff --git a/conf/machine/ls1021atwr.conf b/conf/machine/ls1021atwr.conf index a238fdca..3ccb621c 100644 --- a/conf/machine/ls1021atwr.conf +++ b/conf/machine/ls1021atwr.conf @@ -10,6 +10,8 @@ MACHINEOVERRIDES =. "ls102xa:" require conf/machine/include/qoriq-arm.inc require conf/machine/include/tune-cortexa7.inc +MACHINE_FEATURES += "optee" + DEFAULTTUNE = "cortexa7hf-neon" UBOOT_CONFIG ??= "sdcard-ifc-secure-boot sdcard-ifc sdcard-qspi lpuart qspi secure-boot nor" diff --git a/conf/machine/ls1043ardb.conf b/conf/machine/ls1043ardb.conf index b00b9876..2edefa1e 100644 --- a/conf/machine/ls1043ardb.conf +++ b/conf/machine/ls1043ardb.conf @@ -10,6 +10,8 @@ MACHINEOVERRIDES =. "fsl-lsch2:ls1043a:" require conf/machine/include/qoriq-arm64.inc require conf/machine/include/arm/arch-arm64.inc +MACHINE_FEATURES += "optee" + KERNEL_CLASSES = " kernel-fitimage " KERNEL_IMAGETYPES = "fitImage" diff --git a/conf/machine/ls1046ardb.conf b/conf/machine/ls1046ardb.conf index b3000f0f..3a1b0042 100644 --- a/conf/machine/ls1046ardb.conf +++ b/conf/machine/ls1046ardb.conf @@ -9,6 +9,8 @@ MACHINEOVERRIDES =. "fsl-lsch2:ls1046a:" require conf/machine/include/qoriq-arm64.inc require conf/machine/include/arm/arch-arm64.inc +MACHINE_FEATURES += "optee" + KERNEL_CLASSES = " kernel-fitimage " KERNEL_IMAGETYPES = "fitImage" diff --git a/conf/machine/ls1088ardb-pb.conf b/conf/machine/ls1088ardb-pb.conf index 11fdf0db..2e456f1b 100644 --- a/conf/machine/ls1088ardb-pb.conf +++ b/conf/machine/ls1088ardb-pb.conf @@ -9,6 +9,8 @@ require conf/machine/include/arm/arch-arm64.inc MACHINEOVERRIDES =. "fsl-lsch3:ls1088a:" +MACHINE_FEATURES += "optee" + KERNEL_CLASSES = " kernel-fitimage " KERNEL_IMAGETYPES = "fitImage" diff --git a/conf/machine/ls1088ardb.conf b/conf/machine/ls1088ardb.conf index 0dc03086..8f47f284 100644 --- a/conf/machine/ls1088ardb.conf +++ b/conf/machine/ls1088ardb.conf @@ -9,6 +9,8 @@ require conf/machine/include/arm/arch-arm64.inc MACHINEOVERRIDES =. "fsl-lsch3:ls1088a:" +MACHINE_FEATURES += "optee" + KERNEL_CLASSES = " kernel-fitimage " KERNEL_IMAGETYPES = "fitImage" diff --git a/conf/machine/ls2088ardb.conf b/conf/machine/ls2088ardb.conf index 929094ea..de9f279f 100644 --- a/conf/machine/ls2088ardb.conf +++ b/conf/machine/ls2088ardb.conf @@ -9,6 +9,8 @@ require conf/machine/include/arm/arch-arm64.inc MACHINEOVERRIDES =. "fsl-lsch3:ls2088a:" +MACHINE_FEATURES += "optee" + KERNEL_CLASSES = " kernel-fitimage " KERNEL_IMAGETYPES = "fitImage" diff --git a/conf/machine/lx2160ardb.conf b/conf/machine/lx2160ardb.conf index 3300488f..80d1e8ea 100644 --- a/conf/machine/lx2160ardb.conf +++ b/conf/machine/lx2160ardb.conf @@ -9,6 +9,8 @@ require conf/machine/include/arm/arch-arm64.inc MACHINEOVERRIDES =. "fsl-lsch3:lx2160a:" +MACHINE_FEATURES += "optee" + KERNEL_CLASSES = " kernel-fitimage " KERNEL_IMAGETYPES = "fitImage" -- 2.40.1