16 files changed, 67 insertions, 59 deletions
diff --git a/spec/build/bsps/powerpc/tqm8xx/abi.yml b/spec/build/bsps/powerpc/tqm8xx/abi.yml
index 42d984d9b2..4a2041ea2b 100644
--- a/spec/build/bsps/powerpc/tqm8xx/abi.yml
+++ b/spec/build/bsps/powerpc/tqm8xx/abi.yml
@@ -5,15 +5,16 @@ actions:
 - env-append: null
 build-type: option
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
 default:
-- -Dmpc860
-- -mcpu=860
-- -mstrict-align
-- -fno-strict-aliasing
-- -meabi
-- -msdata=sysv
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -Dmpc860
+  - -mcpu=860
+  - -mstrict-align
+  - -fno-strict-aliasing
+  - -meabi
+  - -msdata=sysv
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/tqm8xx/bsppghplus.yml b/spec/build/bsps/powerpc/tqm8xx/bsppghplus.yml
index cff38f2626..b5dc91f8c0 100644
--- a/spec/build/bsps/powerpc/tqm8xx/bsppghplus.yml
+++ b/spec/build/bsps/powerpc/tqm8xx/bsppghplus.yml
@@ -4,7 +4,7 @@ bsp: pghplus
 build-type: bsp
 cflags: []
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
 cppflags: []
 enabled-by: true
 family: tqm8xx
diff --git a/spec/build/bsps/powerpc/tqm8xx/bspstk8xx.yml b/spec/build/bsps/powerpc/tqm8xx/bspstk8xx.yml
index 0640e8b872..928d4de29f 100644
--- a/spec/build/bsps/powerpc/tqm8xx/bspstk8xx.yml
+++ b/spec/build/bsps/powerpc/tqm8xx/bspstk8xx.yml
@@ -4,7 +4,7 @@ bsp: tqm8xx_stk8xx
 build-type: bsp
 cflags: []
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
 cppflags: []
 enabled-by: true
 family: tqm8xx
diff --git a/spec/build/bsps/powerpc/tqm8xx/grp.yml b/spec/build/bsps/powerpc/tqm8xx/grp.yml
index 8085166ea0..da4a735854 100644
--- a/spec/build/bsps/powerpc/tqm8xx/grp.yml
+++ b/spec/build/bsps/powerpc/tqm8xx/grp.yml
@@ -1,7 +1,10 @@
 SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
 build-type: group
+cflags: []
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+cppflags: []
+cxxflags: []
 enabled-by: true
 includes: []
 install: []
diff --git a/spec/build/bsps/powerpc/tqm8xx/obj.yml b/spec/build/bsps/powerpc/tqm8xx/obj.yml
index 360e99c864..e244eecfb9 100644
--- a/spec/build/bsps/powerpc/tqm8xx/obj.yml
+++ b/spec/build/bsps/powerpc/tqm8xx/obj.yml
@@ -2,7 +2,7 @@ SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
 build-type: objects
 cflags: []
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
 cppflags: []
 cxxflags: []
 enabled-by: true
@@ -11,7 +11,6 @@ install:
 - destination: ${BSP_INCLUDEDIR}
   source:
   - bsps/powerpc/tqm8xx/include/bsp.h
-  - bsps/powerpc/tqm8xx/include/tm27.h
 - destination: ${BSP_INCLUDEDIR}/bsp
   source:
   - bsps/powerpc/tqm8xx/include/bsp/8xx_immap.h
