8 files changed, 21 insertions, 33 deletions
diff --git a/spec/build/bsps/sparc/leon2/abi.yml b/spec/build/bsps/sparc/leon2/abi.yml
index 21fe1b77ca..3526048431 100644
--- a/spec/build/bsps/sparc/leon2/abi.yml
+++ b/spec/build/bsps/sparc/leon2/abi.yml
@@ -5,15 +5,15 @@ 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=leon
-default-by-variant:
-- value:
+- enabled-by: sparc/at697f
+  value:
   - -mcpu=leon
   - -mfix-at697f
-  variants:
-  - sparc/at697f
+- enabled-by: true
+  value:
+  - -mcpu=leon
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/sparc/leon2/bspat697f.yml b/spec/build/bsps/sparc/leon2/bspat697f.yml
index 6cb215721c..d8b379e29e 100644
--- a/spec/build/bsps/sparc/leon2/bspat697f.yml
+++ b/spec/build/bsps/sparc/leon2/bspat697f.yml
@@ -4,7 +4,7 @@ bsp: at697f
 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: leon2
diff --git a/spec/build/bsps/sparc/leon2/bspleon2.yml b/spec/build/bsps/sparc/leon2/bspleon2.yml
index 0ed296385d..201b653c2e 100644
--- a/spec/build/bsps/sparc/leon2/bspleon2.yml
+++ b/spec/build/bsps/sparc/leon2/bspleon2.yml
@@ -4,7 +4,7 @@ bsp: leon2
 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: leon2
diff --git a/spec/build/bsps/sparc/leon2/grp.yml b/spec/build/bsps/sparc/leon2/grp.yml
index cc0f23e39b..6a62cf00ae 100644
--- a/spec/build/bsps/sparc/leon2/grp.yml
+++ b/spec/build/bsps/sparc/leon2/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: []
@@ -28,8 +31,6 @@ links:
 - role: build-dependency
   uid: optconirq
 - role: build-dependency
-  uid: optpwrdwnhlt
-- role: build-dependency
   uid: ../start
 - role: build-dependency
   uid: ../../bspopts
diff --git a/spec/build/bsps/sparc/leon2/obj.yml b/spec/build/bsps/sparc/leon2/obj.yml
index dc036ec122..5a68f896ed 100644
--- a/spec/build/bsps/sparc/leon2/obj.yml
+++ b/spec/build/bsps/sparc/leon2/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
@@ -12,11 +12,12 @@ install:
   source:
   - bsps/sparc/leon2/include/bsp.h
   - bsps/sparc/leon2/include/leon.h
-  - bsps/sparc/leon2/include/tm27.h
 - destination: ${BSP_INCLUDEDIR}/bsp
   source:
+  - bsps/sparc/include/bsp/sparc-counter.h
   - bsps/sparc/leon2/include/bsp/at697_pci.h
   - bsps/sparc/leon2/include/bsp/irq.h
+  - bsps/sparc/leon2/include/bsp/irqimpl.h
 - destination: ${BSP_LIBDIR}
   source:
   - bsps/sparc/leon2/start/linkcmds.at697f
@@ -47,5 +48,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/sparc-counter-asm.S
 type: build
diff --git a/spec/build/bsps/sparc/leon2/objsmp.yml b/spec/build/bsps/sparc/leon2/objsmp.yml
index bf5d80637d..920d154b8b 100644
--- a/spec/build/bsps/sparc/leon2/objsmp.yml
+++ b/spec/build/bsps/sparc/leon2/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/leon2/optconirq.yml b/spec/build/bsps/sparc/leon2/optconirq.yml
index 4163b30aff..d59a86c6c9 100644
--- a/spec/build/bsps/sparc/leon2/optconirq.yml
+++ b/spec/build/bsps/sparc/leon2/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 leon2 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/leon2/optpwrdwnhlt.yml b/spec/build/bsps/sparc/leon2/optpwrdwnhlt.yml
deleted file mode 100644
index 6627a5b071..0000000000
--- a/spec/build/bsps/sparc/leon2/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