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.

37 files changed, 155 insertions, 134 deletions

diff --git a/spec/build/bsps/powerpc/qoriq/abi.yml b/spec/build/bsps/powerpc/qoriq/abi.yml
index f88b3afb95..26d9a94249 100644
--- a/spec/build/bsps/powerpc/qoriq/abi.yml
+++ b/spec/build/bsps/powerpc/qoriq/abi.yml
@@ -7,25 +7,24 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -mcpu=8540
-- -msoft-float
-- -meabi
-- -msdata=sysv
-- -mstrict-align
-default-by-variant:
-- value:
+- enabled-by: powerpc/qoriq_e6500_64
+  value:
   - -mcpu=e6500
   - -m64
   - -mvrsave
-  variants:
-  - powerpc/qoriq_e6500_64
-- value:
+- enabled-by: powerpc/qoriq_e6500_32
+  value:
   - -mcpu=e6500
   - -m32
   - -mvrsave
   - -msdata=sysv
-  variants:
-  - powerpc/qoriq_e6500_32
+- enabled-by: true
+  value:
+  - -mcpu=8540
+  - -msoft-float
+  - -meabi
+  - -msdata=sysv
+  - -mstrict-align
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/qoriq/optbucsr.yml b/spec/build/bsps/powerpc/qoriq/optbucsr.yml
index 269f29b976..036ed5c7dc 100644
--- a/spec/build/bsps/powerpc/qoriq/optbucsr.yml
+++ b/spec/build/bsps/powerpc/qoriq/optbucsr.yml
@@ -5,12 +5,11 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: null
-default-by-variant:
-- value: 0x01400201
-  variants:
+default:
+- enabled-by:
   - powerpc/qoriq_e6500_32
   - powerpc/qoriq_e6500_64
+  value: 0x01400201
 description: |
   initial BUCSR value
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/qoriq/optbusclkdiv.yml b/spec/build/bsps/powerpc/qoriq/optbusclkdiv.yml
index 74adc5ae9d..bcc7076da6 100644
--- a/spec/build/bsps/powerpc/qoriq/optbusclkdiv.yml
+++ b/spec/build/bsps/powerpc/qoriq/optbusclkdiv.yml
@@ -5,12 +5,13 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 1
-default-by-variant:
-- value: 2
-  variants:
+default:
+- enabled-by:
   - powerpc/qoriq_e6500_32
   - powerpc/qoriq_e6500_64
+  value: 2
+- enabled-by: true
+  value: 1
 description: |
   divider of the platform clock to get the clock most on-chip peripherals
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/qoriq/optcachealign.yml b/spec/build/bsps/powerpc/qoriq/optcachealign.yml
index 80423556e9..60108193cd 100644
--- a/spec/build/bsps/powerpc/qoriq/optcachealign.yml
+++ b/spec/build/bsps/powerpc/qoriq/optcachealign.yml
@@ -5,12 +5,11 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: null
-default-by-variant:
-- value: 64
-  variants:
+default:
+- enabled-by:
   - powerpc/qoriq_e6500_32
   - powerpc/qoriq_e6500_64
+  value: 64
 description: |
   the cache alignment
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/qoriq/optcacheblktouch.yml b/spec/build/bsps/powerpc/qoriq/optcacheblktouch.yml
index 3b9251a774..3b3f73367e 100644
--- a/spec/build/bsps/powerpc/qoriq/optcacheblktouch.yml
+++ b/spec/build/bsps/powerpc/qoriq/optcacheblktouch.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: |
   if defined use dcbt instruction
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/qoriq/optcachedatal1sz.yml b/spec/build/bsps/powerpc/qoriq/optcachedatal1sz.yml
index 1717ff9660..a0e5c409d3 100644
--- a/spec/build/bsps/powerpc/qoriq/optcachedatal1sz.yml
+++ b/spec/build/bsps/powerpc/qoriq/optcachedatal1sz.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 32768
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 32768
 description: |
   the L1 data cache size
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/qoriq/optcachedatal2sz.yml b/spec/build/bsps/powerpc/qoriq/optcachedatal2sz.yml
index 28566edad9..8e2c85781f 100644
--- a/spec/build/bsps/powerpc/qoriq/optcachedatal2sz.yml
+++ b/spec/build/bsps/powerpc/qoriq/optcachedatal2sz.yml
@@ -5,12 +5,13 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 262144
-default-by-variant:
-- value: 2097152
-  variants:
+default:
+- enabled-by:
   - powerpc/qoriq_e6500_32
   - powerpc/qoriq_e6500_64
