diff options
Diffstat (limited to 'meta-xilinx/meta-xilinx-pynq/recipes-support/pynq-ultra96-helloworld')
3 files changed, 133 insertions, 0 deletions
diff --git a/meta-xilinx/meta-xilinx-pynq/recipes-support/pynq-ultra96-helloworld/pynq-ultra96-helloworld/0001-fix-repo_board_folder-variable.patch b/meta-xilinx/meta-xilinx-pynq/recipes-support/pynq-ultra96-helloworld/pynq-ultra96-helloworld/0001-fix-repo_board_folder-variable.patch new file mode 100644 index 000000000..85a2c7132 --- /dev/null +++ b/meta-xilinx/meta-xilinx-pynq/recipes-support/pynq-ultra96-helloworld/pynq-ultra96-helloworld/0001-fix-repo_board_folder-variable.patch @@ -0,0 +1,33 @@ + +m 38230239577f1c53fdd83b44002f8113bdabedd6 Mon Sep 17 00:00:00 2001 +From: Sai Hari Chandana Kalluri <chandana.kalluri@xilinx.com> +Date: Fri, 7 Jun 2019 23:51:07 +0000 +Subject: [PATCH] fix repo_board_folder variable + +--- + setup.py | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 708dc25..21595f1 100644 +--- a/setup.py ++++ b/setup.py +@@ -34,13 +34,14 @@ import shutil + + # global variables + board = os.environ['BOARD'] +-repo_board_folder = f'boards/{board}/resizer' ++repo_board_folder = 'boards/'+board+'/resizer' + board_notebooks_dir = os.environ['PYNQ_JUPYTER_NOTEBOOKS'] + hw_data_files = [] + + + # check whether board is supported + def check_env(): ++ print("board = %s repo_board_folder = %s" %(board,repo_board_folder)) + if not os.path.isdir(repo_board_folder): + raise ValueError("Board {} is not supported.".format(board)) + if not os.path.isdir(board_notebooks_dir): +-- +2.7.4 + diff --git a/meta-xilinx/meta-xilinx-pynq/recipes-support/pynq-ultra96-helloworld/pynq-ultra96-helloworld/0001-resizer_PL-notebooks-for-ZCU104-and-Ultra96-changed.patch b/meta-xilinx/meta-xilinx-pynq/recipes-support/pynq-ultra96-helloworld/pynq-ultra96-helloworld/0001-resizer_PL-notebooks-for-ZCU104-and-Ultra96-changed.patch new file mode 100644 index 000000000..1ab95d383 --- /dev/null +++ b/meta-xilinx/meta-xilinx-pynq/recipes-support/pynq-ultra96-helloworld/pynq-ultra96-helloworld/0001-resizer_PL-notebooks-for-ZCU104-and-Ultra96-changed.patch @@ -0,0 +1,61 @@ +From 788469badc4cd6a618e02d52883511cfbb00ca34 Mon Sep 17 00:00:00 2001 +From: Vinay Senthil <vinays@xilinx.com> +Date: Tue, 30 Jul 2019 15:53:25 -0700 +Subject: [PATCH] resizer_PL notebooks for ZCU104 and Ultra96: changed default + bitstream location + +Location is no longer /home/xilinx. Now it is in a bitsream folder in the same directory as the notebook. + +Signed-off-by: Vinay Senthil <vinays@xilinx.com> +--- + boards/Ultra96/resizer/notebooks/resizer_PL.ipynb | 4 ++-- + boards/ZCU104/resizer/notebooks/resizer_PL.ipynb | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/boards/Ultra96/resizer/notebooks/resizer_PL.ipynb b/boards/Ultra96/resizer/notebooks/resizer_PL.ipynb +index 1658d78..cd04d93 100644 +--- a/boards/Ultra96/resizer/notebooks/resizer_PL.ipynb ++++ b/boards/Ultra96/resizer/notebooks/resizer_PL.ipynb +@@ -78,7 +78,7 @@ + "outputs": [], + "source": [ + "resize_design = Overlay(\n", +- " \"/usr/local/lib/python3.6/dist-packages/helloworld/bitstream/resizer.bit\")" ++ " \"bitstream/resizer.bit\")" + ] + }, + { +@@ -497,7 +497,7 @@ + "name": "python", + "nbconvert_exporter": "python", + "pygments_lexer": "ipython3", +- "version": "3.6.5" ++ "version": "3.7.0" + } + }, + "nbformat": 4, +diff --git a/boards/ZCU104/resizer/notebooks/resizer_PL.ipynb b/boards/ZCU104/resizer/notebooks/resizer_PL.ipynb +index 1658d78..cd04d93 100644 +--- a/boards/ZCU104/resizer/notebooks/resizer_PL.ipynb ++++ b/boards/ZCU104/resizer/notebooks/resizer_PL.ipynb +@@ -78,7 +78,7 @@ + "outputs": [], + "source": [ + "resize_design = Overlay(\n", +- " \"/usr/local/lib/python3.6/dist-packages/helloworld/bitstream/resizer.bit\")" ++ " \"bitstream/resizer.bit\")" + ] + }, + { +@@ -497,7 +497,7 @@ + "name": "python", + "nbconvert_exporter": "python", + "pygments_lexer": "ipython3", +- "version": "3.6.5" ++ "version": "3.7.0" + } + }, + "nbformat": 4, +-- +2.7.4 + diff --git a/meta-xilinx/meta-xilinx-pynq/recipes-support/pynq-ultra96-helloworld/pynq-ultra96-helloworld_1.0.bb b/meta-xilinx/meta-xilinx-pynq/recipes-support/pynq-ultra96-helloworld/pynq-ultra96-helloworld_1.0.bb new file mode 100644 index 000000000..1cddb6021 --- /dev/null +++ b/meta-xilinx/meta-xilinx-pynq/recipes-support/pynq-ultra96-helloworld/pynq-ultra96-helloworld_1.0.bb @@ -0,0 +1,39 @@ +SUMMARY = "PYNQ Helloworld for Ultra96" +LICENSE = "BSD" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=f9990fcc34ccf1f82ccf1bc5a1cc3bfc" + +RDEPENDS_${PN} += "\ + python3-pynq \ + python3-pillow \ + libstdc++ \ + " + +SRC_URI = "git://github.com/Xilinx/PYNQ-HelloWorld.git;protocol=https \ + file://0001-fix-repo_board_folder-variable.patch \ + file://0001-resizer_PL-notebooks-for-ZCU104-and-Ultra96-changed.patch \ +" + +COMPATIBLE_MACHINE = "^$" +COMPATIBLE_MACHINE_ultra96-zynqmp = "ultra96-zynqmp" + +SRC_URI[md5sum] = "ac1bfe94a18301b26ae5110ea26ca596" +SRC_URI[sha256sum] = "f522c54c9418d1b1fdb6098cd7139439d47b041900000812c51200482d423460" + +SRCREV = "0e10a7ee06c3e7d873f4468e06e523e2d58d07f8" +S = "${WORKDIR}/git" + +inherit xilinx-pynq + +do_configure[noexec]="1" +do_compile[noexec]="1" + +do_install() { + install -d ${D}/${PYNQ_NOTEBOOK_DIR}/helloworld + install -d ${D}/${PYNQ_NOTEBOOK_DIR}/helloworld/bitstream + + cp -r ${S}/boards/${BOARD_NAME}/resizer/notebooks/* ${D}/${PYNQ_NOTEBOOK_DIR}/helloworld + cp -r ${S}/boards/${BOARD_NAME}/resizer/bitstream/* ${D}/${PYNQ_NOTEBOOK_DIR}/helloworld/bitstream + +} + |