build: Fix optimization flags definition order

OPTIMIZATION_FLAGS must be defined before /build/bsp/bspopts is processed.

Update #4670.

64 files changed, 128 insertions, 128 deletions

diff --git a/spec/build/bsps/arm/beagle/bspboardorig.yml b/spec/build/bsps/arm/beagle/bspboardorig.yml
index 92eb7001fd..02423f64a6 100644
--- a/spec/build/bsps/arm/beagle/bspboardorig.yml
+++ b/spec/build/bsps/arm/beagle/bspboardorig.yml
@@ -12,8 +12,8 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/arm/beagle/bspboardxm.yml b/spec/build/bsps/arm/beagle/bspboardxm.yml
index b0869cfbce..a817cd850b 100644
--- a/spec/build/bsps/arm/beagle/bspboardxm.yml
+++ b/spec/build/bsps/arm/beagle/bspboardxm.yml
@@ -12,8 +12,8 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/arm/beagle/bspboneblack.yml b/spec/build/bsps/arm/beagle/bspboneblack.yml
index 7818fdebfa..f4937d7eb6 100644
--- a/spec/build/bsps/arm/beagle/bspboneblack.yml
+++ b/spec/build/bsps/arm/beagle/bspboneblack.yml
@@ -12,8 +12,8 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/arm/beagle/bspbonewhite.yml b/spec/build/bsps/arm/beagle/bspbonewhite.yml
index 85ae13cea5..d685ec7086 100644
--- a/spec/build/bsps/arm/beagle/bspbonewhite.yml
+++ b/spec/build/bsps/arm/beagle/bspbonewhite.yml
@@ -12,8 +12,8 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/arm/csb337/bspcsb337.yml b/spec/build/bsps/arm/csb337/bspcsb337.yml
index 5665a29ef2..086cd7eff7 100644
--- a/spec/build/bsps/arm/csb337/bspcsb337.yml
+++ b/spec/build/bsps/arm/csb337/bspcsb337.yml
@@ -12,8 +12,8 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/arm/csb337/bspcsb637.yml b/spec/build/bsps/arm/csb337/bspcsb637.yml
index dd8a4e1659..b0a5830e1a 100644
--- a/spec/build/bsps/arm/csb337/bspcsb637.yml
+++ b/spec/build/bsps/arm/csb337/bspcsb637.yml
@@ -12,8 +12,8 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/arm/csb337/bspkit637v6.yml b/spec/build/bsps/arm/csb337/bspkit637v6.yml
index 375c264880..7b4376125c 100644
--- a/spec/build/bsps/arm/csb337/bspkit637v6.yml
+++ b/spec/build/bsps/arm/csb337/bspkit637v6.yml
@@ -12,8 +12,8 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/arm/fvp/bspcortexr52.yml b/spec/build/bsps/arm/fvp/bspcortexr52.yml
index 01a3d7c3bd..109cadd232 100644
--- a/spec/build/bsps/arm/fvp/bspcortexr52.yml
+++ b/spec/build/bsps/arm/fvp/bspcortexr52.yml
@@ -12,8 +12,8 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/arm/lm3s69xx/bsplm3s3749.yml b/spec/build/bsps/arm/lm3s69xx/bsplm3s3749.yml
index f9006ac2cd..fac2939a3e 100644
--- a/spec/build/bsps/arm/lm3s69xx/bsplm3s3749.yml
+++ b/spec/build/bsps/arm/lm3s69xx/bsplm3s3749.yml
@@ -12,10 +12,10 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: tstlm3s3749
 - role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/arm/lm3s69xx/bsplm3s6965.yml b/spec/build/bsps/arm/lm3s69xx/bsplm3s6965.yml
index aa7627d33f..12131689f6 100644
--- a/spec/build/bsps/arm/lm3s69xx/bsplm3s6965.yml
+++ b/spec/build/bsps/arm/lm3s69xx/bsplm3s6965.yml
@@ -12,10 +12,10 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: tstlm3s6965
 - role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/arm/lm3s69xx/bsplm4f120.yml b/spec/build/bsps/arm/lm3s69xx/bsplm4f120.yml
