summaryrefslogtreecommitdiffstats
path: root/meta-xilinx-pynq
diff options
context:
space:
mode:
authorSai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>2021-09-28 22:12:04 -0700
committerSai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>2021-09-28 22:12:06 -0700
commit6921a88182ce51763fcf61273972df99dc2faee5 (patch)
tree6505b60113f6192f347991a3a82b8bc6fb02b8d9 /meta-xilinx-pynq
parent1d2c0f073d3102c3f8ff043d2c3039e6d360118f (diff)
downloadmeta-xilinx-6921a88182ce51763fcf61273972df99dc2faee5.tar.gz
Convert to new override syntax
This is the result of automated script (0.9.0) conversion: oe-core/scripts/contrib/convert-overrides.py . converting the metadata to use ":" as the override character instead of "_". Signed-off-by: Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com>
Diffstat (limited to 'meta-xilinx-pynq')
-rw-r--r--meta-xilinx-pynq/classes/xilinx-pynq.bbclass14
-rw-r--r--meta-xilinx-pynq/recipes-devtool/python/python-pynq.inc6
-rw-r--r--meta-xilinx-pynq/recipes-support/libcma/libcma_1.0.bb10
-rw-r--r--meta-xilinx-pynq/recipes-support/pynq-overlay/pynq-overlay_1.0.bb12
-rw-r--r--meta-xilinx-pynq/recipes-support/pynq-ultra96-bnn/pynq-ultra96-bnn_1.0.bb2
-rw-r--r--meta-xilinx-pynq/recipes-support/pynq-ultra96-helloworld/pynq-ultra96-helloworld_1.0.bb2
6 files changed, 23 insertions, 23 deletions
diff --git a/meta-xilinx-pynq/classes/xilinx-pynq.bbclass b/meta-xilinx-pynq/classes/xilinx-pynq.bbclass
index a183a78e..9110037a 100644
--- a/meta-xilinx-pynq/classes/xilinx-pynq.bbclass
+++ b/meta-xilinx-pynq/classes/xilinx-pynq.bbclass
@@ -1,36 +1,36 @@
1PYNQ_NOTEBOOK_DIR ?= "${datadir}/notebooks" 1PYNQ_NOTEBOOK_DIR ?= "${datadir}/notebooks"
2 2
3PYNQ_ARCH_arm = "armv7l" 3PYNQ_ARCH:arm = "armv7l"
4PYNQ_ARCH_aarch64 = "aarch64" 4PYNQ_ARCH:aarch64 = "aarch64"
5 5
6PYNQ_BUILD_ARCH="${PYNQ_ARCH_${TARGET_ARCH}}" 6PYNQ_BUILD_ARCH="${PYNQ_ARCH_${TARGET_ARCH}}"
7PYNQ_BUILD_ROOT="${STAGING_DIR_TARGET}" 7PYNQ_BUILD_ROOT="${STAGING_DIR_TARGET}"
8BBCLASSEXTEND = "native nativesdk" 8BBCLASSEXTEND = "native nativesdk"
9 9
10PACKAGES += " ${PN}-notebooks" 10PACKAGES += " ${PN}-notebooks"
11FILES_${PN}-notebooks += "${PYNQ_NOTEBOOK_DIR}" 11FILES:${PN}-notebooks += "${PYNQ_NOTEBOOK_DIR}"
12 12
13INSANE_SKIP_${PN} += "staticdev dev-so" 13INSANE_SKIP:${PN} += "staticdev dev-so"
14inherit python3-dir 14inherit python3-dir
15 15
16# Used for setup.py on PYNQ 16# Used for setup.py on PYNQ
17BOARD_NAME_ultra96 = "Ultra96" 17BOARD_NAME_ultra96 = "Ultra96"
18BOARD_NAME_zcu104-zynqmp = "ZCU104" 18BOARD_NAME_zcu104-zynqmp = "ZCU104"
19 19
20do_compile_prepend() { 20do_compile:prepend() {
21 export BOARD=${BOARD_NAME} 21 export BOARD=${BOARD_NAME}
22 export PYNQ_BUILD_ARCH=${PYNQ_BUILD_ARCH} 22 export PYNQ_BUILD_ARCH=${PYNQ_BUILD_ARCH}
23 export PYNQ_JUPYTER_NOTEBOOKS=${D}${PYNQ_NOTEBOOK_DIR} 23 export PYNQ_JUPYTER_NOTEBOOKS=${D}${PYNQ_NOTEBOOK_DIR}
24} 24}
25 25
26do_install_prepend() { 26do_install:prepend() {
27 export BOARD=${BOARD_NAME} 27 export BOARD=${BOARD_NAME}
28 export PYNQ_BUILD_ARCH=${PYNQ_BUILD_ARCH} 28 export PYNQ_BUILD_ARCH=${PYNQ_BUILD_ARCH}
29 export PYNQ_JUPYTER_NOTEBOOKS=${D}${PYNQ_NOTEBOOK_DIR} 29 export PYNQ_JUPYTER_NOTEBOOKS=${D}${PYNQ_NOTEBOOK_DIR}
30 install -d ${PYNQ_JUPYTER_NOTEBOOKS} 30 install -d ${PYNQ_JUPYTER_NOTEBOOKS}
31} 31}
32 32
33do_configure_prepend() { 33do_configure:prepend() {
34 export BOARD=${BOARD_NAME} 34 export BOARD=${BOARD_NAME}
35 export PYNQ_BUILD_ARCH=${PYNQ_BUILD_ARCH} 35 export PYNQ_BUILD_ARCH=${PYNQ_BUILD_ARCH}
36 export PYNQ_JUPYTER_NOTEBOOKS=${D}${PYNQ_NOTEBOOK_DIR} 36 export PYNQ_JUPYTER_NOTEBOOKS=${D}${PYNQ_NOTEBOOK_DIR}
diff --git a/meta-xilinx-pynq/recipes-devtool/python/python-pynq.inc b/meta-xilinx-pynq/recipes-devtool/python/python-pynq.inc
index 9aa55764..b35b98be 100644
--- a/meta-xilinx-pynq/recipes-devtool/python/python-pynq.inc
+++ b/meta-xilinx-pynq/recipes-devtool/python/python-pynq.inc
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b42e39ad2ddbad7e8ad47f3eee6feff5"
6SRC_URI[md5sum] = "9950894100c20293e921090b76ca9f17" 6SRC_URI[md5sum] = "9950894100c20293e921090b76ca9f17"
7SRC_URI[sha256sum] = "4f719e2753093d1e79931755c624d160cf342c03af49e027d09abe75bdc8e8c5" 7SRC_URI[sha256sum] = "4f719e2753093d1e79931755c624d160cf342c03af49e027d09abe75bdc8e8c5"
8 8
9RDEPENDS_${PN} += "\ 9RDEPENDS:${PN} += "\
10 ${PYTHON_PN}-core \ 10 ${PYTHON_PN}-core \
11 ${PYTHON_PN}-asyncio \ 11 ${PYTHON_PN}-asyncio \
12 ${PYTHON_PN}-cffi \ 12 ${PYTHON_PN}-cffi \
@@ -37,8 +37,8 @@ SRC_URI += " \
37 file://0003-Use-sysroot-for-Displayport-library.patch \ 37 file://0003-Use-sysroot-for-Displayport-library.patch \
38" 38"
39 39
40FILESEXTRAPATHS_prepend := "${THISDIR}:" 40FILESEXTRAPATHS:prepend := "${THISDIR}:"
41 41
42do_install_append() { 42do_install:append() {
43 rm -rf ${D}${PYNQ_NOTEBOOK_DIR}_* 43 rm -rf ${D}${PYNQ_NOTEBOOK_DIR}_*
44} 44}
diff --git a/meta-xilinx-pynq/recipes-support/libcma/libcma_1.0.bb b/meta-xilinx-pynq/recipes-support/libcma/libcma_1.0.bb
index 9d9a2b38..bd28e702 100644
--- a/meta-xilinx-pynq/recipes-support/libcma/libcma_1.0.bb
+++ b/meta-xilinx-pynq/recipes-support/libcma/libcma_1.0.bb
@@ -2,8 +2,8 @@ SUMMARY = "Recompile libcma against pynqlib c"
2LICENSE = "MIT" 2LICENSE = "MIT"
3LIC_FILES_CHKSUM = "file://LICENSE;md5=b42e39ad2ddbad7e8ad47f3eee6feff5" 3LIC_FILES_CHKSUM = "file://LICENSE;md5=b42e39ad2ddbad7e8ad47f3eee6feff5"
4 4
5CMA_ARCH_arm = "32" 5CMA_ARCH:arm = "32"
6CMA_ARCH_aarch64 = "64" 6CMA_ARCH:aarch64 = "64"
7 7
8PYNQBRANCH ?= "image_v2.4" 8PYNQBRANCH ?= "image_v2.4"
9SRCBRANCHARG = "${@['nobranch=1', 'branch=${PYNQBRANCH}'][d.getVar('PYNQBRANCH', True) != '']}" 9SRCBRANCHARG = "${@['nobranch=1', 'branch=${PYNQBRANCH}'][d.getVar('PYNQBRANCH', True) != '']}"
@@ -15,8 +15,8 @@ SRCREV ?= "3d659d374701b7c34fa702e7aa23f71f9113f826"
15 15
16S="${WORKDIR}/git" 16S="${WORKDIR}/git"
17 17
18CMA_ARCH_arm = "32" 18CMA_ARCH:arm = "32"
19CMA_ARCH_aarch64 = "64" 19CMA_ARCH:aarch64 = "64"
20 20
21do_install() { 21do_install() {
22 22
@@ -29,5 +29,5 @@ do_install() {
29 29
30SOLIBS = ".so" 30SOLIBS = ".so"
31FILES_SOLIBSDEV = "" 31FILES_SOLIBSDEV = ""
32FILES_${PN} += "/usr/lib/libcma.so /usr/include" 32FILES:${PN} += "/usr/lib/libcma.so /usr/include"
33 33
diff --git a/meta-xilinx-pynq/recipes-support/pynq-overlay/pynq-overlay_1.0.bb b/meta-xilinx-pynq/recipes-support/pynq-overlay/pynq-overlay_1.0.bb
index 8f71d9ae..467414ed 100644
--- a/meta-xilinx-pynq/recipes-support/pynq-overlay/pynq-overlay_1.0.bb
+++ b/meta-xilinx-pynq/recipes-support/pynq-overlay/pynq-overlay_1.0.bb
@@ -19,11 +19,11 @@ SRC_URI = " \
19 19
20S="${WORKDIR}" 20S="${WORKDIR}"
21 21
22PYNQ_DTSI ??= "pynq_zynqmp.dtsi" 22PYNQ_DTSI ??= "pynq:zynqmp.dtsi"
23PYNQ_DTSI_zynqmp ?= "pynq_zynqmp.dtsi" 23PYNQ_DTSI:zynqmp ?= "pynq:zynqmp.dtsi"
24PYNQ_DTSI_zynq ?= "pynq_zynq.dtsi" 24PYNQ_DTSI:zynq ?= "pynq:zynq.dtsi"
25PYNQ_SYMBOL_DTSI_zynqmp ?= "pynq_zynqmp_symbols.dtsi" 25PYNQ_SYMBOL_DTSI:zynqmp ?= "pynq:zynqmp_symbols.dtsi"
26PYNQ_SYMBOL_DTSI_zynq ?= "pynq_zynq_symbols.dtsi" 26PYNQ_SYMBOL_DTSI:zynq ?= "pynq:zynq_symbols.dtsi"
27PYNQ_DTBO ?= "pynq.dtbo" 27PYNQ_DTBO ?= "pynq.dtbo"
28PYNQ_SYMBOL_DTBO ?= "pynq-symbols.dtbo" 28PYNQ_SYMBOL_DTBO ?= "pynq-symbols.dtbo"
29 29
@@ -51,4 +51,4 @@ do_install() {
51 51
52} 52}
53 53
54FILES_${PN} += "/lib/firmware/pynq.dtbo /lib/firmware/pynq-symbols.dtbo ${sysconfdir}/modprobe.d/generic-uio.conf" 54FILES:${PN} += "/lib/firmware/pynq.dtbo /lib/firmware/pynq-symbols.dtbo ${sysconfdir}/modprobe.d/generic-uio.conf"
diff --git a/meta-xilinx-pynq/recipes-support/pynq-ultra96-bnn/pynq-ultra96-bnn_1.0.bb b/meta-xilinx-pynq/recipes-support/pynq-ultra96-bnn/pynq-ultra96-bnn_1.0.bb
index c20ac5d6..a736d963 100644
--- a/meta-xilinx-pynq/recipes-support/pynq-ultra96-bnn/pynq-ultra96-bnn_1.0.bb
+++ b/meta-xilinx-pynq/recipes-support/pynq-ultra96-bnn/pynq-ultra96-bnn_1.0.bb
@@ -13,7 +13,7 @@ SRCREV = "32eed91994228d1042a16c692047dfe81e47d498"
13 13
14inherit xilinx-pynq 14inherit xilinx-pynq
15 15
16RDEPENDS_${PN}-notebooks += "\ 16RDEPENDS:${PN}-notebooks += "\
17 python3-pynq \ 17 python3-pynq \
18 python3-pillow \ 18 python3-pillow \
19 libstdc++ \ 19 libstdc++ \
diff --git a/meta-xilinx-pynq/recipes-support/pynq-ultra96-helloworld/pynq-ultra96-helloworld_1.0.bb b/meta-xilinx-pynq/recipes-support/pynq-ultra96-helloworld/pynq-ultra96-helloworld_1.0.bb
index d1aabb7d..7ed5f8a2 100644
--- a/meta-xilinx-pynq/recipes-support/pynq-ultra96-helloworld/pynq-ultra96-helloworld_1.0.bb
+++ b/meta-xilinx-pynq/recipes-support/pynq-ultra96-helloworld/pynq-ultra96-helloworld_1.0.bb
@@ -3,7 +3,7 @@ LICENSE = "BSD"
3 3
4LIC_FILES_CHKSUM = "file://LICENSE;md5=f9990fcc34ccf1f82ccf1bc5a1cc3bfc" 4LIC_FILES_CHKSUM = "file://LICENSE;md5=f9990fcc34ccf1f82ccf1bc5a1cc3bfc"
5 5
6RDEPENDS_${PN} += "\ 6RDEPENDS:${PN} += "\
7 python3-pynq \ 7 python3-pynq \
8 python3-pillow \ 8 python3-pillow \
9 libstdc++ \ 9 libstdc++ \