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/aarch64/xilinx-versal | |
| 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/aarch64/xilinx-versal')
13 files changed, 39 insertions, 35 deletions
diff --git a/spec/build/bsps/aarch64/xilinx-versal/abi.yml b/spec/build/bsps/aarch64/xilinx-versal/abi.yml index b52df18fb3..9e7a59a7f4 100644 --- a/spec/build/bsps/aarch64/xilinx-versal/abi.yml +++ b/spec/build/bsps/aarch64/xilinx-versal/abi.yml @@ -7,8 +7,9 @@ build-type: option copyrights: - Copyright (C) 2021 Gedare Bloom default: -- -mcpu=cortex-a72 -default-by-variant: [] +- enabled-by: true + value: + - -mcpu=cortex-a72 description: | ABI flags enabled-by: true diff --git a/spec/build/bsps/aarch64/xilinx-versal/optclki2c0.yml b/spec/build/bsps/aarch64/xilinx-versal/optclki2c0.yml index 3d567c961c..049bd0bd4a 100644 --- a/spec/build/bsps/aarch64/xilinx-versal/optclki2c0.yml +++ b/spec/build/bsps/aarch64/xilinx-versal/optclki2c0.yml @@ -5,8 +5,9 @@ actions: build-type: option copyrights: - Copyright (C) 2022 Chris Johns <chris@contemporary.software> -default: 99999001 -default-by-variant: [] +default: +- enabled-by: true + value: 99999001 description: | Versal i2c0 clock frequency in Hz. This is the frequency after the signal has been processed using the values passed to the I2C0_REF_CTRL register. diff --git a/spec/build/bsps/aarch64/xilinx-versal/optclki2c1.yml b/spec/build/bsps/aarch64/xilinx-versal/optclki2c1.yml index 4f67f3ee95..1fa3ebba93 100644 --- a/spec/build/bsps/aarch64/xilinx-versal/optclki2c1.yml +++ b/spec/build/bsps/aarch64/xilinx-versal/optclki2c1.yml @@ -5,8 +5,9 @@ actions: build-type: option copyrights: - Copyright (C) 2022 Chris Johns <chris@contemporary.software> -default: 99999001 -default-by-variant: [] +default: +- enabled-by: true + value: 99999001 description: | Versal i2c1 clock frequency in Hz. This is the frequency after the signal has been processed using the values passed to the I2C1_REF_CTRL register. diff --git a/spec/build/bsps/aarch64/xilinx-versal/optclkuart.yml b/spec/build/bsps/aarch64/xilinx-versal/optclkuart.yml index fb344019e2..2ea9ea636d 100644 --- a/spec/build/bsps/aarch64/xilinx-versal/optclkuart.yml +++ b/spec/build/bsps/aarch64/xilinx-versal/optclkuart.yml @@ -5,11 +5,11 @@ actions: build-type: option copyrights: - Copyright (C) 2021 Gedare Bloom <gedare@rtems.org> -default: 100000000 -default-by-variant: -- value: 24000000 - variants: - - aarch64/xilinx_versal_qemu +default: +- enabled-by: aarch64/xilinx_versal_qemu + value: 24000000 +- enabled-by: true + value: 100000000 description: | Versal UART clock frequency in Hz enabled-by: true diff --git a/spec/build/bsps/aarch64/xilinx-versal/optconirq.yml b/spec/build/bsps/aarch64/xilinx-versal/optconirq.yml index 24108512fc..00c5dbaebd 100644 --- a/spec/build/bsps/aarch64/xilinx-versal/optconirq.yml +++ b/spec/build/bsps/aarch64/xilinx-versal/optconirq.yml @@ -5,8 +5,9 @@ actions: build-type: option copyrights: - Copyright (C) 2022 Chris Johns (chris@contemporary.software) -default: true -default-by-variant: [] +default: +- enabled-by: true + value: true description: | use interrupt driven mode for console devices (used by default) enabled-by: true diff --git a/spec/build/bsps/aarch64/xilinx-versal/optconminor.yml b/spec/build/bsps/aarch64/xilinx-versal/optconminor.yml index bb21e8fae7..39778e604f 100644 --- a/spec/build/bsps/aarch64/xilinx-versal/optconminor.yml +++ b/spec/build/bsps/aarch64/xilinx-versal/optconminor.yml @@ -5,8 +5,9 @@ actions: build-type: option copyrights: - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de) -default: 0 -default-by-variant: [] +default: +- enabled-by: true + value: 0 description: | minor number of console device enabled-by: true diff --git a/spec/build/bsps/aarch64/xilinx-versal/optloadoff.yml b/spec/build/bsps/aarch64/xilinx-versal/optloadoff.yml index 4a7fdc489e..27f7913fb4 100644 --- a/spec/build/bsps/aarch64/xilinx-versal/optloadoff.yml +++ b/spec/build/bsps/aarch64/xilinx-versal/optloadoff.yml @@ -7,11 +7,11 @@ actions: build-type: option copyrights: - Copyright (C) 2021 Gedare Bloom <gedare@rtems.org> -default: 0x00000000 -default-by-variant: -- value: 0x00008000 - variants: - - aarch64/xilinx_versal_qemu +default: +- enabled-by: aarch64/xilinx_versal_qemu + value: 0x00008000 +- enabled-by: true + value: 0x00000000 description: | offset of RAM region from memory area base enabled-by: true diff --git a/spec/build/bsps/aarch64/xilinx-versal/optnocachelen.yml b/spec/build/bsps/aarch64/xilinx-versal/optnocachelen.yml index 73a57964e1..894a0b59e9 100644 --- a/spec/build/bsps/aarch64/xilinx-versal/optnocachelen.yml +++ b/spec/build/bsps/aarch64/xilinx-versal/optnocachelen.yml @@ -7,8 +7,9 @@ actions: build-type: option copyrights: - Copyright (C) 2021 Gedare Bloom <gedare@rtems.org> -default: 0x00100000 -default-by-variant: [] +default: +- enabled-by: true + value: 0x00100000 description: | length of nocache RAM region enabled-by: true diff --git a/spec/build/bsps/aarch64/xilinx-versal/optramlen.yml b/spec/build/bsps/aarch64/xilinx-versal/optramlen.yml index 95347fc7e3..b635f01502 100644 --- a/spec/build/bsps/aarch64/xilinx-versal/optramlen.yml +++ b/spec/build/bsps/aarch64/xilinx-versal/optramlen.yml @@ -7,8 +7,9 @@ actions: build-type: option copyrights: - Copyright (C) 2021 Gedare Bloom <gedare@rtems.org> -default: 0x10000000 -default-by-variant: [] +default: +- enabled-by: true + value: 0x10000000 description: | length of memory area available to the BSP enabled-by: true diff --git a/spec/build/bsps/aarch64/xilinx-versal/optramori.yml b/spec/build/bsps/aarch64/xilinx-versal/optramori.yml index 6e94f55b7e..110642becf 100644 --- a/spec/build/bsps/aarch64/xilinx-versal/optramori.yml +++ b/spec/build/bsps/aarch64/xilinx-versal/optramori.yml @@ -7,11 +7,11 @@ actions: build-type: option copyrights: - Copyright (C) 2021 Gedare Bloom <gedare@rtems.org> -default: 0x10000000 -default-by-variant: -- value: 0x20000000 - variants: - - aarch64/xilinx_versal_qemu +default: +- enabled-by: aarch64/xilinx_versal_qemu + value: 0x20000000 +- enabled-by: true + value: 0x10000000 description: | base address of memory area available to the BSP enabled-by: true diff --git a/spec/build/bsps/aarch64/xilinx-versal/tstaiedge.yml b/spec/build/bsps/aarch64/xilinx-versal/tstaiedge.yml index b89c92e30a..0a0ab619af 100644 --- a/spec/build/bsps/aarch64/xilinx-versal/tstaiedge.yml +++ b/spec/build/bsps/aarch64/xilinx-versal/tstaiedge.yml @@ -9,8 +9,7 @@ actions: build-type: option copyrights: - Copyright (C) 2021 Gedare Bloom <gedare@rtems.org> -default: null -default-by-variant: [] +default: [] description: '' enabled-by: true links: [] diff --git a/spec/build/bsps/aarch64/xilinx-versal/tstqemu.yml b/spec/build/bsps/aarch64/xilinx-versal/tstqemu.yml index b89c92e30a..0a0ab619af 100644 --- a/spec/build/bsps/aarch64/xilinx-versal/tstqemu.yml +++ b/spec/build/bsps/aarch64/xilinx-versal/tstqemu.yml @@ -9,8 +9,7 @@ actions: build-type: option copyrights: - Copyright (C) 2021 Gedare Bloom <gedare@rtems.org> -default: null -default-by-variant: [] +default: [] description: '' enabled-by: true links: [] diff --git a/spec/build/bsps/aarch64/xilinx-versal/tstvck190.yml b/spec/build/bsps/aarch64/xilinx-versal/tstvck190.yml index b89c92e30a..0a0ab619af 100644 --- a/spec/build/bsps/aarch64/xilinx-versal/tstvck190.yml +++ b/spec/build/bsps/aarch64/xilinx-versal/tstvck190.yml @@ -9,8 +9,7 @@ actions: build-type: option copyrights: - Copyright (C) 2021 Gedare Bloom <gedare@rtems.org> -default: null -default-by-variant: [] +default: [] description: '' enabled-by: true links: [] |