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.

17 files changed, 61 insertions, 51 deletions

diff --git a/spec/build/bsps/i386/pc386/abi.yml b/spec/build/bsps/i386/pc386/abi.yml
index 6a29742266..24901f049e 100644
--- a/spec/build/bsps/i386/pc386/abi.yml
+++ b/spec/build/bsps/i386/pc386/abi.yml
@@ -7,34 +7,30 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -mtune=pentium4
-- -march=pentium4
-- -msse3
-default-by-variant:
-- value:
+- enabled-by: i386/pc686
+  value:
   - -mtune=pentiumpro
   - -march=pentium
-  variants:
-  - i386/pc686
-- value:
+- enabled-by: i386/pc586-sse
+  value:
   - -mtune=pentium
   - -march=pentium
   - -msse2
-  variants:
-  - i386/pc586-sse
-- value:
+- enabled-by: i386/pc586
+  value:
   - -mtune=pentium
   - -march=pentium
-  variants:
-  - i386/pc586
-- value:
+- enabled-by: i386/pc486
+  value:
   - -mtune=i486
-  variants:
-  - i386/pc486
-- value:
+- enabled-by: i386/pc386
+  value:
   - -mtune=i386
-  variants:
-  - i386/pc386
+- enabled-by: true
+  value:
+  - -mtune=pentium4
+  - -march=pentium4
+  - -msse3
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/i386/pc386/optcirrus.yml b/spec/build/bsps/i386/pc386/optcirrus.yml
index c974001647..868334c1e9 100644
--- a/spec/build/bsps/i386/pc386/optcirrus.yml
+++ b/spec/build/bsps/i386/pc386/optcirrus.yml
@@ -6,8 +6,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, enables use of the Cirrus GD5446 controller rather than the controller utilizing Vesa Bios Extensions - real mode interface.  NOTE: This has only been tested on Qemu.
 enabled-by: true
diff --git a/spec/build/bsps/i386/pc386/optclk8253.yml b/spec/build/bsps/i386/pc386/optclk8253.yml
index ddaeb3bb75..8c759748d5 100644
--- a/spec/build/bsps/i386/pc386/optclk8253.yml
+++ b/spec/build/bsps/i386/pc386/optclk8253.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: |
   None
 enabled-by: true
diff --git a/spec/build/bsps/i386/pc386/optclktsc.yml b/spec/build/bsps/i386/pc386/optclktsc.yml
index 2b02523def..7a4c111b07 100644
--- a/spec/build/bsps/i386/pc386/optclktsc.yml
+++ b/spec/build/bsps/i386/pc386/optclktsc.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: |
   None
 enabled-by: true
diff --git a/spec/build/bsps/i386/pc386/optconcom1.yml b/spec/build/bsps/i386/pc386/optconcom1.yml
index 6743683ecc..654824ab3c 100644
--- a/spec/build/bsps/i386/pc386/optconcom1.yml
+++ b/spec/build/bsps/i386/pc386/optconcom1.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: |
   Determines, whether the console will be associated with the standard VGA display or with the COM1 serial port.  Currently only the VGA display and COM1 support printk.
 enabled-by: true
diff --git a/spec/build/bsps/i386/pc386/optencom14.yml b/spec/build/bsps/i386/pc386/optencom14.yml
index 1547f5d890..c42f20b1db 100644
--- a/spec/build/bsps/i386/pc386/optencom14.yml
+++ b/spec/build/bsps/i386/pc386/optencom14.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: |
   Set if COM1..COM4 support is enabled.
 enabled-by: true
diff --git a/spec/build/bsps/i386/pc386/optenide.yml b/spec/build/bsps/i386/pc386/optenide.yml
index db3a9aaf04..68f1efea48 100644
--- a/spec/build/bsps/i386/pc386/optenide.yml
+++ b/spec/build/bsps/i386/pc386/optenide.yml
@@ -6,8 +6,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: |
   Set if IDE support is enabled.
 enabled-by: true
diff --git a/spec/build/bsps/i386/pc386/optenvga.yml b/spec/build/bsps/i386/pc386/optenvga.yml
index d2f4755a8b..e7e92db751 100644
--- a/spec/build/bsps/i386/pc386/optenvga.yml
+++ b/spec/build/bsps/i386/pc386/optenvga.yml
@@ -6,8 +6,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: |
   Set if the VGA and keyboard console support is enabled.
 enabled-by: true