+  value: 2097152
+- enabled-by: true
+  value: 262144
 description: |
   the L2 data cache size
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/qoriq/optcacheinstl1sz.yml b/spec/build/bsps/powerpc/qoriq/optcacheinstl1sz.yml
index 10e96967f7..0f802975ca 100644
--- a/spec/build/bsps/powerpc/qoriq/optcacheinstl1sz.yml
+++ b/spec/build/bsps/powerpc/qoriq/optcacheinstl1sz.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 32768
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 32768
 description: |
   the L1 instruction cache size
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/qoriq/optcacheinstl2sz.yml b/spec/build/bsps/powerpc/qoriq/optcacheinstl2sz.yml
index ea16d60a8b..e9b74ca750 100644
--- a/spec/build/bsps/powerpc/qoriq/optcacheinstl2sz.yml
+++ b/spec/build/bsps/powerpc/qoriq/optcacheinstl2sz.yml
@@ -5,12 +5,13 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 262144
-default-by-variant:
-- value: 2097152
-  variants:
+default:
+- enabled-by:
   - powerpc/qoriq_e6500_32
   - powerpc/qoriq_e6500_64
+  value: 2097152
+- enabled-by: true
+  value: 262144
 description: |
   the L2 instruction cache size
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/qoriq/optchipnum.yml b/spec/build/bsps/powerpc/qoriq/optchipnum.yml
index 6e465ac41b..c89dc57e21 100644
--- a/spec/build/bsps/powerpc/qoriq/optchipnum.yml
+++ b/spec/build/bsps/powerpc/qoriq/optchipnum.yml
@@ -5,12 +5,13 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 1020
-default-by-variant:
-- value: 0
-  variants:
+default:
+- enabled-by:
   - powerpc/qoriq_e6500_32
   - powerpc/qoriq_e6500_64
+  value: 0
+- enabled-by: true
+  value: 1020
 description: |
   chip number, e.g. 1020, 2040, 2080, 4240
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/qoriq/optchipser.yml b/spec/build/bsps/powerpc/qoriq/optchipser.yml
index 29c0c01d6f..faefdc1d02 100644
--- a/spec/build/bsps/powerpc/qoriq/optchipser.yml
+++ b/spec/build/bsps/powerpc/qoriq/optchipser.yml
@@ -5,12 +5,13 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: P
-default-by-variant:
-- value: T
-  variants:
+default:
+- enabled-by:
   - powerpc/qoriq_e6500_32
   - powerpc/qoriq_e6500_64
+  value: T
+- enabled-by: true
+  value: P
 description: |
   chip series, e.g. 'P' or 'T'
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/qoriq/optclktmctr.yml b/spec/build/bsps/powerpc/qoriq/optclktmctr.yml
index f3d428e437..be8804fa63 100644
--- a/spec/build/bsps/powerpc/qoriq/optclktmctr.yml
+++ b/spec/build/bsps/powerpc/qoriq/optclktmctr.yml
@@ -5,11 +5,11 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 1
-default-by-variant:
-- value: 5
-  variants:
-  - powerpc/qoriq_core_1
+default:
+- enabled-by: powerpc/qoriq_core_1
+  value: 5
+- enabled-by: true
+  value: 1
 description: |
   global timer used for the timecounter, 0..3 maps to A0..A3, and 4..7 maps to B0..B3
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/qoriq/optclktmr.yml b/spec/build/bsps/powerpc/qoriq/optclktmr.yml
index 61596b518c..97ed1992ff 100644
--- a/spec/build/bsps/powerpc/qoriq/optclktmr.yml
+++ b/spec/build/bsps/powerpc/qoriq/optclktmr.yml
@@ -5,11 +5,11 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0
-default-by-variant:
-- value: 4
-  variants:
-  - powerpc/qoriq_core_1
+default:
+- enabled-by: powerpc/qoriq_core_1
+  value: 4
+- enabled-by: true
+  value: 0
 description: |
   global timer used for system clock, 0..3 maps to A0..A3, and 4..7 maps to B0..B3
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/qoriq/optcpucnt.yml b/spec/build/bsps/powerpc/qoriq/optcpucnt.yml
index 61b2048edc..c1aa5549f4 100644
--- a/spec/build/bsps/powerpc/qoriq/optcpucnt.yml
+++ b/spec/build/bsps/powerpc/qoriq/optcpucnt.yml
@@ -5,12 +5,13 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 2
-default-by-variant:
-- value: 24
-  variants:
+default:
+- enabled-by:
   - powerpc/qoriq_e6500_32
   - powerpc/qoriq_e6500_64