index cbfe6707d5..61db91b6e7 100644
--- a/spec/build/bsps/arm/lm3s69xx/bsplm4f120.yml
+++ b/spec/build/bsps/arm/lm3s69xx/bsplm4f120.yml
@@ -12,10 +12,10 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: tstlm4f120
 - role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/arm/lm3s69xx/bspqemu.yml b/spec/build/bsps/arm/lm3s69xx/bspqemu.yml
index ca15af5b37..3005b74f77 100644
--- a/spec/build/bsps/arm/lm3s69xx/bspqemu.yml
+++ b/spec/build/bsps/arm/lm3s69xx/bspqemu.yml
@@ -12,8 +12,8 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/arm/lpc176x/bsplpc1768mbed.yml b/spec/build/bsps/arm/lpc176x/bsplpc1768mbed.yml
index 189ef44c63..60f3cd884e 100644
--- a/spec/build/bsps/arm/lpc176x/bsplpc1768mbed.yml
+++ b/spec/build/bsps/arm/lpc176x/bsplpc1768mbed.yml
@@ -12,10 +12,10 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: tstlpc1768mbed
 - role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/arm/lpc176x/bsplpc1768mbedahbram.yml b/spec/build/bsps/arm/lpc176x/bsplpc1768mbedahbram.yml
index 705599cbb8..a972542311 100644
--- a/spec/build/bsps/arm/lpc176x/bsplpc1768mbedahbram.yml
+++ b/spec/build/bsps/arm/lpc176x/bsplpc1768mbedahbram.yml
@@ -12,10 +12,10 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: tstlpc1768mbedahbram
 - role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/arm/lpc176x/bsplpc1768mbedahbrameth.yml b/spec/build/bsps/arm/lpc176x/bsplpc1768mbedahbrameth.yml
index 4d1dddef55..54af5e7e2d 100644
--- a/spec/build/bsps/arm/lpc176x/bsplpc1768mbedahbrameth.yml
+++ b/spec/build/bsps/arm/lpc176x/bsplpc1768mbedahbrameth.yml
@@ -12,10 +12,10 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: tstlpc1768mbedahbrameth
 - role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/arm/lpc24xx/bsplpc17xxearam.yml b/spec/build/bsps/arm/lpc24xx/bsplpc17xxearam.yml
index 181c49c60a..7d6965fe95 100644
--- a/spec/build/bsps/arm/lpc24xx/bsplpc17xxearam.yml
+++ b/spec/build/bsps/arm/lpc24xx/bsplpc17xxearam.yml
@@ -12,8 +12,8 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/arm/lpc24xx/bsplpc17xxearomint.yml b/spec/build/bsps/arm/lpc24xx/bsplpc17xxearomint.yml
index ad6e72110a..0bc957246a 100644
--- a/spec/build/bsps/arm/lpc24xx/bsplpc17xxearomint.yml
+++ b/spec/build/bsps/arm/lpc24xx/bsplpc17xxearomint.yml
@@ -12,10 +12,10 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: tstlpc17xxearomint
 - role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/arm/lpc24xx/bsplpc17xxplx800ram.yml b/spec/build/bsps/arm/lpc24xx/bsplpc17xxplx800ram.yml
index c19e6174f0..8209b48919 100644
--- a/spec/build/bsps/arm/lpc24xx/bsplpc17xxplx800ram.yml
+++ b/spec/build/bsps/arm/lpc24xx/bsplpc17xxplx800ram.yml
@@ -12,8 +12,8 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/arm/lpc24xx/bsplpc17xxplx800romint.yml b/spec/build/bsps/arm/lpc24xx/bsplpc17xxplx800romint.yml
index ec07975717..950a7a5e38 100644
--- a/spec/build/bsps/arm/lpc24xx/bsplpc17xxplx800romint.yml
+++ b/spec/build/bsps/arm/lpc24xx/bsplpc17xxplx800romint.yml
@@ -12,10 +12,10 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: tstlpc17xxplx800romint
 - role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/arm/lpc24xx/bsplpc2362.yml b/spec/build/bsps/arm/lpc24xx/bsplpc2362.yml
