8 files changed, 28 insertions, 22 deletions
diff --git a/spec/build/bsps/powerpc/ss555/abi.yml b/spec/build/bsps/powerpc/ss555/abi.yml
index 5d49ce0905..491fbe4f13 100644
--- a/spec/build/bsps/powerpc/ss555/abi.yml
+++ b/spec/build/bsps/powerpc/ss555/abi.yml
@@ -5,11 +5,12 @@ 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:
-- -Dmpc555
-- -mcpu=505
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -Dmpc555
+  - -mcpu=505
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/ss555/bspss555.yml b/spec/build/bsps/powerpc/ss555/bspss555.yml
index 8a6ed520ff..c97bbedf9f 100644
--- a/spec/build/bsps/powerpc/ss555/bspss555.yml
+++ b/spec/build/bsps/powerpc/ss555/bspss555.yml
@@ -4,7 +4,7 @@ bsp: ss555
 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: ss555
@@ -13,7 +13,6 @@ install:
 - destination: ${BSP_INCLUDEDIR}
   source:
   - bsps/powerpc/ss555/include/bsp.h
-  - bsps/powerpc/ss555/include/tm27.h
 - destination: ${BSP_INCLUDEDIR}/bsp
   source:
   - bsps/powerpc/ss555/include/bsp/irq.h
@@ -81,6 +80,7 @@ source:
 - bsps/shared/irq/irq-handler-remove.c
 - bsps/shared/irq/irq-info.c
 - bsps/shared/irq/irq-lock.c
+- bsps/shared/irq/irq-record.c
 - bsps/shared/irq/irq-server.c
 - bsps/shared/irq/irq-shell.c
 - bsps/shared/start/bspfatal-default.c
diff --git a/spec/build/bsps/powerpc/ss555/optconminor.yml b/spec/build/bsps/powerpc/ss555/optconminor.yml
index edadd92fe1..b3e3fcb253 100644
--- a/spec/build/bsps/powerpc/ss555/optconminor.yml
+++ b/spec/build/bsps/powerpc/ss555/optconminor.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: SCI2_MINOR
-default-by-variant: []
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: true
+  value: SCI2_MINOR
 description: |
   Must be defined to be one of SCI1_MINOR or SCI2_MINOR.  Determines which device will be registered as /dev/console.
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/ss555/optprintkminor.yml b/spec/build/bsps/powerpc/ss555/optprintkminor.yml
index 86cb37b0ab..e4dec5e17c 100644
--- a/spec/build/bsps/powerpc/ss555/optprintkminor.yml
+++ b/spec/build/bsps/powerpc/ss555/optprintkminor.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: SCI2_MINOR
-default-by-variant: []
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: true
+  value: SCI2_MINOR
 description: |
   Must be defined to be one of SCI1_MINOR or SCI2_MINOR.  Determines which device is used for output by printk().  The printk port always uses polled I/O.  Don't open the printk port from RTEMS unless also using polled I/O for the SCI ports.
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/ss555/optuartsiomode.yml b/spec/build/bsps/powerpc/ss555/optuartsiomode.yml
index 8e351bb7a1..9085a21bd8 100644
--- a/spec/build/bsps/powerpc/ss555/optuartsiomode.yml
+++ b/spec/build/bsps/powerpc/ss555/optuartsiomode.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: |
   Define to 1 if you want interrupt-driven I/O for the SCI ports.
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/ss555/optuartsterm.yml b/spec/build/bsps/powerpc/ss555/optuartsterm.yml
index 1aa2122c24..15bd5caac0 100644
--- a/spec/build/bsps/powerpc/ss555/optuartsterm.yml
+++ b/spec/build/bsps/powerpc/ss555/optuartsterm.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: |
   Define to 1 if you want termios support for every port.  Termios support is independent of the choice of UART I/O mode.
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/ss555/optwdgtimeout.yml b/spec/build/bsps/powerpc/ss555/optwdgtimeout.yml
index 2cb717a1fc..1558825ad9 100644
--- a/spec/build/bsps/powerpc/ss555/optwdgtimeout.yml
+++ b/spec/build/bsps/powerpc/ss555/optwdgtimeout.yml
@@ -4,9 +4,10 @@ actions:
 - define: null
 build-type: option
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 65535
-default-by-variant: []
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: true
+  value: 0x0000ffff
 description: |
   Define to the desired timeout (in steps of 1/20 msec) to enable the watchdog.  Default is to disable the watchdog entirely.
 enabled-by: true
diff --git a/spec/build/bsps/powerpc/ss555/start.yml b/spec/build/bsps/powerpc/ss555/start.yml
index 67d16365b0..4a3f3b3b07 100644
--- a/spec/build/bsps/powerpc/ss555/start.yml
+++ b/spec/build/bsps/powerpc/ss555/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: []