10 files changed, 25 insertions, 42 deletions
diff --git a/spec/build/bsps/riscv/griscv/abi.yml b/spec/build/bsps/riscv/griscv/abi.yml
index fc915468ae..44a5c0127a 100644
--- a/spec/build/bsps/riscv/griscv/abi.yml
+++ b/spec/build/bsps/riscv/griscv/abi.yml
@@ -5,31 +5,28 @@ 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:
-- -march=rv32imafdc
-- -mabi=ilp32d
-default-by-variant:
-- value:
+- enabled-by: riscv/grv32imac
+  value:
   - -march=rv32imac
   - -mabi=ilp32
-  variants:
-  - riscv/grv32imac
-- value:
+- enabled-by: riscv/grv32im
+  value:
   - -march=rv32im
   - -mabi=ilp32
-  variants:
-  - riscv/grv32im
-- value:
+- enabled-by: riscv/grv32i
+  value:
   - -march=rv32i
   - -mabi=ilp32
-  variants:
-  - riscv/grv32i
-- value:
+- enabled-by: riscv/griscv
+  value:
   - -march=rv32imafd
   - -mabi=ilp32d
-  variants:
-  - riscv/griscv
+- enabled-by: true
+  value:
+  - -march=rv32imafdc
+  - -mabi=ilp32d
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/riscv/griscv/bspgriscv.yml b/spec/build/bsps/riscv/griscv/bspgriscv.yml
index 1992d096de..f57884ecf6 100644
--- a/spec/build/bsps/riscv/griscv/bspgriscv.yml
+++ b/spec/build/bsps/riscv/griscv/bspgriscv.yml
@@ -4,7 +4,7 @@ bsp: griscv
 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: griscv
diff --git a/spec/build/bsps/riscv/griscv/bspgrv32i.yml b/spec/build/bsps/riscv/griscv/bspgrv32i.yml
index 4f130b6cc7..154113a492 100644
--- a/spec/build/bsps/riscv/griscv/bspgrv32i.yml
+++ b/spec/build/bsps/riscv/griscv/bspgrv32i.yml
@@ -4,7 +4,7 @@ bsp: grv32i
 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: griscv
diff --git a/spec/build/bsps/riscv/griscv/bspgrv32im.yml b/spec/build/bsps/riscv/griscv/bspgrv32im.yml
index ed17f1ae11..2be6c589f2 100644
--- a/spec/build/bsps/riscv/griscv/bspgrv32im.yml
+++ b/spec/build/bsps/riscv/griscv/bspgrv32im.yml
@@ -4,7 +4,7 @@ bsp: grv32im
 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: griscv
diff --git a/spec/build/bsps/riscv/griscv/bspgrv32imac.yml b/spec/build/bsps/riscv/griscv/bspgrv32imac.yml
index 32c4807b57..37f80e3fb7 100644
--- a/spec/build/bsps/riscv/griscv/bspgrv32imac.yml
+++ b/spec/build/bsps/riscv/griscv/bspgrv32imac.yml
@@ -4,7 +4,7 @@ bsp: grv32imac
 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: griscv
diff --git a/spec/build/bsps/riscv/griscv/bspgrv32imafdc.yml b/spec/build/bsps/riscv/griscv/bspgrv32imafdc.yml
index 1448e19869..0546577f17 100644
--- a/spec/build/bsps/riscv/griscv/bspgrv32imafdc.yml
+++ b/spec/build/bsps/riscv/griscv/bspgrv32imafdc.yml
@@ -4,7 +4,7 @@ bsp: grv32imafdc
 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: griscv
diff --git a/spec/build/bsps/riscv/griscv/grp.yml b/spec/build/bsps/riscv/griscv/grp.yml
index 4fbfc1a260..0b4504f624 100644
--- a/spec/build/bsps/riscv/griscv/grp.yml
+++ b/spec/build/bsps/riscv/griscv/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,7 +31,7 @@ links:
 - role: build-dependency
   uid: ../../objmem
 - role: build-dependency
-  uid: optextirqmax
+  uid: ../optextirqmax
 - role: build-dependency
   uid: ../grp
 - role: build-dependency
diff --git a/spec/build/bsps/riscv/griscv/obj.yml b/spec/build/bsps/riscv/griscv/obj.yml
index fd06af7077..275aa09256 100644
--- a/spec/build/bsps/riscv/griscv/obj.yml
+++ b/spec/build/bsps/riscv/griscv/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,7 +12,6 @@ install:
   source:
   - bsps/riscv/griscv/include/amba.h
   - bsps/riscv/griscv/include/bsp.h
-  - bsps/riscv/griscv/include/tm27.h
 - destination: ${BSP_INCLUDEDIR}/bsp
   source:
   - bsps/riscv/griscv/include/bsp/irq.h
diff --git a/spec/build/bsps/riscv/griscv/objsmp.yml b/spec/build/bsps/riscv/griscv/objsmp.yml
index 83f5bb7f31..27fbb8966b 100644
--- a/spec/build/bsps/riscv/griscv/objsmp.yml
+++ b/spec/build/bsps/riscv/griscv/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/riscv/griscv/optextirqmax.yml b/spec/build/bsps/riscv/griscv/optextirqmax.yml
deleted file mode 100644
index ffa84748b6..0000000000
--- a/spec/build/bsps/riscv/griscv/optextirqmax.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-SPDX-License-Identifier: CC-BY-SA-4.0 OR BSD-2-Clause
-actions:
-- get-integer: null
-- define: null
-build-type: option
-copyrights:
-- Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: 64
-default-by-variant: []
-description: |
-  maximum number of external interrupts supported by the BSP (default 64)
-enabled-by: true
-format: '{}'
-links: []
-name: RISCV_MAXIMUM_EXTERNAL_INTERRUPTS
-type: build