index 8e738f0156..0413c6e532 100644
--- a/spec/build/bsps/arm/lpc24xx/bsplpc2362.yml
+++ b/spec/build/bsps/arm/lpc24xx/bsplpc2362.yml
@@ -12,10 +12,10 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: tstlpc23xx
 - role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/arm/lpc24xx/bsplpc23xxtli800.yml b/spec/build/bsps/arm/lpc24xx/bsplpc23xxtli800.yml
index 183b522591..8f7778e263 100644
--- a/spec/build/bsps/arm/lpc24xx/bsplpc23xxtli800.yml
+++ b/spec/build/bsps/arm/lpc24xx/bsplpc23xxtli800.yml
@@ -12,10 +12,10 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: tstlpc23xx
 - role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/arm/lpc24xx/bsplpc24xxea.yml b/spec/build/bsps/arm/lpc24xx/bsplpc24xxea.yml
index 8aa5210101..9a8f98032f 100644
--- a/spec/build/bsps/arm/lpc24xx/bsplpc24xxea.yml
+++ b/spec/build/bsps/arm/lpc24xx/bsplpc24xxea.yml
@@ -12,8 +12,8 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/arm/lpc24xx/bsplpc40xxearam.yml b/spec/build/bsps/arm/lpc24xx/bsplpc40xxearam.yml
index 74dd4b4e0f..b5b77fe195 100644
--- a/spec/build/bsps/arm/lpc24xx/bsplpc40xxearam.yml
+++ b/spec/build/bsps/arm/lpc24xx/bsplpc40xxearam.yml
@@ -12,8 +12,8 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/arm/lpc24xx/bsplpc40xxearomint.yml b/spec/build/bsps/arm/lpc24xx/bsplpc40xxearomint.yml
index babf218f6d..0664558158 100644
--- a/spec/build/bsps/arm/lpc24xx/bsplpc40xxearomint.yml
+++ b/spec/build/bsps/arm/lpc24xx/bsplpc40xxearomint.yml
@@ -12,10 +12,10 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: tstlpc40xxearomint
 - role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/arm/lpc24xx/bspncsram.yml b/spec/build/bsps/arm/lpc24xx/bspncsram.yml
index f5fd8fb730..00356fc87b 100644
--- a/spec/build/bsps/arm/lpc24xx/bspncsram.yml
+++ b/spec/build/bsps/arm/lpc24xx/bspncsram.yml
@@ -12,8 +12,8 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/arm/lpc24xx/bspncsromext.yml b/spec/build/bsps/arm/lpc24xx/bspncsromext.yml
index 219538f4ba..116aba6983 100644
--- a/spec/build/bsps/arm/lpc24xx/bspncsromext.yml
+++ b/spec/build/bsps/arm/lpc24xx/bspncsromext.yml
@@ -12,8 +12,8 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/arm/lpc24xx/bspncsromint.yml b/spec/build/bsps/arm/lpc24xx/bspncsromint.yml
index ad3066f149..4a1339fc77 100644
--- a/spec/build/bsps/arm/lpc24xx/bspncsromint.yml
+++ b/spec/build/bsps/arm/lpc24xx/bspncsromint.yml
@@ -12,10 +12,10 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: tstncsromint
 - role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/arm/lpc24xx/bspplx800ram.yml b/spec/build/bsps/arm/lpc24xx/bspplx800ram.yml
