[rtems commit] bsps/microblaze: Fix build option definition order

Joel Sherrill joel at rtems.org
Mon Jul 25 13:54:03 UTC 2022


Module:    rtems
Branch:    master
Commit:    c0a4d56b16e5baa278ada1a923db7806c510e733
Changeset: http://git.rtems.org/rtems/commit/?id=c0a4d56b16e5baa278ada1a923db7806c510e733

Author:    Alex White <alex.white at oarcorp.com>
Date:      Thu Jul  7 14:17:15 2022 -0500

bsps/microblaze: Fix build option definition order

The build option definitions were rearranged such that the option
definitions used in the linker script were not available. This caused
linker errors when building.

---

 spec/build/bsps/microblaze/microblaze_fpga/bspkcu105.yml      | 2 --
 spec/build/bsps/microblaze/microblaze_fpga/bspkcu105_qemu.yml | 2 --
 spec/build/bsps/microblaze/microblaze_fpga/grp.yml            | 2 ++
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/spec/build/bsps/microblaze/microblaze_fpga/bspkcu105.yml b/spec/build/bsps/microblaze/microblaze_fpga/bspkcu105.yml
index c31ca37e9b..9ec29f49f6 100644
--- a/spec/build/bsps/microblaze/microblaze_fpga/bspkcu105.yml
+++ b/spec/build/bsps/microblaze/microblaze_fpga/bspkcu105.yml
@@ -11,8 +11,6 @@ family: microblaze_fpga
 includes: []
 install: []
 links:
-- role: build-dependency
-  uid: linkcmds
 - role: build-dependency
   uid: tstkcu105_qemu
 - role: build-dependency
diff --git a/spec/build/bsps/microblaze/microblaze_fpga/bspkcu105_qemu.yml b/spec/build/bsps/microblaze/microblaze_fpga/bspkcu105_qemu.yml
index 39a5ca35d1..9a1147297a 100644
--- a/spec/build/bsps/microblaze/microblaze_fpga/bspkcu105_qemu.yml
+++ b/spec/build/bsps/microblaze/microblaze_fpga/bspkcu105_qemu.yml
@@ -11,8 +11,6 @@ family: microblaze_fpga
 includes: []
 install: []
 links:
-- role: build-dependency
-  uid: linkcmds
 - role: build-dependency
   uid: tstkcu105_qemu
 - role: build-dependency
diff --git a/spec/build/bsps/microblaze/microblaze_fpga/grp.yml b/spec/build/bsps/microblaze/microblaze_fpga/grp.yml
index 055b6850c8..c196a74e43 100644
--- a/spec/build/bsps/microblaze/microblaze_fpga/grp.yml
+++ b/spec/build/bsps/microblaze/microblaze_fpga/grp.yml
@@ -56,6 +56,8 @@ links:
   uid: ../../objirq
 - role: build-dependency
   uid: ../../objmem
+- role: build-dependency
+  uid: linkcmds
 - role: build-dependency
   uid: ../../bspopts
 type: build



More information about the vc mailing list