diff options
16 files changed, 148 insertions, 198 deletions
diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf index 603db4c1..5f2b17b7 100644 --- a/meta-xilinx-core/conf/layer.conf +++ b/meta-xilinx-core/conf/layer.conf | |||
@@ -64,11 +64,11 @@ XILINX_ATF_VERSION[v2023.2] = "2.8-xilinx-v2023.2%" | |||
64 | XILINX_ATF_VERSION[v2024.1] = "2.10-xilinx-v2024.1%" | 64 | XILINX_ATF_VERSION[v2024.1] = "2.10-xilinx-v2024.1%" |
65 | PREFERRED_VERSION_arm-trusted-firmware ?= "${@d.getVarFlag('XILINX_ATF_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" | 65 | PREFERRED_VERSION_arm-trusted-firmware ?= "${@d.getVarFlag('XILINX_ATF_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" |
66 | 66 | ||
67 | XILINX_UBOOT_VERSION[v2022.1] = "v2021.01-xilinx-v2022.1%" | 67 | XILINX_UBOOT_VERSION[v2022.1] = "1:v2021.01-xilinx-v2022.1%" |
68 | XILINX_UBOOT_VERSION[v2022.2] = "v2022.01-xilinx-v2022.2%" | 68 | XILINX_UBOOT_VERSION[v2022.2] = "1:v2022.01-xilinx-v2022.2%" |
69 | XILINX_UBOOT_VERSION[v2023.1] = "v2023.01-xilinx-v2023.1%" | 69 | XILINX_UBOOT_VERSION[v2023.1] = "1:v2023.01-xilinx-v2023.1%" |
70 | XILINX_UBOOT_VERSION[v2023.2] = "v2023.01-xilinx-v2023.2%" | 70 | XILINX_UBOOT_VERSION[v2023.2] = "1:v2023.01-xilinx-v2023.2%" |
71 | XILINX_UBOOT_VERSION[v2024.1] = "v2024.01-xilinx-v2024.1%" | 71 | XILINX_UBOOT_VERSION[v2024.1] = "1:v2024.01-xilinx-v2024.1%" |
72 | 72 | ||
73 | PREFERRED_VERSION_u-boot-xlnx ?= "${@d.getVarFlag('XILINX_UBOOT_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" | 73 | PREFERRED_VERSION_u-boot-xlnx ?= "${@d.getVarFlag('XILINX_UBOOT_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" |
74 | PREFERRED_VERSION_u-boot-tools-xlnx ?= "${@d.getVarFlag('XILINX_UBOOT_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" | 74 | PREFERRED_VERSION_u-boot-tools-xlnx ?= "${@d.getVarFlag('XILINX_UBOOT_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}" |
diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/libmetal/libmetal-xlnx_v2023.1.bb b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/libmetal/libmetal-xlnx_v2023.1.bb deleted file mode 100644 index 30ca3501..00000000 --- a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/libmetal/libmetal-xlnx_v2023.1.bb +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | SRCBRANCH ?= "2023.1" | ||
2 | SRCREV = "be635252271de342014a146825870b64bd41d6eb" | ||
3 | BRANCH = "xlnx_rel_v2023.1" | ||
4 | LIC_FILES_CHKSUM ?= "file://LICENSE.md;md5=f4d5df0f12dcea1b1a0124219c0dbab4" | ||
5 | PV = "${SRCBRANCH}+git${SRCPV}" | ||
6 | |||
7 | REPO = "git://github.com/Xilinx/libmetal.git;protocol=https" | ||
8 | |||
9 | include ${LAYER_PATH_openamp-layer}/recipes-openamp/libmetal/libmetal.inc | ||
10 | |||
11 | RPROVIDES:${PN}-dbg += "libmetal-dbg" | ||
12 | RPROVIDES:${PN}-dev += "libmetal-dev" | ||
13 | RPROVIDES:${PN}-lic += "libmetal-lic" | ||
14 | RPROVIDES:${PN}-src += "libmetal-src" | ||
15 | RPROVIDES:${PN}-staticdev += "libmetal-staticdev" | ||
diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/libmetal/libmetal-xlnx_v2023.2.bb b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/libmetal/libmetal-xlnx_v2023.2.bb deleted file mode 100644 index 5618ae88..00000000 --- a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/libmetal/libmetal-xlnx_v2023.2.bb +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | SRCBRANCH ?= "2023.2" | ||
2 | SRCREV = "00fd771adc7adaed664ed6c5bc3d48d25856fe5c" | ||
3 | BRANCH = "xlnx_rel_v2023.2" | ||
4 | LIC_FILES_CHKSUM ?= "file://LICENSE.md;md5=f4d5df0f12dcea1b1a0124219c0dbab4" | ||
5 | PV = "${SRCBRANCH}+git${SRCPV}" | ||
6 | |||
7 | REPO = "git://github.com/Xilinx/libmetal.git;protocol=https" | ||
8 | |||
9 | include ${LAYER_PATH_openamp-layer}/recipes-openamp/libmetal/libmetal.inc | ||
10 | |||
11 | RPROVIDES:${PN}-dbg += "libmetal-dbg" | ||
12 | RPROVIDES:${PN}-dev += "libmetal-dev" | ||
13 | RPROVIDES:${PN}-lic += "libmetal-lic" | ||
14 | RPROVIDES:${PN}-src += "libmetal-src" | ||
15 | RPROVIDES:${PN}-staticdev += "libmetal-staticdev" | ||
diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/open-amp/open-amp-xlnx_v2023.1.bb b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/open-amp/open-amp-xlnx_v2023.1.bb deleted file mode 100644 index e295b869..00000000 --- a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/open-amp/open-amp-xlnx_v2023.1.bb +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | SRCBRANCH ?= "2023.1" | ||
2 | SRCREV = "c8aaf2f26d5493f492f0af09dd558d45908636da" | ||
3 | BRANCH = "xlnx_rel_v2023.1" | ||
4 | LIC_FILES_CHKSUM ?= "file://LICENSE.md;md5=ab88daf995c0bd0071c2e1e55f3d3505" | ||
5 | PV = "${SRCBRANCH}+git${SRCPV}" | ||
6 | REPO = "git://github.com/Xilinx/open-amp.git;protocol=https" | ||
7 | |||
8 | include ${LAYER_PATH_openamp-layer}/recipes-openamp/open-amp/open-amp.inc | ||
9 | require ${LAYER_PATH_openamp-layer}/vendor/xilinx/recipes-openamp/open-amp/open-amp-xlnx.inc | ||
10 | |||
11 | RPROVIDES:${PN}-dbg += "open-amp-dbg" | ||
12 | RPROVIDES:${PN}-dev += "open-amp-dev" | ||
13 | RPROVIDES:${PN}-lic += "open-amp-lic" | ||
14 | RPROVIDES:${PN}-src += "open-amp-src" | ||
15 | RPROVIDES:${PN}-staticdev += "open-amp-staticdev" | ||
16 | |||
diff --git a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/open-amp/open-amp-xlnx_v2023.2.bb b/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/open-amp/open-amp-xlnx_v2023.2.bb deleted file mode 100644 index 8c6b4431..00000000 --- a/meta-xilinx-core/dynamic-layers/openamp-layer/recipes-openamp/open-amp/open-amp-xlnx_v2023.2.bb +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | SRCBRANCH ?= "2023.2" | ||
2 | SRCREV = "73a546f2b5faffe71680b1e5389f3328be60773f" | ||
3 | BRANCH = "xlnx_rel_v2023.2" | ||
4 | LIC_FILES_CHKSUM ?= "file://LICENSE.md;md5=ab88daf995c0bd0071c2e1e55f3d3505" | ||
5 | PV = "${SRCBRANCH}+git${SRCPV}" | ||
6 | REPO = "git://github.com/Xilinx/open-amp.git;protocol=https" | ||
7 | |||
8 | include ${LAYER_PATH_openamp-layer}/recipes-openamp/open-amp/open-amp.inc | ||
9 | require ${LAYER_PATH_openamp-layer}/vendor/xilinx/recipes-openamp/open-amp/open-amp-xlnx.inc | ||
10 | |||
11 | RPROVIDES:${PN}-dbg += "open-amp-dbg" | ||
12 | RPROVIDES:${PN}-dev += "open-amp-dev" | ||
13 | RPROVIDES:${PN}-lic += "open-amp-lic" | ||
14 | RPROVIDES:${PN}-src += "open-amp-src" | ||
15 | RPROVIDES:${PN}-staticdev += "open-amp-staticdev" | ||
16 | |||
diff --git a/meta-xilinx-core/recipes-apps/image-update/image-update_1.0.bb b/meta-xilinx-core/recipes-apps/image-update/image-update_1.0.bb deleted file mode 100644 index 8a707df4..00000000 --- a/meta-xilinx-core/recipes-apps/image-update/image-update_1.0.bb +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | DESCRIPTION = "Image update is used to update alternate images on compatible firmware." | ||
2 | SUMMARY = "Image update is used to update alternate image on compatible firmware. \ | ||
3 | If the current image is ImageA, ImageB will get updated and vice versa. \ | ||
4 | Usage: image_update <Input Image File>" | ||
5 | |||
6 | LICENSE = "MIT" | ||
7 | LIC_FILES_CHKSUM = "file://${WORKDIR}/git/LICENSES/MIT;md5=2ac09a7a37dd6ee0ba23ce497d57d09b" | ||
8 | |||
9 | BRANCH = "xlnx_rel_v2023.2" | ||
10 | SRC_URI = "git://github.com/Xilinx/linux-image_update.git;branch=${BRANCH};protocol=https" | ||
11 | SRCREV = "4f0b7b1b20933ddc454124fc3472f1b8894ddf08" | ||
12 | |||
13 | RDEPENDS:${PN} += "freeipmi" | ||
14 | |||
15 | S = "${WORKDIR}/git" | ||
16 | |||
17 | COMPATIBLE_MACHINE = "^$" | ||
18 | COMPATIBLE_MACHINE:zynqmp = "zynqmp" | ||
19 | |||
20 | PACKAGE_ARCH:zynqmp = "${SOC_FAMILY_ARCH}" | ||
21 | |||
22 | # Force the make system to use the flags we want! | ||
23 | EXTRA_OEMAKE = 'CC="${CC} ${TARGET_CFLAGS} ${TARGET_LDFLAGS}" all' | ||
24 | |||
25 | do_install () { | ||
26 | install -d ${D}${bindir} | ||
27 | install -m 0755 ${S}/image_update ${D}${bindir}/ | ||
28 | } | ||
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2022.2.bb b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2022.2.bb index 44636872..6b033f0f 100644 --- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2022.2.bb +++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-tools-xlnx_2022.2.bb | |||
@@ -19,3 +19,20 @@ do_compile () { | |||
19 | oe_runmake -C ${S} cross_tools NO_SDL=1 O=${B} | 19 | oe_runmake -C ${S} cross_tools NO_SDL=1 O=${B} |
20 | } | 20 | } |
21 | 21 | ||
22 | # mkeficapsule is not available in this version of u-boot | ||
23 | PROVIDES:remove = "${MLPREFIX}u-boot-mkeficapsule" | ||
24 | PROVIDES:class-native:remove = "u-boot-mkeficapsule-native" | ||
25 | PACKAGES:remove = "${PN}-mkeficapsule" | ||
26 | RDEPENDS:${PN}:remove = "${PN}-mkeficapsule" | ||
27 | |||
28 | do_install:prepend() { | ||
29 | # Avoid do_install failure | ||
30 | mkdir -p tools | ||
31 | touch tools/mkeficapsule | ||
32 | } | ||
33 | |||
34 | do_install:append() { | ||
35 | # Avoid failure | ||
36 | rm -rf ${D}${bindir}/uboot-mkeficapsule | ||
37 | rm -rf ${D}${bindir}/mkeficapsule | ||
38 | } | ||
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2022.01/microblaze-generic-top.h b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2022.01/microblaze-generic-top.h new file mode 100644 index 00000000..08c1c16c --- /dev/null +++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2022.01/microblaze-generic-top.h | |||
@@ -0,0 +1,10 @@ | |||
1 | /* | ||
2 | * This file is use for addition u-boot configurations for microblaze. | ||
3 | */ | ||
4 | #include <configs/microblaze-generic.h> | ||
5 | |||
6 | /* Core microblaze boot configurations */ | ||
7 | #define XILINX_USE_DCACHE 1 | ||
8 | #define CONFIG_CMD_IRQ | ||
9 | #define CONFIG_DCACHE | ||
10 | #define CONFIG_ICACHE \ No newline at end of file | ||
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2022.01/microblaze-generic.cfg b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2022.01/microblaze-generic.cfg new file mode 100644 index 00000000..0f784f73 --- /dev/null +++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-v2022.01/microblaze-generic.cfg | |||
@@ -0,0 +1,81 @@ | |||
1 | # SPDX-License-Identifier: MIT | ||
2 | |||
3 | #........................................................................ | ||
4 | # WARNING | ||
5 | # | ||
6 | # This file is a u-boot configuration fragment, and not a full u-boot | ||
7 | # configuration file. The final u-boot configuration is made up of | ||
8 | # an assembly of processed fragments, each of which is designed to | ||
9 | # capture a specific part of the final configuration (e.g. platform | ||
10 | # configuration, feature configuration, and board specific hardware | ||
11 | # configuration). For more information on u-boot configuration, please | ||
12 | # refer the product documentation. | ||
13 | # | ||
14 | #....................................................................... | ||
15 | |||
16 | # | ||
17 | # Definitions for Generic Microbalze machine. | ||
18 | # | ||
19 | CONFIG_BOOTDELAY=4 | ||
20 | CONFIG_SYS_TEXT_BASE=0x80100000 | ||
21 | CONFIG_SYS_PROMPT="U-Boot>" | ||
22 | CONFIG_SYS_CONFIG_NAME="microblaze-generic-top" | ||
23 | CONFIG_BOOT_SCRIPT_OFFSET=0x1F00000 | ||
24 | # CONFIG_SYS_NS16550 is not set | ||
25 | # CONFIG_SYS_FLASH_USE_BUFFER_WRITE is not set | ||
26 | # CONFIG_SYS_FLASH_CFI is not set | ||
27 | # CONFIG_FLASH_CFI_DRIVER is not set | ||
28 | # CONFIG_CMD_FLASH is not set | ||
29 | # CONFIG_CMD_IMLS is not set | ||
30 | # CONFIG_MTD_NOR_FLASH is not set | ||
31 | # CONFIG_MTD_DEVICE is not set | ||
32 | # CONFIG_SYS_FLASH_PROTECTION is not set | ||
33 | # CONFIG_SPI_FLASH_SST is not set | ||
34 | # CONFIG_XILINX_EMACLITE is not set | ||
35 | # CONFIG_PHY_VITESSE is not set | ||
36 | # CONFIG_CMD_EXT2 is not set | ||
37 | # CONFIG_CMD_EXT4 is not set | ||
38 | # CONFIG_CMD_EXT4_WRITE is not set | ||
39 | # CONFIG_CMD_FAT is not set | ||
40 | # CONFIG_DOS_PARTITION is not set | ||
41 | # CONFIG_FAT_WRITE is not set | ||
42 | CONFIG_DM=y | ||
43 | CONFIG_SYS_MALLOC_F=y | ||
44 | CONFIG_XILINX_UARTLITE=y | ||
45 | CONFIG_XILINX_AXIEMAC=y | ||
46 | CONFIG_PHY_XILINX=y | ||
47 | CONFIG_PHY_TI=y | ||
48 | CONFIG_NET=y | ||
49 | CONFIG_PHY_GIGE=y | ||
50 | CONFIG_NETDEVICES=y | ||
51 | CONFIG_CMD_NET=y | ||
52 | CONFIG_DM_ETH=y | ||
53 | CONFIG_CMD_PING=y | ||
54 | CONFIG_CMD_DHCP=y | ||
55 | CONFIG_PHYLIB=y | ||
56 | CONFIG_CMD_TFTPPUT=y | ||
57 | CONFIG_CMD_NFS=y | ||
58 | CONFIG_CMD_MII=y | ||
59 | CONFIG_PHY_MARVELL=y | ||
60 | CONFIG_PHY_REALTEK=y | ||
61 | CONFIG_PHY_NATSEMI=y | ||
62 | CONFIG_XILINX_SPI=y | ||
63 | CONFIG_CMD_SPI=y | ||
64 | CONFIG_CMD_SF=y | ||
65 | CONFIG_SPI_FLASH=y | ||
66 | CONFIG_SPI_FLASH_BAR=y | ||
67 | CONFIG_DM_SPI_FLASH=y | ||
68 | CONFIG_DM_SPI=y | ||
69 | CONFIG_SPI_FLASH_SPANSION=y | ||
70 | CONFIG_SPI_FLASH_STMICRO=y | ||
71 | CONFIG_SPI_FLASH_WINBOND=y | ||
72 | CONFIG_SPI_FLASH_MACRONIX=y | ||
73 | CONFIG_SPI=y | ||
74 | CONFIG_SPI_FLASH_ISSI=y | ||
75 | # CONFIG_BOOTARGS is not set | ||
76 | # CONFIG_USE_BOOTARGS is not set | ||
77 | # CONFIG_SPL is not set | ||
78 | # CONFIG_I2C_EEPROM is not set | ||
79 | # CONFIG_CMD_EEPROM is not set | ||
80 | # CONFIG_SYS_I2C_EEPROM_ADDR is not set | ||
81 | # CONFIG_SYS_I2C_EEPROM_ADDR_OVERFLOW is not set | ||
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2022.2.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2022.2.inc index 6415861d..f9b8f52b 100644 --- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2022.2.inc +++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2022.2.inc | |||
@@ -1,4 +1,4 @@ | |||
1 | UBOOT_VERSION = "v2021.01" | 1 | UBOOT_VERSION = "v2022.01" |
2 | 2 | ||
3 | UBRANCH ?= "xlnx_rebase_v2022.01" | 3 | UBRANCH ?= "xlnx_rebase_v2022.01" |
4 | 4 | ||
diff --git a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.2.inc b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.2.inc index 33b302e9..2e761ebe 100644 --- a/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.2.inc +++ b/meta-xilinx-core/recipes-bsp/u-boot/u-boot-xlnx-2023.2.inc | |||
@@ -2,7 +2,7 @@ UBOOT_VERSION = "v2023.01" | |||
2 | 2 | ||
3 | UBRANCH = "xlnx_rebase_v2023.01" | 3 | UBRANCH = "xlnx_rebase_v2023.01" |
4 | 4 | ||
5 | SRCREV = "4da834fc7644b4124f7417e0e2789c7afcb40352" | 5 | SRCREV = "2b54ad6f1d278c419b927d10db2edf323d844578" |
6 | 6 | ||
7 | LICENSE = "GPL-2.0-or-later" | 7 | LICENSE = "GPL-2.0-or-later" |
8 | LIC_FILES_CHKSUM = "file://README;beginline=1;endline=4;md5=744e7e3bb0c94b4b9f6b3db3bf893897" | 8 | LIC_FILES_CHKSUM = "file://README;beginline=1;endline=4;md5=744e7e3bb0c94b4b9f6b3db3bf893897" |
diff --git a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali_2022.1.bb b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali_2022.1.bb index e8e46543..56431a7f 100644 --- a/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali_2022.1.bb +++ b/meta-xilinx-core/recipes-graphics/mali/kernel-module-mali_2022.1.bb | |||
@@ -31,6 +31,10 @@ SRC_URI = " \ | |||
31 | file://0021-Use-updated-timekeeping-functions-in-kernel-5.6.patch \ | 31 | file://0021-Use-updated-timekeeping-functions-in-kernel-5.6.patch \ |
32 | file://0022-Set-HAVE_UNLOCKED_IOCTL-default-to-true.patch \ | 32 | file://0022-Set-HAVE_UNLOCKED_IOCTL-default-to-true.patch \ |
33 | file://0023-Use-PTR_ERR_OR_ZERO-instead-of-PTR_RET.patch \ | 33 | file://0023-Use-PTR_ERR_OR_ZERO-instead-of-PTR_RET.patch \ |
34 | file://0024-Use-community-device-tree-names.patch \ | ||
35 | file://0025-Import-DMA_BUF-module-and-update-register_shrinker-f.patch \ | ||
36 | file://0026-Fix-gpu-driver-probe-failure.patch \ | ||
37 | file://0027-Updated-clock-name-and-structure-to-match-LIMA-drive.patch \ | ||
34 | " | 38 | " |
35 | SRC_URI[md5sum] = "85ea110dd6675c70b7d01af87ec9633c" | 39 | SRC_URI[md5sum] = "85ea110dd6675c70b7d01af87ec9633c" |
36 | SRC_URI[sha256sum] = "7a67127341d17640c1fff5dad80258fb2a37c8a2121b81525fe2327e4532ce2b" | 40 | SRC_URI[sha256sum] = "7a67127341d17640c1fff5dad80258fb2a37c8a2121b81525fe2327e4532ce2b" |
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_202320.2.16.0.bb b/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_202320.2.16.0.bb new file mode 100644 index 00000000..6cf10817 --- /dev/null +++ b/meta-xilinx-core/recipes-xrt/xrt/xclbinutil-native_202320.2.16.0.bb | |||
@@ -0,0 +1,29 @@ | |||
1 | SUMMARY = "Xilinx Runtime(XRT) - minimal native build for xclbinutil" | ||
2 | DESCRIPTION = "Native build of xclbinutil using XRT codebase" | ||
3 | |||
4 | require xrt-202320.2.16.0.inc | ||
5 | |||
6 | FILESEXTRAPATHS:append := ":${THISDIR}/xrt" | ||
7 | |||
8 | LICENSE = "GPL-2.0-or-later & Apache-2.0 & MIT" | ||
9 | LIC_FILES_CHKSUM = " \ | ||
10 | file://../LICENSE;md5=de2c993ac479f02575bcbfb14ef9b485 \ | ||
11 | file://runtime_src/core/edge/drm/zocl/LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8 \ | ||
12 | file://runtime_src/core/pcie/driver/linux/xocl/LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | ||
13 | file://runtime_src/core/pcie/linux/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ | ||
14 | file://runtime_src/core/tools/xbutil2/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ | ||
15 | file://runtime_src/core/common/elf/LICENSE.txt;md5=b996e8b74af169e7e72e22d9e7d05b06 \ | ||
16 | " | ||
17 | |||
18 | S = "${WORKDIR}/git/src" | ||
19 | |||
20 | inherit cmake pkgconfig native | ||
21 | |||
22 | DEPENDS = "libdrm-native ocl-icd-native boost-native rapidjson-native protobuf-native python3-pybind11-native systemtap-native" | ||
23 | |||
24 | EXTRA_OECMAKE += " -DCMAKE_BUILD_TYPE=Release -DCMAKE_EXPORT_COMPILE_COMANDS=ON" | ||
25 | |||
26 | do_install() { | ||
27 | install -d ${D}${bindir} | ||
28 | install -Dm 0755 ${WORKDIR}/build/runtime_src/tools/xclbinutil/xclbinutil ${D}${bindir} | ||
29 | } | ||
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt.inc b/meta-xilinx-core/recipes-xrt/xrt/xrt.inc deleted file mode 100644 index 14b2b968..00000000 --- a/meta-xilinx-core/recipes-xrt/xrt/xrt.inc +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | REPO ?= "git://github.com/Xilinx/XRT.git;protocol=https" | ||
2 | BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" | ||
3 | SRC_URI = "${REPO};${BRANCHARG};name=xrt" | ||
4 | |||
5 | BRANCH= "2023.2" | ||
6 | SRCREV_xrt = "2865a62b6a417dea523d2d5646154aa94a2cbc28" | ||
7 | PV = "202320.2.16.0" | ||
8 | |||
9 | SRC_URI += "git://github.com/Xilinx/dma_ip_drivers.git;branch=master;name=dma_ip_drivers;destsuffix=git/src/runtime_src/core/pcie/driver/linux/xocl/lib/libqdma;protocol=https" | ||
10 | SRCREV_dma_ip_drivers = "9f02769a2eddde008158c96efa39d7edb6512578" | ||
11 | |||
12 | SRC_URI += "git://github.com/serge1/ELFIO.git;branch=main;name=ELFIO;destsuffix=git/src/runtime_src/core/common/elf;protocol=https" | ||
13 | SRCREV_ELFIO = "a04810f12625207cce72665d783babb80f0175a8" | ||
14 | SRCREV_FORMAT = "xrt" | ||
diff --git a/meta-xilinx-core/recipes-xrt/xrt/xrt_git.bb b/meta-xilinx-core/recipes-xrt/xrt/xrt_git.bb deleted file mode 100644 index ef3c7172..00000000 --- a/meta-xilinx-core/recipes-xrt/xrt/xrt_git.bb +++ /dev/null | |||
@@ -1,62 +0,0 @@ | |||
1 | SUMMARY = "Xilinx Runtime(XRT) libraries" | ||
2 | DESCRIPTION = "Xilinx Runtime User Space Libraries and headers" | ||
3 | |||
4 | require xrt.inc | ||
5 | |||
6 | SRC_URI += "file://xrt-cstdint.patch;striplevel=2" | ||
7 | |||
8 | LICENSE = "GPL-2.0-or-later & Apache-2.0 & MIT" | ||
9 | LIC_FILES_CHKSUM = "file://../LICENSE;md5=de2c993ac479f02575bcbfb14ef9b485 \ | ||
10 | file://runtime_src/core/edge/drm/zocl/LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8 \ | ||
11 | file://runtime_src/core/pcie/driver/linux/xocl/LICENSE;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ | ||
12 | file://runtime_src/core/pcie/linux/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ | ||
13 | file://runtime_src/core/tools/xbutil2/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ | ||
14 | file://runtime_src/core/common/elf/LICENSE.txt;md5=b996e8b74af169e7e72e22d9e7d05b06 " | ||
15 | |||
16 | COMPATIBLE_MACHINE ?= "^$" | ||
17 | COMPATIBLE_MACHINE:zynqmp = ".*" | ||
18 | COMPATIBLE_MACHINE:versal = ".*" | ||
19 | |||
20 | S = "${WORKDIR}/git/src" | ||
21 | |||
22 | inherit cmake pkgconfig | ||
23 | |||
24 | BBCLASSEXTEND = "native nativesdk" | ||
25 | |||
26 | # util-linux is for libuuid-dev. | ||
27 | DEPENDS = "libdrm opencl-headers ocl-icd opencl-clhpp boost util-linux git-replacement-native protobuf-native protobuf elfutils libffi rapidjson" | ||
28 | RDEPENDS:${PN} = "bash ocl-icd boost-system boost-filesystem zocl (= ${PV})" | ||
29 | |||
30 | EXTRA_OECMAKE += " \ | ||
31 | -DCMAKE_BUILD_TYPE=Release \ | ||
32 | -DCMAKE_EXPORT_COMPILE_COMANDS=ON \ | ||
33 | " | ||
34 | |||
35 | # Systems with AIE also require libmetal, this is implemented in the dynamic-layers | ||
36 | # See: meta-xilinx-core/dynamic-layers/openamp-layer/recipes-xrt/xrt_gt.bbappend | ||
37 | # Note: If meta-openamp is not available, AIE will not be enabled. | ||
38 | |||
39 | EXTRA_OECMAKE:append:versal = " -DXRT_LIBDFX=true" | ||
40 | EXTRA_OECMAKE:append:zynqmp = " -DXRT_LIBDFX=true" | ||
41 | DEPENDS:append:versal = " libdfx" | ||
42 | DEPENDS:append:zynqmp = " libdfx" | ||
43 | |||
44 | |||
45 | FILES_SOLIBSDEV = "" | ||
46 | FILES:${PN} += "\ | ||
47 | ${libdir}/lib*.so \ | ||
48 | ${libdir}/lib*.so.* \ | ||
49 | ${libdir}/ps_kernels_lib \ | ||
50 | /lib/*.so* \ | ||
51 | ${datadir}" | ||
52 | INSANE_SKIP:${PN} += "dev-so" | ||
53 | |||
54 | pkg_postinst_ontarget:${PN}() { | ||
55 | #!/bin/sh | ||
56 | if [ ! -e /etc/OpenCL/vendors/xilinx.icd ]; then | ||
57 | echo "INFO: Creating ICD entry for Xilinx Platform" | ||
58 | mkdir -p /etc/OpenCL/vendors | ||
59 | echo "libxilinxopencl.so" > /etc/OpenCL/vendors/xilinx.icd | ||
60 | chmod -R 755 /etc/OpenCL | ||
61 | fi | ||
62 | } | ||
diff --git a/meta-xilinx-core/recipes-xrt/zocl/zocl_git.bb b/meta-xilinx-core/recipes-xrt/zocl/zocl_git.bb deleted file mode 100644 index 6bd579f4..00000000 --- a/meta-xilinx-core/recipes-xrt/zocl/zocl_git.bb +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | SUMMARY = "Xilinx Runtime(XRT) driver module" | ||
2 | DESCRIPTION = "Xilinx Runtime driver module provides memory management and compute unit schedule" | ||
3 | |||
4 | COMPATIBLE_MACHINE:microblaze = "none" | ||
5 | |||
6 | require recipes-xrt/xrt/xrt.inc | ||
7 | |||
8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=7d040f51aae6ac6208de74e88a3795f8" | ||
9 | LICENSE = "GPL-2.0-or-later & Apache-2.0" | ||
10 | |||
11 | COMPATIBLE_MACHINE ?= "^$" | ||
12 | COMPATIBLE_MACHINE:zynqmp = ".*" | ||
13 | COMPATIBLE_MACHINE:versal = ".*" | ||
14 | |||
15 | S = "${WORKDIR}/git/src/runtime_src/core/edge/drm/zocl" | ||
16 | |||
17 | inherit module | ||
18 | |||
19 | pkg_postinst_ontarget:${PN}() { | ||
20 | #!/bin/sh | ||
21 | echo "Unloading old XRT Linux kernel modules" | ||
22 | ( rmmod zocl || true ) > /dev/null 2>&1 | ||
23 | echo "Loading new XRT Linux kernel modules" | ||
24 | modprobe zocl | ||
25 | } | ||