index 1b67bf9030..4e148a105d 100644
--- a/spec/build/bsps/arm/lpc24xx/bspplx800ram.yml
+++ b/spec/build/bsps/arm/lpc24xx/bspplx800ram.yml
@@ -12,8 +12,8 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/arm/lpc24xx/bspplx800romint.yml b/spec/build/bsps/arm/lpc24xx/bspplx800romint.yml
index d205aca3b3..820998f22a 100644
--- a/spec/build/bsps/arm/lpc24xx/bspplx800romint.yml
+++ b/spec/build/bsps/arm/lpc24xx/bspplx800romint.yml
@@ -12,10 +12,10 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: tstplx800romint
 - role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/arm/lpc32xx/bsplpc32xxmzx.yml b/spec/build/bsps/arm/lpc32xx/bsplpc32xxmzx.yml
index 9a9762dd5d..bb4508602e 100644
--- a/spec/build/bsps/arm/lpc32xx/bsplpc32xxmzx.yml
+++ b/spec/build/bsps/arm/lpc32xx/bsplpc32xxmzx.yml
@@ -12,8 +12,8 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/arm/lpc32xx/bspmzxstage1.yml b/spec/build/bsps/arm/lpc32xx/bspmzxstage1.yml
index 09a70a0654..5b29e05613 100644
--- a/spec/build/bsps/arm/lpc32xx/bspmzxstage1.yml
+++ b/spec/build/bsps/arm/lpc32xx/bspmzxstage1.yml
@@ -12,10 +12,10 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: tstmzxstage1
 - role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/arm/lpc32xx/bspmzxstage2.yml b/spec/build/bsps/arm/lpc32xx/bspmzxstage2.yml
index ff709b0bc3..d65ab60abd 100644
--- a/spec/build/bsps/arm/lpc32xx/bspmzxstage2.yml
+++ b/spec/build/bsps/arm/lpc32xx/bspmzxstage2.yml
@@ -12,8 +12,8 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/arm/lpc32xx/bspphycore.yml b/spec/build/bsps/arm/lpc32xx/bspphycore.yml
index 74396727d6..346a612d16 100644
--- a/spec/build/bsps/arm/lpc32xx/bspphycore.yml
+++ b/spec/build/bsps/arm/lpc32xx/bspphycore.yml
@@ -12,8 +12,8 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/arm/raspberrypi/bspraspberrypi.yml b/spec/build/bsps/arm/raspberrypi/bspraspberrypi.yml
index ceef1d06e0..de0a626105 100644
--- a/spec/build/bsps/arm/raspberrypi/bspraspberrypi.yml
+++ b/spec/build/bsps/arm/raspberrypi/bspraspberrypi.yml
@@ -12,8 +12,8 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/arm/raspberrypi/bspraspberrypi2.yml b/spec/build/bsps/arm/raspberrypi/bspraspberrypi2.yml
index 5f604aa42f..06baf7d9dd 100644
--- a/spec/build/bsps/arm/raspberrypi/bspraspberrypi2.yml
+++ b/spec/build/bsps/arm/raspberrypi/bspraspberrypi2.yml
@@ -12,8 +12,8 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/arm/rtl22xx/bsprtl22xx.yml b/spec/build/bsps/arm/rtl22xx/bsprtl22xx.yml
index 340172deef..ae50b040b5 100644
--- a/spec/build/bsps/arm/rtl22xx/bsprtl22xx.yml
+++ b/spec/build/bsps/arm/rtl22xx/bsprtl22xx.yml
@@ -12,10 +12,10 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: tstrtl22xx
 - role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/arm/rtl22xx/bsprtl22xxt.yml b/spec/build/bsps/arm/rtl22xx/bsprtl22xxt.yml
index ecd5f8baec..6401c72e8c 100644
--- a/spec/build/bsps/arm/rtl22xx/bsprtl22xxt.yml
+++ b/spec/build/bsps/arm/rtl22xx/bsprtl22xxt.yml
@@ -12,10 +12,10 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: tstrtl22xxt
 - role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/arm/stm32f4/bspstm32f105rc.yml b/spec/build/bsps/arm/stm32f4/bspstm32f105rc.yml
