5 files changed, 15 insertions, 28 deletions
diff --git a/spec/build/bsps/sparc/erc32/abi.yml b/spec/build/bsps/sparc/erc32/abi.yml
index f8ea9fb8da..42e0e01cc5 100644
--- a/spec/build/bsps/sparc/erc32/abi.yml
+++ b/spec/build/bsps/sparc/erc32/abi.yml
@@ -5,10 +5,11 @@ 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:
-- -mcpu=cypress
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -mcpu=cypress
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/sparc/erc32/bsperc32.yml b/spec/build/bsps/sparc/erc32/bsperc32.yml
index 455aec13f6..4d57e5902d 100644
--- a/spec/build/bsps/sparc/erc32/bsperc32.yml
+++ b/spec/build/bsps/sparc/erc32/bsperc32.yml
@@ -4,7 +4,7 @@ bsp: erc32
 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: erc32
@@ -14,10 +14,11 @@ install:
   source:
   - bsps/sparc/erc32/include/bsp.h
   - bsps/sparc/erc32/include/erc32.h
-  - bsps/sparc/erc32/include/tm27.h
 - destination: ${BSP_INCLUDEDIR}/bsp
   source:
   - bsps/sparc/erc32/include/bsp/irq.h
+  - bsps/sparc/erc32/include/bsp/irqimpl.h
+  - bsps/sparc/include/bsp/sparc-counter.h
 - destination: ${BSP_LIBDIR}
   source:
   - bsps/sparc/erc32/start/linkcmds
@@ -28,6 +29,8 @@ links:
 - role: build-dependency
   uid: ../../objirq
 - role: build-dependency
+  uid: ../objmem
+- role: build-dependency
   uid: ../../opto2
 - role: build-dependency
   uid: abi
@@ -36,8 +39,6 @@ links:
 - role: build-dependency
   uid: optconirq
 - role: build-dependency
-  uid: optpwrdwnhlt
-- role: build-dependency
   uid: ../grp
 - role: build-dependency
   uid: ../start
@@ -69,6 +70,5 @@ source:
 - bsps/sparc/shared/irq/bsp_isr_handler.c
 - bsps/sparc/shared/irq/irq-shared.c
 - bsps/sparc/shared/start/bsp_fatal_exit.c
-- bsps/sparc/shared/start/bsp_fatal_halt.c
-- bsps/sparc/shared/start/bspgetworkarea.c
+- bsps/sparc/shared/start/sparc-counter-asm.S
 type: build
diff --git a/spec/build/bsps/sparc/erc32/objsmp.yml b/spec/build/bsps/sparc/erc32/objsmp.yml
index 05aa378fb7..346e17203d 100644
--- a/spec/build/bsps/sparc/erc32/objsmp.yml
+++ b/spec/build/bsps/sparc/erc32/objsmp.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/sparc/erc32/optconirq.yml b/spec/build/bsps/sparc/erc32/optconirq.yml
index df25d621b4..9d4d61aa89 100644
--- a/spec/build/bsps/sparc/erc32/optconirq.yml
+++ b/spec/build/bsps/sparc/erc32/optconirq.yml
@@ -4,9 +4,10 @@ actions:
 - define: null
 build-type: option
 copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 0
-default-by-variant: []
+- Copyright (C) 2020 embedded brains GmbH & Co. KG
+default:
+- enabled-by: true
+  value: 0
 description: |
   The erc32 console driver can operate in either polled or interrupt mode.  Under the simulator (especially when FAST_UART is defined), polled seems to operate better. It is common for a task to print a line (like the end of test message) and then exit.  In this case, the program returns control to the simulator command line before the program has even queued the output to the uart.  Thus sis has no chance of getting the data out.
 enabled-by: true
diff --git a/spec/build/bsps/sparc/erc32/optpwrdwnhlt.yml b/spec/build/bsps/sparc/erc32/optpwrdwnhlt.yml
deleted file mode 100644
index 6627a5b071..0000000000
--- a/spec/build/bsps/sparc/erc32/optpwrdwnhlt.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
-actions:
-- get-boolean: null
-- define-condition: null
-build-type: option
-copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: false
-default-by-variant: []
-description: |
-  If defined, CPU is spinning on fatal exit. Otherwise generate system error which will hand over to debugger, simulator, etc.
-enabled-by: true
-links: []
-name: BSP_POWER_DOWN_AT_FATAL_HALT
-type: build