diff options
| author | Kinsey Moore <kinsey.moore@oarcorp.com> | 2023-02-06 14:56:19 -0600 |
|---|---|---|
| committer | Joel Sherrill <joel@rtems.org> | 2023-02-06 17:33:13 -0600 |
| commit | a932d5d6e1e53b5696bff86baf0e8e7424bdcdbb (patch) | |
| tree | b5e6fd2a4e561ead75ef724f9d41e9c8ab026512 | |
| parent | bsps/microblaze: Add device tree support to UART Lite (diff) | |
| download | rtems-a932d5d6e1e53b5696bff86baf0e8e7424bdcdbb.tar.bz2 | |
spec/bsps: Deduplicate objxilinxsupport
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.
| -rw-r--r-- | spec/build/bsps/aarch64/xilinx-zynqmp/grp.yml | 2 | ||||
| -rw-r--r-- | spec/build/bsps/objnandpsu.yml | 4 | ||||
| -rw-r--r-- | 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 @@ -53,6 +53,8 @@ links: - role: build-dependency uid: ../../objmem - role: build-dependency + uid: ../../objxilinxsupport +- role: build-dependency uid: ../../optcachedata - role: build-dependency uid: ../../optcacheinst 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 @@ -20,8 +20,6 @@ install: - bsps/include/dev/spi/xqspipsu.h links: - role: build-dependency - uid: objxilinxsupport -- role: build-dependency uid: optxpssysctrlbaseaddress source: - bsps/shared/dev/spi/xqspipsu_control.c |