+  value: 24
+- enabled-by: true
+  value: 2
 description: |
   maximum virtual processor count
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/qoriq/optetsec1phy.yml b/spec/build/bsps/powerpc/qoriq/optetsec1phy.yml
index 93e44d817c..870498b894 100644
--- a/spec/build/bsps/powerpc/qoriq/optetsec1phy.yml
+++ b/spec/build/bsps/powerpc/qoriq/optetsec1phy.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: -1
-default-by-variant: []
+default:
+- enabled-by: true
+  value: -1
 description: |
   PHY address for eTSEC interface 1
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/qoriq/optetsec2phy.yml b/spec/build/bsps/powerpc/qoriq/optetsec2phy.yml
index 037db1630a..4b2f86e345 100644
--- a/spec/build/bsps/powerpc/qoriq/optetsec2phy.yml
+++ b/spec/build/bsps/powerpc/qoriq/optetsec2phy.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: |
   PHY address for eTSEC interface 2
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/qoriq/optetsec3phy.yml b/spec/build/bsps/powerpc/qoriq/optetsec3phy.yml
index 21a511339a..402239ebb7 100644
--- a/spec/build/bsps/powerpc/qoriq/optetsec3phy.yml
+++ b/spec/build/bsps/powerpc/qoriq/optetsec3phy.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 1
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 1
 description: |
   PHY address for eTSEC interface 3
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/qoriq/optexcbooke.yml b/spec/build/bsps/powerpc/qoriq/optexcbooke.yml
index e27cb4ab44..d97e53ccb0 100644
--- a/spec/build/bsps/powerpc/qoriq/optexcbooke.yml
+++ b/spec/build/bsps/powerpc/qoriq/optexcbooke.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: |
   only support Book E exception types
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/qoriq/optexcfixdhdlr.yml b/spec/build/bsps/powerpc/qoriq/optexcfixdhdlr.yml
index b636d8022b..5661fc0f3e 100644
--- a/spec/build/bsps/powerpc/qoriq/optexcfixdhdlr.yml
+++ b/spec/build/bsps/powerpc/qoriq/optexcfixdhdlr.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: |
   use fixed high-level exception handler
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/qoriq/opthid0.yml b/spec/build/bsps/powerpc/qoriq/opthid0.yml
index e733c0f9aa..e8756de7a9 100644
--- a/spec/build/bsps/powerpc/qoriq/opthid0.yml
+++ b/spec/build/bsps/powerpc/qoriq/opthid0.yml
@@ -5,12 +5,11 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: null
-default-by-variant:
-- value: 0x40000000
-  variants:
+default:
+- enabled-by:
   - powerpc/qoriq_e6500_32
   - powerpc/qoriq_e6500_64
+  value: 0x40000000
 description: |
   initial HID0 value (EN_L2MMU_MHD is set by default on the T-series)
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/qoriq/opthyp.yml b/spec/build/bsps/powerpc/qoriq/opthyp.yml
index 39901fed5d..c99a29edb8 100644
--- a/spec/build/bsps/powerpc/qoriq/opthyp.yml
+++ b/spec/build/bsps/powerpc/qoriq/opthyp.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/qoriq_e6500_32
   - powerpc/qoriq_e6500_64
