The objxilinxsupport build object was accidentally included twice in some of the ZynqMP BSPs by two different drivers that required it. This commit manually deduplicates the inclusions by moving that inclusion to the BSP. Duplication of object inclusions is considered a bug and can cause race conditions in the build system. --- spec/build/bsps/aarch64/xilinx-zynqmp/grp.yml | 2 ++ spec/build/bsps/objnandpsu.yml | 4 +--- spec/build/bsps/objqspipsu.yml | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/spec/build/bsps/aarch64/xilinx-zynqmp/grp.yml b/spec/build/bsps/aarch64/xilinx-zynqmp/grp.yml index f0c3a13ffd..a00490a826 100644 --- a/spec/build/bsps/aarch64/xilinx-zynqmp/grp.yml +++ b/spec/build/bsps/aarch64/xilinx-zynqmp/grp.yml @@ -52,6 +52,8 @@ links: uid: ../../objdevspixil - role: build-dependency uid: ../../objmem +- role: build-dependency + uid: ../../objxilinxsupport - role: build-dependency uid: ../../optcachedata - role: build-dependency diff --git a/spec/build/bsps/objnandpsu.yml b/spec/build/bsps/objnandpsu.yml index a0ff1b0b9e..253c598e8c 100644 --- a/spec/build/bsps/objnandpsu.yml +++ b/spec/build/bsps/objnandpsu.yml @@ -17,9 +17,7 @@ install: - bsps/include/dev/nand/xnandpsu.h - bsps/include/dev/nand/xnandpsu_hw.h - bsps/include/dev/nand/xnandpsu_onfi.h -links: -- role: build-dependency - uid: objxilinxsupport +links: [] source: - bsps/shared/dev/nand/xnandpsu_bbm.c - bsps/shared/dev/nand/xnandpsu.c diff --git a/spec/build/bsps/objqspipsu.yml b/spec/build/bsps/objqspipsu.yml index 5f8679c83c..205172146e 100644 --- a/spec/build/bsps/objqspipsu.yml +++ b/spec/build/bsps/objqspipsu.yml @@ -19,8 +19,6 @@ install: - bsps/include/dev/spi/xqspipsu-flash-helper.h - bsps/include/dev/spi/xqspipsu.h links: -- role: build-dependency - uid: objxilinxsupport - role: build-dependency uid: optxpssysctrlbaseaddress source: -- 2.30.2 _______________________________________________ devel mailing list devel@rtems.org http://lists.rtems.org/mailman/listinfo/devel
