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/powerpc/motorola_powerpc | |
| 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/powerpc/motorola_powerpc')
7 files changed, 39 insertions, 41 deletions
diff --git a/spec/build/bsps/powerpc/motorola_powerpc/abi.yml b/spec/build/bsps/powerpc/motorola_powerpc/abi.yml index 5e1d47b169..94ac120f77 100644 --- a/spec/build/bsps/powerpc/motorola_powerpc/abi.yml +++ b/spec/build/bsps/powerpc/motorola_powerpc/abi.yml @@ -7,31 +7,28 @@ build-type: option copyrights: - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) default: -- -mcpu=603e -default-by-variant: -- value: +- enabled-by: powerpc/qemuprep-altivec + value: - -mcpu=7400 - -mmultiple - -mstrict-align - variants: - - powerpc/qemuprep-altivec -- value: +- enabled-by: powerpc/qemuprep + value: - -mcpu=powerpc - -mmultiple - -mstrict-align - variants: - - powerpc/qemuprep -- value: +- enabled-by: powerpc/mvme2307 + value: - -mcpu=604 - -mmultiple - -mstrict-align - -meabi - variants: - - powerpc/mvme2307 -- value: +- enabled-by: powerpc/mcp750 + value: - -mcpu=750 - variants: - - powerpc/mcp750 +- enabled-by: true + value: + - -mcpu=603e description: | ABI flags enabled-by: true diff --git a/spec/build/bsps/powerpc/motorola_powerpc/optmpc603e.yml b/spec/build/bsps/powerpc/motorola_powerpc/optmpc603e.yml index 509f6c9c8a..07fbf61e19 100644 --- a/spec/build/bsps/powerpc/motorola_powerpc/optmpc603e.yml +++ b/spec/build/bsps/powerpc/motorola_powerpc/optmpc603e.yml @@ -5,14 +5,13 @@ actions: build-type: option copyrights: - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) -default: false -default-by-variant: -- value: true - variants: +default: +- enabled-by: - powerpc/mtx603e -- value: true - variants: - powerpc/mvme2100 + value: true +- enabled-by: true + value: false description: | Define when ppc603e -- undefined for others enabled-by: true diff --git a/spec/build/bsps/powerpc/motorola_powerpc/optmpc750.yml b/spec/build/bsps/powerpc/motorola_powerpc/optmpc750.yml index d132c17552..9235427ab7 100644 --- a/spec/build/bsps/powerpc/motorola_powerpc/optmpc750.yml +++ b/spec/build/bsps/powerpc/motorola_powerpc/optmpc750.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: - - powerpc/mcp750 +default: +- enabled-by: powerpc/mcp750 + value: true +- enabled-by: true + value: false description: | Define when mpc750 -- undefined for others enabled-by: true diff --git a/spec/build/bsps/powerpc/motorola_powerpc/optmpc8240.yml b/spec/build/bsps/powerpc/motorola_powerpc/optmpc8240.yml index 5cc6475589..9d78e614da 100644 --- a/spec/build/bsps/powerpc/motorola_powerpc/optmpc8240.yml +++ b/spec/build/bsps/powerpc/motorola_powerpc/optmpc8240.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: - - powerpc/mvme2100 +default: +- enabled-by: powerpc/mvme2100 + value: true +- enabled-by: true + value: false description: | Defined for boards with MPC8240 -- undefined for others enabled-by: true diff --git a/spec/build/bsps/powerpc/motorola_powerpc/optmvme2100.yml b/spec/build/bsps/powerpc/motorola_powerpc/optmvme2100.yml index 2443f4bfe8..5214a4c0fe 100644 --- a/spec/build/bsps/powerpc/motorola_powerpc/optmvme2100.yml +++ b/spec/build/bsps/powerpc/motorola_powerpc/optmvme2100.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: - - powerpc/mvme2100 +default: +- enabled-by: powerpc/mvme2100 + value: true +- enabled-by: true + value: false description: | Defined for MVME2100 -- undefined for others enabled-by: true diff --git a/spec/build/bsps/powerpc/motorola_powerpc/optqemu.yml b/spec/build/bsps/powerpc/motorola_powerpc/optqemu.yml index 0e861eed0c..c160ba185d 100644 --- a/spec/build/bsps/powerpc/motorola_powerpc/optqemu.yml +++ b/spec/build/bsps/powerpc/motorola_powerpc/optqemu.yml @@ -5,12 +5,13 @@ actions: build-type: option copyrights: - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) -default: false -default-by-variant: -- value: true - variants: +default: +- enabled-by: - powerpc/qemuprep - powerpc/qemuprep-altivec + value: true +- enabled-by: true + value: false description: | Defined for QEMU BSP -- undefined for others enabled-by: true diff --git a/spec/build/bsps/powerpc/motorola_powerpc/optsbrk.yml b/spec/build/bsps/powerpc/motorola_powerpc/optsbrk.yml index 1018b3a4a1..bf5b7965ca 100644 --- a/spec/build/bsps/powerpc/motorola_powerpc/optsbrk.yml +++ b/spec/build/bsps/powerpc/motorola_powerpc/optsbrk.yml @@ -5,8 +5,9 @@ actions: build-type: option copyrights: - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) -default: true -default-by-variant: [] +default: +- enabled-by: true + value: true description: | None enabled-by: true |