From f20078acea88f7c38f14cbc206053e50c313c357 Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Mon, 12 Sep 2022 10:35:21 +0200 Subject: build: Use enabled by for defaults Merge the "default" and "default-by-variant" attributes. Use an "enabled-by" expression to select the default value based on the enabled set. This makes it possible to select default values depending on other options. For example you could choose memory settings based on whether RTEMS_SMP is enabled or disabled. The change was tested by comparing the output of ./waf bspdefaults before and after the change. --- spec/build/bsps/m68k/mcf5225x/abi.yml | 5 +++-- spec/build/bsps/m68k/mcf5225x/tstmcf5225x.yml | 3 +-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'spec/build/bsps/m68k/mcf5225x') diff --git a/spec/build/bsps/m68k/mcf5225x/abi.yml b/spec/build/bsps/m68k/mcf5225x/abi.yml index 643eaa7548..c801d96c83 100644 --- a/spec/build/bsps/m68k/mcf5225x/abi.yml +++ b/spec/build/bsps/m68k/mcf5225x/abi.yml @@ -7,8 +7,9 @@ build-type: option copyrights: - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) default: -- -mcpu=52235 -default-by-variant: [] +- enabled-by: true + value: + - -mcpu=52235 description: | ABI flags enabled-by: true diff --git a/spec/build/bsps/m68k/mcf5225x/tstmcf5225x.yml b/spec/build/bsps/m68k/mcf5225x/tstmcf5225x.yml index 60470420df..8958d2e837 100644 --- a/spec/build/bsps/m68k/mcf5225x/tstmcf5225x.yml +++ b/spec/build/bsps/m68k/mcf5225x/tstmcf5225x.yml @@ -10,8 +10,7 @@ actions: build-type: option copyrights: - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) -default: null -default-by-variant: [] +default: [] description: '' enabled-by: true links: -- cgit v1.2.3