index f00a177dc0..46e5b61252 100644
--- a/spec/build/bsps/arm/stm32f4/bspstm32f105rc.yml
+++ b/spec/build/bsps/arm/stm32f4/bspstm32f105rc.yml
@@ -12,10 +12,10 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: tststm32f105rc
 - role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/arm/stm32f4/bspstm32f4.yml b/spec/build/bsps/arm/stm32f4/bspstm32f4.yml
index f3c6426f07..2e85299950 100644
--- a/spec/build/bsps/arm/stm32f4/bspstm32f4.yml
+++ b/spec/build/bsps/arm/stm32f4/bspstm32f4.yml
@@ -12,10 +12,10 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: ../../opto2
 - role: build-dependency
   uid: ../../tstsmallmem
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/arm/tms570/bspls3137hdk.yml b/spec/build/bsps/arm/tms570/bspls3137hdk.yml
index e2704a268d..fea0efe06b 100644
--- a/spec/build/bsps/arm/tms570/bspls3137hdk.yml
+++ b/spec/build/bsps/arm/tms570/bspls3137hdk.yml
@@ -12,10 +12,10 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: ../../opto2
 - role: build-dependency
   uid: ../../tstsmallmem
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/arm/tms570/bspls3137hdkintram.yml b/spec/build/bsps/arm/tms570/bspls3137hdkintram.yml
index 77a21e861b..75adc36eab 100644
--- a/spec/build/bsps/arm/tms570/bspls3137hdkintram.yml
+++ b/spec/build/bsps/arm/tms570/bspls3137hdkintram.yml
@@ -12,10 +12,10 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: tstls3137hdkintram
 - role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/arm/tms570/bspls3137hdksdram.yml b/spec/build/bsps/arm/tms570/bspls3137hdksdram.yml