diff --git a/spec/build/bsps/powerpc/tqm8xx/optconchn.yml b/spec/build/bsps/powerpc/tqm8xx/optconchn.yml
index a33cfc32ab..e6a4c5b20b 100644
--- a/spec/build/bsps/powerpc/tqm8xx/optconchn.yml
+++ b/spec/build/bsps/powerpc/tqm8xx/optconchn.yml
@@ -4,9 +4,10 @@ actions:
 - define-unquoted: null
 build-type: option
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: CONS_CHN_SMC1
-default-by-variant: []
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: true
+  value: CONS_CHN_SMC1
 description: |
   (BSP--console driver) Must be defined to be one of CONS_CHN_SMC1, CONS_CHN_SMC2, CONS_CHN_SCC1, CONS_CHN_SCC2, CONS_CHN_SCC3, or CONS_CHN_SCC4.  Determines which device will be registered as /dev/console.
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/tqm8xx/optconscc1.yml b/spec/build/bsps/powerpc/tqm8xx/optconscc1.yml
index 6c0499daf1..29864dc149 100644
--- a/spec/build/bsps/powerpc/tqm8xx/optconscc1.yml
+++ b/spec/build/bsps/powerpc/tqm8xx/optconscc1.yml
@@ -4,9 +4,10 @@ actions:
 - define-unquoted: null
 build-type: option
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: CONS_MODE_UNUSED
-default-by-variant: []
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: true
+  value: CONS_MODE_UNUSED
 description: |
   (BSP--SCC1 UART IF mode) Must be defined if SCC1 is used as a tty (UART) channel. Set it to CONS_MODE_POLLED for polled operation, CONS_MODE_IRQ for interrupt driven (spooled) operation. Set it to CONS_MODE_UNUSED, if not used
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/tqm8xx/optconscc2.yml b/spec/build/bsps/powerpc/tqm8xx/optconscc2.yml
index 754abd522f..a7213f8734 100644
--- a/spec/build/bsps/powerpc/tqm8xx/optconscc2.yml
+++ b/spec/build/bsps/powerpc/tqm8xx/optconscc2.yml
@@ -4,9 +4,10 @@ actions:
 - define-unquoted: null
 build-type: option
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: CONS_MODE_UNUSED
-default-by-variant: []
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: true
+  value: CONS_MODE_UNUSED
 description: |
   (BSP--SCC2 UART IF mode) Must be defined if SCC2 is used as a tty (UART) channel. Set it to CONS_MODE_POLLED for polled operation, CONS_MODE_IRQ for interrupt driven (spooled) operation. Set it to CONS_MODE_UNUSED, if not used
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/tqm8xx/optconscc3.yml b/spec/build/bsps/powerpc/tqm8xx/optconscc3.yml
index bdc665cbde..c73502e924 100644
--- a/spec/build/bsps/powerpc/tqm8xx/optconscc3.yml
+++ b/spec/build/bsps/powerpc/tqm8xx/optconscc3.yml
@@ -4,9 +4,10 @@ actions:
 - define-unquoted: null
 build-type: option
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: CONS_MODE_UNUSED
-default-by-variant: []
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: true
+  value: CONS_MODE_UNUSED
 description: |
   (BSP--SCC3 UART IF mode) Must be defined if SCC3 is used as a tty (UART) channel. Set it to CONS_MODE_POLLED for polled operation, CONS_MODE_IRQ for interrupt driven (spooled) operation. Set it to CONS_MODE_UNUSED, if not used
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/tqm8xx/optconscc4.yml b/spec/build/bsps/powerpc/tqm8xx/optconscc4.yml
index e26ffcad07..a6c61e0339 100644
--- a/spec/build/bsps/powerpc/tqm8xx/optconscc4.yml
+++ b/spec/build/bsps/powerpc/tqm8xx/optconscc4.yml
@@ -4,9 +4,10 @@ actions:
 - define-unquoted: null
 build-type: option
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: CONS_MODE_UNUSED
-default-by-variant: []
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: true
+  value: CONS_MODE_UNUSED
 description: |
   (BSP--SCC4 UART IF mode) Must be defined if SCC4 is used as a tty (UART) channel. Set it to CONS_MODE_POLLED for polled operation, CONS_MODE_IRQ for interrupt driven (spooled) operation. Set it to CONS_MODE_UNUSED, if not used
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/tqm8xx/optconsmc1.yml b/spec/build/bsps/powerpc/tqm8xx/optconsmc1.yml
index 7c7f563d00..2f88ed1a82 100644
--- a/spec/build/bsps/powerpc/tqm8xx/optconsmc1.yml
+++ b/spec/build/bsps/powerpc/tqm8xx/optconsmc1.yml
@@ -4,15 +4,14 @@ actions:
 - define-unquoted: null
 build-type: option
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: CONS_MODE_UNUSED
-default-by-variant:
-- value: CONS_MODE_POLLED
-  variants:
-  - powerpc/tqm8xx_stk8xx
-- value: CONS_MODE_IRQ
-  variants:
-  - powerpc/pghplus
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: powerpc/tqm8xx_stk8xx
+  value: CONS_MODE_POLLED
+- enabled-by: powerpc/pghplus
+  value: CONS_MODE_IRQ
+- enabled-by: true
+  value: CONS_MODE_UNUSED
 description: |
   (BSP--SMC1 UART IF mode) Must be defined if SMC1 is used as a tty (UART) channel. Set it to CONS_MODE_POLLED for polled operation, CONS_MODE_IRQ for interrupt driven (spooled) operation. Set it to CONS_MODE_UNUSED, if not used
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/tqm8xx/optconsmc2.yml b/spec/build/bsps/powerpc/tqm8xx/optconsmc2.yml
index c19c2850fb..aff7f2a0bc 100644
--- a/spec/build/bsps/powerpc/tqm8xx/optconsmc2.yml
+++ b/spec/build/bsps/powerpc/tqm8xx/optconsmc2.yml
@@ -4,12 +4,12 @@ actions:
 - define-unquoted: null
 build-type: option
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: CONS_MODE_UNUSED
-default-by-variant:
-- value: CONS_MODE_POLLED
-  variants:
-  - powerpc/tqm8xx_stk8xx
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: powerpc/tqm8xx_stk8xx
+  value: CONS_MODE_POLLED
+- enabled-by: true
+  value: CONS_MODE_UNUSED
 description: |
   (BSP--SMC2 UART IF mode) Must be defined if SMC2 is used as a tty (UART) channel. Set it to CONS_MODE_POLLED for polled operation, CONS_MODE_IRQ for interrupt driven (spooled) operation. Set it to CONS_MODE_UNUSED, if not used
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/tqm8xx/optnetfec.yml b/spec/build/bsps/powerpc/tqm8xx/optnetfec.yml
index 52a1fc7afe..05d55e6d43 100644
--- a/spec/build/bsps/powerpc/tqm8xx/optnetfec.yml
+++ b/spec/build/bsps/powerpc/tqm8xx/optnetfec.yml
@@ -4,12 +4,12 @@ actions:
 - define-condition: null
 build-type: option
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: false
-default-by-variant:
-- value: true
-  variants:
-  - powerpc/pghplus
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: powerpc/pghplus
+  value: true
+- enabled-by: true
+  value: false
 description: |
   If defined, then the BSP will use the Fast Ethernet Controller for 10/100MBit networking and used as primary networking interface.
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/tqm8xx/optnetscc.yml b/spec/build/bsps/powerpc/tqm8xx/optnetscc.yml
index fe3492accf..ddedbae060 100644
--- a/spec/build/bsps/powerpc/tqm8xx/optnetscc.yml
+++ b/spec/build/bsps/powerpc/tqm8xx/optnetscc.yml
@@ -4,12 +4,12 @@ actions:
 - define-condition: null
 build-type: option
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: true
-default-by-variant:
-- value: false
-  variants:
-  - powerpc/pghplus
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: powerpc/pghplus
+  value: false
+- enabled-by: true
+  value: true
 description: |
   If defined, then the BSP will use the Serial Communications Controller (SCC1) for 10MBit networking.
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/tqm8xx/optprintkchn.yml b/spec/build/bsps/powerpc/tqm8xx/optprintkchn.yml
index cffd48009d..2086844688 100644
--- a/spec/build/bsps/powerpc/tqm8xx/optprintkchn.yml
+++ b/spec/build/bsps/powerpc/tqm8xx/optprintkchn.yml
@@ -4,9 +4,10 @@ actions:
 - define-unquoted: null
 build-type: option
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: CONS_CHN_SMC1
-default-by-variant: []
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: true
+  value: CONS_CHN_SMC1
 description: |
   (BSP--console driver) Must be defined to be one of CONS_CHN_SMC1, CONS_CHN_SMC2, CONS_CHN_SCC2, CONS_CHN_SCC3, or CONS_CHN_SCC4. Determines which device is used for output by printk(). If the port that printk() uses is also used for other I/O (e.g. if  PRINTK_CHN == CONSOLE_CHN), then both ports should use the same type of I/O, otherwise the drivers will likely conflict with each other.
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/tqm8xx/start.yml b/spec/build/bsps/powerpc/tqm8xx/start.yml
index ac62e13991..7f45345ca0 100644
--- a/spec/build/bsps/powerpc/tqm8xx/start.yml
+++ b/spec/build/bsps/powerpc/tqm8xx/start.yml
@@ -2,7 +2,7 @@ SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
 asflags: []
 build-type: start-file
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
 cppflags: []
 enabled-by: true
 includes: []