8 files changed, 28 insertions, 25 deletions
diff --git a/spec/build/bsps/powerpc/psim/abi.yml b/spec/build/bsps/powerpc/psim/abi.yml
index b9b2ae3002..6cd8d0ad1b 100644
--- a/spec/build/bsps/powerpc/psim/abi.yml
+++ b/spec/build/bsps/powerpc/psim/abi.yml
@@ -5,13 +5,14 @@ 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:
-- -Dppc603e
-- -meabi
-- -mcpu=603e
-- -msdata=sysv
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -Dppc603e
+  - -meabi
+  - -mcpu=603e
+  - -msdata=sysv
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/psim/bsppsim.yml b/spec/build/bsps/powerpc/psim/bsppsim.yml
index 0a7762c599..c183cf15cd 100644
--- a/spec/build/bsps/powerpc/psim/bsppsim.yml
+++ b/spec/build/bsps/powerpc/psim/bsppsim.yml
@@ -4,7 +4,7 @@ bsp: psim
 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: psim
@@ -14,7 +14,6 @@ install:
   source:
   - bsps/powerpc/psim/include/bsp.h
   - bsps/powerpc/psim/include/psim.h
-  - bsps/powerpc/psim/include/tm27.h
 - destination: ${BSP_INCLUDEDIR}/bsp
   source:
   - bsps/powerpc/psim/include/bsp/irq.h
diff --git a/spec/build/bsps/powerpc/psim/objmpci.yml b/spec/build/bsps/powerpc/psim/objmpci.yml
index 01e44452f5..2c545f0ec5 100644
--- a/spec/build/bsps/powerpc/psim/objmpci.yml
+++ b/spec/build/bsps/powerpc/psim/objmpci.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:
diff --git a/spec/build/bsps/powerpc/psim/optclkfastidle.yml b/spec/build/bsps/powerpc/psim/optclkfastidle.yml
index df86867fa7..1019af2630 100644
--- a/spec/build/bsps/powerpc/psim/optclkfastidle.yml
+++ b/spec/build/bsps/powerpc/psim/optclkfastidle.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/psim
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: powerpc/psim
+  value: true
+- enabled-by: true
+  value: false
 description: |
   This sets a mode where the time runs as fast as possible when a clock ISR occurs while the IDLE thread is executing.  This can significantly reduce simulation times.
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/psim/optsbrk.yml b/spec/build/bsps/powerpc/psim/optsbrk.yml
index 05a1acd75f..849f37a46c 100644
--- a/spec/build/bsps/powerpc/psim/optsbrk.yml
+++ b/spec/build/bsps/powerpc/psim/optsbrk.yml
@@ -4,9 +4,10 @@ actions:
 - define-condition: null
 build-type: option
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: true
-default-by-variant: []
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: true
+  value: true
 description: |
   If defined then the BSP may reduce the available memory size initially. This can be useful for debugging (reduce the core size) or dynamic loading (std gcc text offsets/jumps are < +/-32M).  Note that the policy can still be defined by the application (see sbrk.c, BSP_sbrk_policy). By undefining CONFIGURE_MALLOC_BSP_SUPPORTS_SBRK this feature is removed and a little memory is saved.
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/psim/optsprg.yml b/spec/build/bsps/powerpc/psim/optsprg.yml
index 89f5b47135..21067b3c18 100644
--- a/spec/build/bsps/powerpc/psim/optsprg.yml
+++ b/spec/build/bsps/powerpc/psim/optsprg.yml
@@ -4,9 +4,10 @@ actions:
 - define-condition: null
 build-type: option
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: false
-default-by-variant: []
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: true
+  value: false
 description: |
   If defined, then the PowerPC specific code in RTEMS will use some of the special purpose registers to slightly optimize interrupt response time.  The use of these registers can conflict with other tools like debuggers.
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/psim/optvecbase.yml b/spec/build/bsps/powerpc/psim/optvecbase.yml
index 6de89c1aca..be5fac0ad5 100644
--- a/spec/build/bsps/powerpc/psim/optvecbase.yml
+++ b/spec/build/bsps/powerpc/psim/optvecbase.yml
@@ -4,9 +4,10 @@ actions:
 - define: null
 build-type: option
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 4293918976
-default-by-variant: []
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: true
+  value: 0xfff00100
 description: |
   This defines the base address of the exception table.  NOTE: Vectors are actually at 0xFFF00000 but file starts at offset.
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/psim/start.yml b/spec/build/bsps/powerpc/psim/start.yml
index d4d2efd571..d815372c2b 100644
--- a/spec/build/bsps/powerpc/psim/start.yml
+++ b/spec/build/bsps/powerpc/psim/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: []