index 8ffb5294d2..05881eeda2 100644
--- a/spec/build/bsps/arm/tms570/bspls3137hdksdram.yml
+++ b/spec/build/bsps/arm/tms570/bspls3137hdksdram.yml
@@ -12,8 +12,8 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/arm/tms570/bspls3137hdkwithloader.yml b/spec/build/bsps/arm/tms570/bspls3137hdkwithloader.yml
index f8e8cb81bb..bb02657f4a 100644
--- a/spec/build/bsps/arm/tms570/bspls3137hdkwithloader.yml
+++ b/spec/build/bsps/arm/tms570/bspls3137hdkwithloader.yml
@@ -12,10 +12,10 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: ../../opto2
 - role: build-dependency
   uid: ../../tstsmallmem
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/arm/xilinx-zynq/bspqemu.yml b/spec/build/bsps/arm/xilinx-zynq/bspqemu.yml
index a8f59548d9..cf91754f25 100644
--- a/spec/build/bsps/arm/xilinx-zynq/bspqemu.yml
+++ b/spec/build/bsps/arm/xilinx-zynq/bspqemu.yml
@@ -12,8 +12,8 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/arm/xilinx-zynq/bspzc702.yml b/spec/build/bsps/arm/xilinx-zynq/bspzc702.yml
index 683c2c7b8c..c3560dcd7e 100644
--- a/spec/build/bsps/arm/xilinx-zynq/bspzc702.yml
+++ b/spec/build/bsps/arm/xilinx-zynq/bspzc702.yml
@@ -12,8 +12,8 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/arm/xilinx-zynq/bspzc706.yml b/spec/build/bsps/arm/xilinx-zynq/bspzc706.yml
index eca7aaf46c..de7762d057 100644
--- a/spec/build/bsps/arm/xilinx-zynq/bspzc706.yml
+++ b/spec/build/bsps/arm/xilinx-zynq/bspzc706.yml
@@ -12,8 +12,8 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/arm/xilinx-zynq/bspzedboard.yml b/spec/build/bsps/arm/xilinx-zynq/bspzedboard.yml
index ba285c1b80..168f5c7ca2 100644
--- a/spec/build/bsps/arm/xilinx-zynq/bspzedboard.yml
+++ b/spec/build/bsps/arm/xilinx-zynq/bspzedboard.yml
@@ -12,8 +12,8 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/i386/pc386/bsppc386.yml b/spec/build/bsps/i386/pc386/bsppc386.yml
index a221bb5820..b0b9a326ce 100644
--- a/spec/build/bsps/i386/pc386/bsppc386.yml
+++ b/spec/build/bsps/i386/pc386/bsppc386.yml
@@ -12,8 +12,8 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/i386/pc386/bsppc486.yml b/spec/build/bsps/i386/pc386/bsppc486.yml
index 7a14db2f06..b723a33a33 100644
--- a/spec/build/bsps/i386/pc386/bsppc486.yml
+++ b/spec/build/bsps/i386/pc386/bsppc486.yml
@@ -12,8 +12,8 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/i386/pc386/bsppc586.yml b/spec/build/bsps/i386/pc386/bsppc586.yml
index 5c73a6368b..7eb21fd9e9 100644
--- a/spec/build/bsps/i386/pc386/bsppc586.yml
+++ b/spec/build/bsps/i386/pc386/bsppc586.yml
@@ -12,8 +12,8 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/i386/pc386/bsppc586sse.yml b/spec/build/bsps/i386/pc386/bsppc586sse.yml
index 5af45aba6d..745220f8ab 100644
--- a/spec/build/bsps/i386/pc386/bsppc586sse.yml
+++ b/spec/build/bsps/i386/pc386/bsppc586sse.yml
@@ -12,8 +12,8 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/i386/pc386/bsppc686.yml b/spec/build/bsps/i386/pc386/bsppc686.yml
index 4f491b47d4..c4898eac00 100644
--- a/spec/build/bsps/i386/pc386/bsppc686.yml
+++ b/spec/build/bsps/i386/pc386/bsppc686.yml
@@ -12,8 +12,8 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/i386/pc386/bsppcp4.yml b/spec/build/bsps/i386/pc386/bsppcp4.yml
index 41329d7930..90996423e2 100644
--- a/spec/build/bsps/i386/pc386/bsppcp4.yml
+++ b/spec/build/bsps/i386/pc386/bsppcp4.yml
@@ -12,8 +12,8 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/lm32/lm32_evr/bspgdbsim.yml b/spec/build/bsps/lm32/lm32_evr/bspgdbsim.yml
index 8c9c736d8f..e6e9d45afe 100644
--- a/spec/build/bsps/lm32/lm32_evr/bspgdbsim.yml
+++ b/spec/build/bsps/lm32/lm32_evr/bspgdbsim.yml
@@ -12,10 +12,10 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: ../../opto2
 - role: build-dependency
   uid: ../../tstnointrcrit
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/lm32/lm32_evr/bsplm32evr.yml b/spec/build/bsps/lm32/lm32_evr/bsplm32evr.yml
index f3576154ca..dd61eb94d3 100644
--- a/spec/build/bsps/lm32/lm32_evr/bsplm32evr.yml
+++ b/spec/build/bsps/lm32/lm32_evr/bsplm32evr.yml
@@ -12,8 +12,8 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/m68k/gen68360/bspgen68360.yml b/spec/build/bsps/m68k/gen68360/bspgen68360.yml
index 3fe72993b3..53644255ab 100644
--- a/spec/build/bsps/m68k/gen68360/bspgen68360.yml
+++ b/spec/build/bsps/m68k/gen68360/bspgen68360.yml
@@ -12,8 +12,8 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/m68k/gen68360/bspgen68360040.yml b/spec/build/bsps/m68k/gen68360/bspgen68360040.yml
index 24c1d855a5..f6af2c6302 100644
--- a/spec/build/bsps/m68k/gen68360/bspgen68360040.yml
+++ b/spec/build/bsps/m68k/gen68360/bspgen68360040.yml
@@ -12,8 +12,8 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/m68k/gen68360/bsppgh360.yml b/spec/build/bsps/m68k/gen68360/bsppgh360.yml
index 2a8f2f2131..e51fb0b10f 100644
--- a/spec/build/bsps/m68k/gen68360/bsppgh360.yml
+++ b/spec/build/bsps/m68k/gen68360/bsppgh360.yml
@@ -12,8 +12,8 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/m68k/genmcf548x/bspcobra5475.yml b/spec/build/bsps/m68k/genmcf548x/bspcobra5475.yml
index 481c2edbe5..1e5c238a1d 100644
--- a/spec/build/bsps/m68k/genmcf548x/bspcobra5475.yml
+++ b/spec/build/bsps/m68k/genmcf548x/bspcobra5475.yml
@@ -12,8 +12,8 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/m68k/genmcf548x/bspm5484fireengine.yml b/spec/build/bsps/m68k/genmcf548x/bspm5484fireengine.yml
index 51d434bd02..8011a1ad45 100644
--- a/spec/build/bsps/m68k/genmcf548x/bspm5484fireengine.yml
+++ b/spec/build/bsps/m68k/genmcf548x/bspm5484fireengine.yml
@@ -12,8 +12,8 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/m68k/mvme162/bspmvme162.yml b/spec/build/bsps/m68k/mvme162/bspmvme162.yml
index 5d5f0d3911..4fe6b72747 100644
--- a/spec/build/bsps/m68k/mvme162/bspmvme162.yml
+++ b/spec/build/bsps/m68k/mvme162/bspmvme162.yml
@@ -12,10 +12,10 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: tstmvme162
 - role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/m68k/mvme162/bspmvme162lx.yml b/spec/build/bsps/m68k/mvme162/bspmvme162lx.yml