diff --git a/spec/build/bsps/i386/pc386/optgdbstub.yml b/spec/build/bsps/i386/pc386/optgdbstub.yml
index 6af1c8ec56..3088bbb0bd 100644
--- a/spec/build/bsps/i386/pc386/optgdbstub.yml
+++ b/spec/build/bsps/i386/pc386/optgdbstub.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: |
   Defined by default. Enables use of the GDB stub for debugging via a serial port.
 enabled-by: true
diff --git a/spec/build/bsps/i386/pc386/optgdtdesc.yml b/spec/build/bsps/i386/pc386/optgdtdesc.yml
index 8898bf4726..f7fa6fcabf 100644
--- a/spec/build/bsps/i386/pc386/optgdtdesc.yml
+++ b/spec/build/bsps/i386/pc386/optgdtdesc.yml
@@ -15,8 +15,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: |
   Defines how many descriptors in GDT may be allocated for application or driver usage.
 enabled-by: true
diff --git a/spec/build/bsps/i386/pc386/optidepriifc.yml b/spec/build/bsps/i386/pc386/optidepriifc.yml
index 375b89904b..a19aafc921 100644
--- a/spec/build/bsps/i386/pc386/optidepriifc.yml
+++ b/spec/build/bsps/i386/pc386/optidepriifc.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: |
   Determines, whether RTEMS will try to use the primary IDE interface.  Disable it, if: - you have no primary IDE interface - or you have no disk attached to this interface - or you do not want to access disks attached to this interface
 enabled-by: true
diff --git a/spec/build/bsps/i386/pc386/optidesecifc.yml b/spec/build/bsps/i386/pc386/optidesecifc.yml
index 4b61958f7d..56eed819eb 100644
--- a/spec/build/bsps/i386/pc386/optidesecifc.yml
+++ b/spec/build/bsps/i386/pc386/optidesecifc.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: |
   Determines, whether RTEMS will try to use the secondary IDE interface.  Enable it, if: - you have a secondary IDE interface - and you have at least one disk attached to this interface - and you do want to access disks attached to this interface
 enabled-by: true
diff --git a/spec/build/bsps/i386/pc386/optrelocaddr.yml b/spec/build/bsps/i386/pc386/optrelocaddr.yml
index 2c653a7544..023fa93eaf 100644
--- a/spec/build/bsps/i386/pc386/optrelocaddr.yml
+++ b/spec/build/bsps/i386/pc386/optrelocaddr.yml
@@ -10,8 +10,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0x00100000
-default-by-variant: []
+default:
+- enabled-by: true
+  value: 0x00100000
 description: |
   Set the value of RELOCADDR to the address where you want your image to load.
   If you'll be using GRUB to load the images it will have to be >= 0x100000
diff --git a/spec/build/bsps/i386/pc386/optvberm.yml b/spec/build/bsps/i386/pc386/optvberm.yml
index dce5975ef8..8a10dba52e 100644
--- a/spec/build/bsps/i386/pc386/optvberm.yml
+++ b/spec/build/bsps/i386/pc386/optvberm.yml
@@ -6,8 +6,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: |
   Defined by default. Enables use of the Vesa Bios Extensions - real mode interface, which enables graphical mode and introduce it upon bootup.
 enabled-by: true
diff --git a/spec/build/bsps/i386/pc386/optvga.yml b/spec/build/bsps/i386/pc386/optvga.yml
index 5477de3e0b..81e79b7a78 100644
--- a/spec/build/bsps/i386/pc386/optvga.yml
+++ b/spec/build/bsps/i386/pc386/optvga.yml
@@ -6,8 +6,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, enables use of the very basic VGA driver for framebuffer support rather than the controller utilizing Vesa Bios Extensions - real mode interface.
 enabled-by: true
diff --git a/spec/build/bsps/i386/pc386/optvideo80x50.yml b/spec/build/bsps/i386/pc386/optvideo80x50.yml
index f95225bc04..438895b15a 100644
--- a/spec/build/bsps/i386/pc386/optvideo80x50.yml
+++ b/spec/build/bsps/i386/pc386/optvideo80x50.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, set the VGA display to 80x50.
 enabled-by: true
diff --git a/spec/build/bsps/i386/pc386/tst-xfail-val.yml b/spec/build/bsps/i386/pc386/tst-xfail-val.yml
index 3622849a6c..7ca2360de2 100644
--- a/spec/build/bsps/i386/pc386/tst-xfail-val.yml
+++ b/spec/build/bsps/i386/pc386/tst-xfail-val.yml
@@ -15,8 +15,7 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2021 embedded brains GmbH (http://www.embedded-brains.de)
-default: null
-default-by-variant: []
+default: []
 description: ''
 enabled-by: true
 links: []