From 66574aaa9dd30ef017f571a7b85cbb4d97c410c7 Mon Sep 17 00:00:00 2001 From: Jimmy Brisson Date: Fri, 3 Jun 2016 16:18:23 -0500 Subject: [PATCH] made features a first class citizen --- hal/targets.json | 1 + workspace_tools/toolchains/__init__.py | 6 +----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/hal/targets.json b/hal/targets.json index d078d7a4f4..f8efebea6c 100644 --- a/hal/targets.json +++ b/hal/targets.json @@ -6,6 +6,7 @@ "extra_labels": [], "is_disk_virtual": false, "macros": [], + "features": [], "detect_code": [], "public": false }, diff --git a/workspace_tools/toolchains/__init__.py b/workspace_tools/toolchains/__init__.py index 97c6f20f6b..c83da39acf 100644 --- a/workspace_tools/toolchains/__init__.py +++ b/workspace_tools/toolchains/__init__.py @@ -298,11 +298,7 @@ class mbedToolchain: # Add target's symbols self.symbols += self.target.macros - # Add target's hardware - try : - self.symbols += ["DEVICE_" + feature + "=1" for feature in self.target.features] - except AttributeError : - pass + self.symbols += ["DEVICE_" + feature + "=1" for feature in self.target.features] # Add extra symbols passed via 'macros' parameter self.symbols += self.macros