+  value: true
+- enabled-by: true
+  value: false
 description: |
   defined if the processor core has a hypervisor mode
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/qoriq/opthypguest.yml b/spec/build/bsps/powerpc/qoriq/opthypguest.yml
index 6e579dc06c..967a3e1925 100644
--- a/spec/build/bsps/powerpc/qoriq/opthypguest.yml
+++ b/spec/build/bsps/powerpc/qoriq/opthypguest.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: |
   defined if we are a hypervisor guest
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/qoriq/opticombegin.yml b/spec/build/bsps/powerpc/qoriq/opticombegin.yml
index 9f62d83fee..e3df107e14 100644
--- a/spec/build/bsps/powerpc/qoriq/opticombegin.yml
+++ b/spec/build/bsps/powerpc/qoriq/opticombegin.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x03000000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x03000000
 description: |
   inter-processor communication area begin
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/qoriq/opticomsz.yml b/spec/build/bsps/powerpc/qoriq/opticomsz.yml
index 31a810d43b..5d535c642e 100644
--- a/spec/build/bsps/powerpc/qoriq/opticomsz.yml
+++ b/spec/build/bsps/powerpc/qoriq/opticomsz.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x01000000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x01000000
 description: |
   inter-processor communication area size
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/qoriq/optmas7.yml b/spec/build/bsps/powerpc/qoriq/optmas7.yml
index 37bd67461c..cf3c920c22 100644
--- a/spec/build/bsps/powerpc/qoriq/optmas7.yml
+++ b/spec/build/bsps/powerpc/qoriq/optmas7.yml
@@ -5,12 +5,13 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x00000000
-default-by-variant:
-- value: 0x0000000f
-  variants:
+default:
+- enabled-by:
   - powerpc/qoriq_e6500_32
   - powerpc/qoriq_e6500_64
+  value: 0x0000000f
+- enabled-by: true
+  value: 0x00000000
 description: |
   MAS7 value for device TLB1 entries
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/qoriq/optmsr.yml b/spec/build/bsps/powerpc/qoriq/optmsr.yml
index 4366503a69..897955abc0 100644
--- a/spec/build/bsps/powerpc/qoriq/optmsr.yml
+++ b/spec/build/bsps/powerpc/qoriq/optmsr.yml
@@ -5,14 +5,13 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x02000200
-default-by-variant:
-- value: 0x82002200
-  variants:
-  - powerpc/qoriq_e6500_64
-- value: 0x02002200
-  variants:
-  - powerpc/qoriq_e6500_32
+default:
+- enabled-by: powerpc/qoriq_e6500_64
+  value: 0x82002200
+- enabled-by: powerpc/qoriq_e6500_32
+  value: 0x02002200
+- enabled-by: true
+  value: 0x02000200
 description: |
   initial MSR value
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/qoriq/optspefscr.yml b/spec/build/bsps/powerpc/qoriq/optspefscr.yml
index f494b66cfa..b3cb460714 100644
--- a/spec/build/bsps/powerpc/qoriq/optspefscr.yml
+++ b/spec/build/bsps/powerpc/qoriq/optspefscr.yml
@@ -5,12 +5,13 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x00000000
-default-by-variant:
-- value: null
-  variants:
+default:
+- enabled-by:
   - powerpc/qoriq_e6500_32
   - powerpc/qoriq_e6500_64
+  value: null
+- enabled-by: true
+  value: 0x00000000
 description: |
   initial SPEFSCR value
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/qoriq/optthrdcnt.yml b/spec/build/bsps/powerpc/qoriq/optthrdcnt.yml
index 9fca5dc401..78410d5fc8 100644
--- a/spec/build/bsps/powerpc/qoriq/optthrdcnt.yml
+++ b/spec/build/bsps/powerpc/qoriq/optthrdcnt.yml
@@ -5,12 +5,13 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 1
-default-by-variant:
-- value: 2
-  variants:
+default:
+- enabled-by:
   - powerpc/qoriq_e6500_32
   - powerpc/qoriq_e6500_64
+  value: 2
+- enabled-by: true
+  value: 1
 description: |
   the number of threads per core
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/qoriq/opttlb1cnt.yml b/spec/build/bsps/powerpc/qoriq/opttlb1cnt.yml
index ac123ecb0c..060c8d1000 100644
--- a/spec/build/bsps/powerpc/qoriq/opttlb1cnt.yml
+++ b/spec/build/bsps/powerpc/qoriq/opttlb1cnt.yml
@@ -5,12 +5,13 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 16
-default-by-variant:
-- value: 64
-  variants:
+default:
+- enabled-by:
   - powerpc/qoriq_e6500_32
   - powerpc/qoriq_e6500_64
