From 0d0b5d6fa7529a10984b3b7bfd6cabf76ab00f39 Mon Sep 17 00:00:00 2001 From: Alessandro Angelino Date: Mon, 13 Jun 2016 16:20:22 +0100 Subject: [PATCH] Update condition to disable FPU when uVisor is supported After the commit: * mbedmicro/mbed@47025b8 "uVisor: Define UVISOR_PRESENT based on target labels" the FPU must be disabled when uVisor is enabled based on different conditions, that is, based on the feature 'UVISOR' being enabled, and the label 'UVISOR_SUPPORTED' being set. --- tools/toolchains/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/toolchains/__init__.py b/tools/toolchains/__init__.py index ae0006bb67..765257fc36 100644 --- a/tools/toolchains/__init__.py +++ b/tools/toolchains/__init__.py @@ -240,7 +240,7 @@ class mbedToolchain: self.mp_pool = None - if 'UVISOR_PRESENT=1' in self.macros: + if 'UVISOR' in self.target.features and 'UVISOR_SUPPORTED' in self.target.extra_labels: self.target.core = re.sub(r"F$", '', self.target.core) def get_output(self):