diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2022-09-12 10:35:21 +0200 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2023-01-17 08:31:48 +0100 |
commit | f20078acea88f7c38f14cbc206053e50c313c357 (patch) | |
tree | b00ad4ff46b7da85f4b5206561961d0317b86375 /spec/build/bsps/arm/rtl22xx | |
parent | build: Replace variant patterns with a list (diff) | |
download | rtems-f20078acea88f7c38f14cbc206053e50c313c357.tar.bz2 |
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.
Diffstat (limited to 'spec/build/bsps/arm/rtl22xx')
-rw-r--r-- | spec/build/bsps/arm/rtl22xx/abi.yml | 12 | ||||
-rw-r--r-- | spec/build/bsps/arm/rtl22xx/optskyeye.yml | 5 | ||||
-rw-r--r-- | spec/build/bsps/arm/rtl22xx/tstrtl22xx.yml | 3 | ||||
-rw-r--r-- | spec/build/bsps/arm/rtl22xx/tstrtl22xxt.yml | 3 |
4 files changed, 11 insertions, 12 deletions
diff --git a/spec/build/bsps/arm/rtl22xx/abi.yml b/spec/build/bsps/arm/rtl22xx/abi.yml index abb7f66b50..0d70e8b6c8 100644 --- a/spec/build/bsps/arm/rtl22xx/abi.yml +++ b/spec/build/bsps/arm/rtl22xx/abi.yml @@ -7,13 +7,13 @@ build-type: option copyrights: - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) default: -- -mcpu=arm7tdmi -- -mthumb -default-by-variant: -- value: +- enabled-by: arm/rtl22xx + value: - -mcpu=arm7tdmi - variants: - - arm/rtl22xx +- enabled-by: true + value: + - -mcpu=arm7tdmi + - -mthumb description: | ABI flags enabled-by: true diff --git a/spec/build/bsps/arm/rtl22xx/optskyeye.yml b/spec/build/bsps/arm/rtl22xx/optskyeye.yml index be55a98c3a..0d805efefd 100644 --- a/spec/build/bsps/arm/rtl22xx/optskyeye.yml +++ b/spec/build/bsps/arm/rtl22xx/optskyeye.yml @@ -5,8 +5,9 @@ actions: build-type: option copyrights: - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) -default: false -default-by-variant: [] +default: +- enabled-by: true + value: false description: | If defined, enable options which optimize executingon the Skyeye simulator. Speed up the clock ticks while the idle task is running so time spent in the idle task is minimized. This significantly reduces the wall time required to execute the RTEMS test suites. enabled-by: true diff --git a/spec/build/bsps/arm/rtl22xx/tstrtl22xx.yml b/spec/build/bsps/arm/rtl22xx/tstrtl22xx.yml index efcb42b586..73065c3ea8 100644 --- a/spec/build/bsps/arm/rtl22xx/tstrtl22xx.yml +++ b/spec/build/bsps/arm/rtl22xx/tstrtl22xx.yml @@ -17,8 +17,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: diff --git a/spec/build/bsps/arm/rtl22xx/tstrtl22xxt.yml b/spec/build/bsps/arm/rtl22xx/tstrtl22xxt.yml index 1bd1983dcb..80200abb7a 100644 --- a/spec/build/bsps/arm/rtl22xx/tstrtl22xxt.yml +++ b/spec/build/bsps/arm/rtl22xx/tstrtl22xxt.yml @@ -13,8 +13,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: |