7 files changed, 28 insertions, 22 deletions
diff --git a/spec/build/bsps/sparc64/grp.yml b/spec/build/bsps/sparc64/grp.yml
index 83d85d1a01..b1a505ab6d 100644
--- a/spec/build/bsps/sparc64/grp.yml
+++ b/spec/build/bsps/sparc64/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/sparc64/niagara/abi.yml b/spec/build/bsps/sparc64/niagara/abi.yml
index d8aadc1831..6cc0e02274 100644
--- a/spec/build/bsps/sparc64/niagara/abi.yml
+++ b/spec/build/bsps/sparc64/niagara/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:
-- -DSUN4V
-- -mcpu=niagara
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -DSUN4V
+  - -mcpu=niagara
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/sparc64/niagara/bspniagara.yml b/spec/build/bsps/sparc64/niagara/bspniagara.yml
index 3f60a842f8..012f765d3c 100644
--- a/spec/build/bsps/sparc64/niagara/bspniagara.yml
+++ b/spec/build/bsps/sparc64/niagara/bspniagara.yml
@@ -4,7 +4,7 @@ bsp: niagara
 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: niagara
@@ -13,7 +13,6 @@ install:
 - destination: ${BSP_INCLUDEDIR}
   source:
   - bsps/sparc64/niagara/include/bsp.h
-  - bsps/sparc64/niagara/include/tm27.h
 - destination: ${BSP_INCLUDEDIR}/bsp
   source:
   - bsps/sparc64/niagara/include/bsp/irq.h
@@ -27,6 +26,8 @@ links:
 - role: build-dependency
   uid: ../../objirqdflt
 - role: build-dependency
+  uid: ../../objmem
+- role: build-dependency
   uid: ../../opto2
 - role: build-dependency
   uid: ../grp
@@ -38,12 +39,11 @@ links:
   uid: ../../bspopts
 source:
 - bsps/shared/cache/nocache.c
-- bsps/shared/dev/btimer/btimer-stub.c
+- bsps/shared/dev/btimer/btimer-cpucounter.c
 - bsps/shared/dev/getentropy/getentropy-cpucounter.c
 - bsps/shared/dev/serial/legacy-console-control.c
 - bsps/shared/dev/serial/legacy-console-select.c
 - bsps/shared/dev/serial/legacy-console.c
-- bsps/shared/start/bspgetworkarea-default.c
 - bsps/shared/start/bspreset-empty.c
 - bsps/shared/start/bspstart-empty.c
 - bsps/shared/start/gettargethash-default.c
diff --git a/spec/build/bsps/sparc64/start.yml b/spec/build/bsps/sparc64/start.yml
index 526fb049fd..3e8e65d826 100644
--- a/spec/build/bsps/sparc64/start.yml
+++ b/spec/build/bsps/sparc64/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: []
diff --git a/spec/build/bsps/sparc64/usiii/abi.yml b/spec/build/bsps/sparc64/usiii/abi.yml
index 77dce75223..8673c41b60 100644
--- a/spec/build/bsps/sparc64/usiii/abi.yml
+++ b/spec/build/bsps/sparc64/usiii/abi.yml
@@ -5,12 +5,13 @@ 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:
-- -DSUN4U
-- -DUS3
-- -mcpu=ultrasparc3
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -DSUN4U
+  - -DUS3
+  - -mcpu=ultrasparc3
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/sparc64/usiii/bspusiii.yml b/spec/build/bsps/sparc64/usiii/bspusiii.yml
index 068deafc89..2f67a3e1f7 100644
--- a/spec/build/bsps/sparc64/usiii/bspusiii.yml
+++ b/spec/build/bsps/sparc64/usiii/bspusiii.yml
@@ -4,7 +4,7 @@ bsp: usiii
 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: usiii
@@ -13,7 +13,6 @@ install:
 - destination: ${BSP_INCLUDEDIR}
   source:
   - bsps/sparc64/usiii/include/bsp.h
-  - bsps/sparc64/usiii/include/tm27.h
 - destination: ${BSP_INCLUDEDIR}/bsp
   source:
   - bsps/sparc64/usiii/include/bsp/irq.h
@@ -27,6 +26,8 @@ links:
 - role: build-dependency
   uid: ../../objirqdflt
 - role: build-dependency
+  uid: ../../objmem
+- role: build-dependency
   uid: ../../opto2
 - role: build-dependency
   uid: ../grp
@@ -40,13 +41,12 @@ links:
   uid: ../../bspopts
 source:
 - bsps/shared/cache/nocache.c
-- bsps/shared/dev/btimer/btimer-stub.c
+- bsps/shared/dev/btimer/btimer-cpucounter.c
 - bsps/shared/dev/getentropy/getentropy-cpucounter.c
 - bsps/shared/dev/serial/legacy-console-control.c
 - bsps/shared/dev/serial/legacy-console-select.c
 - bsps/shared/dev/serial/legacy-console.c
 - bsps/shared/start/bspfatal-default.c
-- bsps/shared/start/bspgetworkarea-default.c
 - bsps/shared/start/bspreset-empty.c
 - bsps/shared/start/bspstart-empty.c
 - bsps/shared/start/gettargethash-default.c
diff --git a/spec/build/bsps/sparc64/usiii/optclkfastidle.yml b/spec/build/bsps/sparc64/usiii/optclkfastidle.yml
index 5aed542b4b..72e7ab8d9a 100644
--- a/spec/build/bsps/sparc64/usiii/optclkfastidle.yml
+++ b/spec/build/bsps/sparc64/usiii/optclkfastidle.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, speed up the clock ticks while the idle task is running so time spent in the idle task is minimized.  This significantly reduces the wall time required to execute the RTEMS test suites.
 enabled-by: true