3 files changed, 11 insertions, 9 deletions
diff --git a/spec/build/bsps/arm/smdk2410/abi.yml b/spec/build/bsps/arm/smdk2410/abi.yml
index d964ca5d2f..3b66ec01ba 100644
--- a/spec/build/bsps/arm/smdk2410/abi.yml
+++ b/spec/build/bsps/arm/smdk2410/abi.yml
@@ -7,8 +7,9 @@ build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
 default:
-- -mcpu=arm920t
-default-by-variant: []
+- enabled-by: true
+  value:
+  - -mcpu=arm920t
 description: |
   ABI flags
 enabled-by: true
diff --git a/spec/build/bsps/arm/smdk2410/optcpus3c2410.yml b/spec/build/bsps/arm/smdk2410/optcpus3c2410.yml
index ba24539e4a..187b7972a0 100644
--- a/spec/build/bsps/arm/smdk2410/optcpus3c2410.yml
+++ b/spec/build/bsps/arm/smdk2410/optcpus3c2410.yml
@@ -5,11 +5,11 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: false
-default-by-variant:
-- value: true
-  variants:
-  - arm/smdk2410
+default:
+- enabled-by: arm/smdk2410
+  value: true
+- enabled-by: true
+  value: false
 description: |
   If defined, enable optons for the S3C2410 CPU model.
 enabled-by: true
diff --git a/spec/build/bsps/arm/smdk2410/optskyeye.yml b/spec/build/bsps/arm/smdk2410/optskyeye.yml
index be55a98c3a..0d805efefd 100644
--- a/spec/build/bsps/arm/smdk2410/optskyeye.yml
+++ b/spec/build/bsps/arm/smdk2410/optskyeye.yml
@@ -5,8 +5,9 @@ actions:
 build-type: option
 copyrights:
 - Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
-default: false
-default-by-variant: []
+default:
+- enabled-by: true
+  value: false
 description: |
   If defined, enable options which optimize executingon the Skyeye simulator.  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