index bcd810eb69..8d64735794 100644
--- a/spec/build/bsps/m68k/mvme162/bspmvme162lx.yml
+++ b/spec/build/bsps/m68k/mvme162/bspmvme162lx.yml
@@ -12,10 +12,10 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: tstmvme162lx
 - role: build-dependency
   uid: ../../opto2
+- role: build-dependency
+  uid: grp
 source: []
 type: build
diff --git a/spec/build/bsps/microblaze/microblaze_fpga/bspkcu105.yml b/spec/build/bsps/microblaze/microblaze_fpga/bspkcu105.yml
index 0a29e9c200..c31ca37e9b 100644
--- a/spec/build/bsps/microblaze/microblaze_fpga/bspkcu105.yml
+++ b/spec/build/bsps/microblaze/microblaze_fpga/bspkcu105.yml
@@ -12,13 +12,13 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: linkcmds
 - role: build-dependency
   uid: tstkcu105_qemu
 - role: build-dependency
   uid: ../../opto0
+- role: build-dependency
+  uid: grp
 source:
 - bsps/shared/start/bspreset-loop.c
 type: build
diff --git a/spec/build/bsps/microblaze/microblaze_fpga/bspkcu105_qemu.yml b/spec/build/bsps/microblaze/microblaze_fpga/bspkcu105_qemu.yml
index 9f5d742885..39a5ca35d1 100644
--- a/spec/build/bsps/microblaze/microblaze_fpga/bspkcu105_qemu.yml
+++ b/spec/build/bsps/microblaze/microblaze_fpga/bspkcu105_qemu.yml
@@ -12,13 +12,13 @@ includes: []
 install: []
 links:
 - role: build-dependency
-  uid: grp
-- role: build-dependency
   uid: linkcmds
 - role: build-dependency
   uid: tstkcu105_qemu
 - role: build-dependency
   uid: ../../opto0
+- role: build-dependency
+  uid: grp
 source:
 - bsps/microblaze/microblaze_fpga/start/bspreset.c
 type: build