+  value: 64
+- enabled-by: true
+  value: 16
 description: |
   TLB1 entry count
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/qoriq/optuart0en.yml b/spec/build/bsps/powerpc/qoriq/optuart0en.yml
index c462db34d3..cd3cf1710a 100644
--- a/spec/build/bsps/powerpc/qoriq/optuart0en.yml
+++ b/spec/build/bsps/powerpc/qoriq/optuart0en.yml
@@ -5,11 +5,11 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: true
-default-by-variant:
-- value: false
-  variants:
-  - powerpc/qoriq_core_1
+default:
+- enabled-by: powerpc/qoriq_core_1
+  value: false
+- enabled-by: true
+  value: true
 description: |
   use 1 to enable UART 0, otherwise use 0
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/qoriq/optuart1en.yml b/spec/build/bsps/powerpc/qoriq/optuart1en.yml
index af613ec57f..9d471847df 100644
--- a/spec/build/bsps/powerpc/qoriq/optuart1en.yml
+++ b/spec/build/bsps/powerpc/qoriq/optuart1en.yml
@@ -5,11 +5,11 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: true
-default-by-variant:
-- value: false
-  variants:
-  - powerpc/qoriq_core_1
+default:
+- enabled-by: powerpc/qoriq_core_1
+  value: false
+- enabled-by: true
+  value: true
 description: |
   use 1 to enable UART 1, otherwise use 0
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/qoriq/optuartbrg0en.yml b/spec/build/bsps/powerpc/qoriq/optuartbrg0en.yml
index 05706d7ef7..955862eb3f 100644
--- a/spec/build/bsps/powerpc/qoriq/optuartbrg0en.yml
+++ b/spec/build/bsps/powerpc/qoriq/optuartbrg0en.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: |
   use 1 to enable UART 0 to Intercom bridge, otherwise use 0
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/qoriq/optuartbrg1en.yml b/spec/build/bsps/powerpc/qoriq/optuartbrg1en.yml
index cc2c43c13a..c49ac36710 100644
--- a/spec/build/bsps/powerpc/qoriq/optuartbrg1en.yml
+++ b/spec/build/bsps/powerpc/qoriq/optuartbrg1en.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/qoriq_core_0
-- value: true
-  variants:
   - powerpc/qoriq_core_1
+  value: true
+- enabled-by: true
+  value: false
 description: |
   use 1 to enable UART 1 to Intercom bridge, otherwise use 0
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/qoriq/optuartbrgmas.yml b/spec/build/bsps/powerpc/qoriq/optuartbrgmas.yml
index 8a58b8c518..e7ebba3494 100644
--- a/spec/build/bsps/powerpc/qoriq/optuartbrgmas.yml
+++ b/spec/build/bsps/powerpc/qoriq/optuartbrgmas.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: |
   UART to Intercom bridge master core index
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/qoriq/optuartbrgpri.yml b/spec/build/bsps/powerpc/qoriq/optuartbrgpri.yml
index b653aaf881..a2af223e43 100644
--- a/spec/build/bsps/powerpc/qoriq/optuartbrgpri.yml
+++ b/spec/build/bsps/powerpc/qoriq/optuartbrgpri.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 250
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 250
 description: |
   UART to Intercom bridge task priority
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/qoriq/optuartbrgslv.yml b/spec/build/bsps/powerpc/qoriq/optuartbrgslv.yml
index 8a672326f9..29b69bd33d 100644
--- a/spec/build/bsps/powerpc/qoriq/optuartbrgslv.yml
+++ b/spec/build/bsps/powerpc/qoriq/optuartbrgslv.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: |
   UART to Intercom bridge slave core index
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/qoriq/optuartirq.yml b/spec/build/bsps/powerpc/qoriq/optuartirq.yml
index 152668b2d9..a9fa750357 100644
--- a/spec/build/bsps/powerpc/qoriq/optuartirq.yml
+++ b/spec/build/bsps/powerpc/qoriq/optuartirq.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: |
   enable usage of interrupts for the UART modules
 enabled-by: true