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/m68k/gen68360 | |
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/m68k/gen68360')
-rw-r--r-- | spec/build/bsps/m68k/gen68360/abi.yml | 15 | ||||
-rw-r--r-- | spec/build/bsps/m68k/gen68360/opt68360.yml | 10 | ||||
-rw-r--r-- | spec/build/bsps/m68k/gen68360/opt68360x040.yml | 10 | ||||
-rw-r--r-- | spec/build/bsps/m68k/gen68360/optpgh360.yml | 10 |
4 files changed, 22 insertions, 23 deletions
diff --git a/spec/build/bsps/m68k/gen68360/abi.yml b/spec/build/bsps/m68k/gen68360/abi.yml index 5e83fae804..603e342b59 100644 --- a/spec/build/bsps/m68k/gen68360/abi.yml +++ b/spec/build/bsps/m68k/gen68360/abi.yml @@ -7,16 +7,15 @@ build-type: option copyrights: - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) default: -- -mcpu32 -default-by-variant: -- value: +- enabled-by: m68k/gen68360_040 + value: - -mcpu=68040 - variants: - - m68k/gen68360_040 -- value: +- enabled-by: m68k/gen68360 + value: - -mcpu=cpu32 - variants: - - m68k/gen68360 +- enabled-by: true + value: + - -mcpu32 description: | ABI flags enabled-by: true diff --git a/spec/build/bsps/m68k/gen68360/opt68360.yml b/spec/build/bsps/m68k/gen68360/opt68360.yml index 11f0f054c9..36d100d549 100644 --- a/spec/build/bsps/m68k/gen68360/opt68360.yml +++ b/spec/build/bsps/m68k/gen68360/opt68360.yml @@ -5,11 +5,11 @@ actions: build-type: option copyrights: - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) -default: false -default-by-variant: -- value: true - variants: - - m68k/gen68360 +default: +- enabled-by: m68k/gen68360 + value: true +- enabled-by: true + value: false description: | If defined, use custom settings for the gen68360 BSP. enabled-by: true diff --git a/spec/build/bsps/m68k/gen68360/opt68360x040.yml b/spec/build/bsps/m68k/gen68360/opt68360x040.yml index c176a780a3..9ddb102d26 100644 --- a/spec/build/bsps/m68k/gen68360/opt68360x040.yml +++ b/spec/build/bsps/m68k/gen68360/opt68360x040.yml @@ -5,11 +5,11 @@ actions: build-type: option copyrights: - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) -default: false -default-by-variant: -- value: true - variants: - - m68k/gen68360_040 +default: +- enabled-by: m68k/gen68360_040 + value: true +- enabled-by: true + value: false description: | If defined, use custom settings for the gen68360_040 BSP. enabled-by: true diff --git a/spec/build/bsps/m68k/gen68360/optpgh360.yml b/spec/build/bsps/m68k/gen68360/optpgh360.yml index 8fea68fa42..f809a5eacf 100644 --- a/spec/build/bsps/m68k/gen68360/optpgh360.yml +++ b/spec/build/bsps/m68k/gen68360/optpgh360.yml @@ -5,11 +5,11 @@ actions: build-type: option copyrights: - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) -default: false -default-by-variant: -- value: true - variants: - - m68k/pgh360 +default: +- enabled-by: m68k/pgh360 + value: true +- enabled-by: true + value: false description: | If defined, use custom settings for the pgh360 BSP. enabled-by: true |