diff --git a/sdbuild/packages/bootpy/boot.py b/sdbuild/packages/bootpy/boot.py index 4f06aa4b34..e9e735432f 100755 --- a/sdbuild/packages/bootpy/boot.py +++ b/sdbuild/packages/bootpy/boot.py @@ -21,5 +21,4 @@ # leds[0:4].off() # sleep(0.2) # leds[0:4].on() -# sleep(0.2) - +# sleep(0.2) \ No newline at end of file diff --git a/sdbuild/packages/clear_pl_statefile/clear_pl_statefile.service b/sdbuild/packages/clear_pl_statefile/clear_pl_statefile.service new file mode 100644 index 0000000000..90c556b1f8 --- /dev/null +++ b/sdbuild/packages/clear_pl_statefile/clear_pl_statefile.service @@ -0,0 +1,11 @@ +[Unit] +Description=Clears the PL Statefile on boot +Requires=jupyter.service +After=jupyter.service + +[Service] +Type=oneshot +ExecStart=/usr/local/bin/clear_pl_statefile.sh + +[Install] +WantedBy=basic.target diff --git a/sdbuild/packages/clear_pl_statefile/clear_pl_statefile.sh b/sdbuild/packages/clear_pl_statefile/clear_pl_statefile.sh new file mode 100755 index 0000000000..6f3af18e2e --- /dev/null +++ b/sdbuild/packages/clear_pl_statefile/clear_pl_statefile.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +source /etc/profile.d/pynq_venv.sh +source /etc/profile.d/xrt_setup.sh + +# Remove any previous versions of the statefile +echo "from pynq import PL" > /tmp/.pynq_clear_statefile.py +echo "PL.reset()" >> /tmp/.pynq_clear_statefile.py + +python3 /tmp/.pynq_clear_statefile.py + diff --git a/sdbuild/packages/clear_pl_statefile/pre.sh b/sdbuild/packages/clear_pl_statefile/pre.sh new file mode 100755 index 0000000000..2feaad6305 --- /dev/null +++ b/sdbuild/packages/clear_pl_statefile/pre.sh @@ -0,0 +1,8 @@ +#! /bin/bash + +target=$1 +script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + +sudo cp $script_dir/clear_pl_statefile.sh $target/usr/local/bin +sudo cp $script_dir/clear_pl_statefile.service $target/lib/systemd/system + diff --git a/sdbuild/packages/clear_pl_statefile/qemu.sh b/sdbuild/packages/clear_pl_statefile/qemu.sh new file mode 100755 index 0000000000..554f9ad742 --- /dev/null +++ b/sdbuild/packages/clear_pl_statefile/qemu.sh @@ -0,0 +1,2 @@ +systemctl enable clear_pl_statefile + diff --git a/sdbuild/packages/gcc-mb/Makefile b/sdbuild/packages/gcc-mb/Makefile index ab1eed09f8..582200eae9 100644 --- a/sdbuild/packages/gcc-mb/Makefile +++ b/sdbuild/packages/gcc-mb/Makefile @@ -1,3 +1,6 @@ +# Copyright (C) 2022 Xilinx, Inc +# SPDX-License-Identifier: BSD-3-Clause + GCC_MB_SOURCEDIR := $(dir $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))) GCC_MB_WORKDIR := ${BUILD_ROOT}/gcc-mb export CT_COMPILE_ROOT = ${GCC_MB_WORKDIR} @@ -23,7 +26,7 @@ ${GCC_MB_WORKDIR}/patches: | ${GCC_MB_SOURCEDIR}/patches ${GCC_MB_WORKDIR} cp -r ${GCC_MB_SOURCEDIR}/patches $@ ${NATIVE_BUILD_arm}: | ${GCC_MB_WORKDIR}/samples ${GCC_MB_WORKDIR}/patches - cd ${GCC_MB_WORKDIR} && ct-ng arm-unknown-linux-gnueabihf && sed -i -e 's:2.2.6:2.4.1:' .config && ct-ng build + cd ${GCC_MB_WORKDIR} && ct-ng arm-unknown-linux-gnueabihf && sed -i -e 's:2.4.1:2.2.6:' -e 's|CT_ISL_MIRRORS=.*|CT_ISL_MIRRORS="https://distfiles.macports.org/isl/"|' -e 's|CT_EXPAT_MIRRORS=.*|CT_EXPAT_MIRRORS="https://github.com/libexpat/libexpat/releases/download/R_2_2_6"|' .config && ct-ng build ${GCC_MB_WORKDIR}/arm/microblazeel-xilinx-elf/bin/mb-gcc: | ${NATIVE_BUILD_arm} diff --git a/sdbuild/packages/gcc-mb/build.sh b/sdbuild/packages/gcc-mb/build.sh index 5d63ecc453..ce211a08cb 100755 --- a/sdbuild/packages/gcc-mb/build.sh +++ b/sdbuild/packages/gcc-mb/build.sh @@ -30,6 +30,11 @@ done export -n LD_LIBRARY_PATH # Use cross tools to build the provided configuration ct-ng $sample + +sed -e 's|CT_ISL_MIRRORS=.*$|CT_ISL_MIRRORS="https://distfiles.macports.org/isl/"|' \ + -e 's|CT_EXPAT_MIRRORS=.*$|CT_EXPAT_MIRRORS="https://github.com/libexpat/libexpat/releases/download/R_2_2_6"|' \ + -i .config + ct-ng build cd ${ARCH}/microblazeel-xilinx-elf diff --git a/sdbuild/packages/jupyter/qemu.sh b/sdbuild/packages/jupyter/qemu.sh index 57af4492fc..82eaa40be8 100755 --- a/sdbuild/packages/jupyter/qemu.sh +++ b/sdbuild/packages/jupyter/qemu.sh @@ -16,22 +16,6 @@ else export NODE_OPTIONS=--max-old-space-size=4096 fi -# install nodejs 12 -curl -s https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add - -echo deb https://deb.nodesource.com/node_12.x focal main > /etc/apt/sources.list.d/nodesource.list - -# TODO fix hang on the apt-get install... -# apt-get update && apt-get install -y nodejs -if [ ${ARCH} == 'arm' ]; then - wget https://deb.nodesource.com/node_12.x/pool/main/n/nodejs/nodejs_12.22.6-deb-1nodesource1_armhf.deb - dpkg -i *.deb - rm -rf *.deb -else - wget https://deb.nodesource.com/node_12.x/pool/main/n/nodejs/nodejs_12.22.6-deb-1nodesource1_arm64.deb - dpkg -i *.deb - rm -rf *.deb -fi - source /etc/profile.d/pynq_venv.sh jupyter notebook --generate-config --allow-root diff --git a/sdbuild/packages/libsds/libcma/Makefile b/sdbuild/packages/libsds/libcma/Makefile index 61af0decc8..34874f4656 100644 --- a/sdbuild/packages/libsds/libcma/Makefile +++ b/sdbuild/packages/libsds/libcma/Makefile @@ -1,3 +1,6 @@ +# Copyright (C) 2022 Xilinx, Inc +# SPDX-License-Identifier: BSD-3-Clause + CMA_ARCH ?= $(shell getconf LONG_BIT) INSTALL_LIB = libcma.so.$(CMA_ARCH) diff --git a/sdbuild/packages/libsds/libcma/libxlnk_cma.h b/sdbuild/packages/libsds/libcma/libxlnk_cma.h index df4bdb0425..ea469e694c 100644 --- a/sdbuild/packages/libsds/libcma/libxlnk_cma.h +++ b/sdbuild/packages/libsds/libcma/libxlnk_cma.h @@ -1,3 +1,6 @@ +// Copyright (C) 2022 Xilinx, Inc +// SPDX-License-Identifier: BSD-3-Clause + #include #include #include diff --git a/sdbuild/packages/libsds/libcma/pynqlib.c b/sdbuild/packages/libsds/libcma/pynqlib.c index 189e4afe9e..f758ed9795 100644 --- a/sdbuild/packages/libsds/libcma/pynqlib.c +++ b/sdbuild/packages/libsds/libcma/pynqlib.c @@ -1,3 +1,6 @@ +// Copyright (C) 2022 Xilinx, Inc +// SPDX-License-Identifier: BSD-3-Clause + #define _GNU_SOURCE #include diff --git a/sdbuild/packages/phantomjs-fix/phantomjs.patch b/sdbuild/packages/phantomjs-fix/phantomjs.patch deleted file mode 100755 index df54cab89a..0000000000 --- a/sdbuild/packages/phantomjs-fix/phantomjs.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- phantomjs.orig 2018-06-30 04:18:19.669999882 +0000 -+++ phantomjs 2018-06-30 04:18:47.909999840 +0000 -@@ -1,5 +1,6 @@ - #!/bin/sh - LD_LIBRARY_PATH="/usr/lib/phantomjs:$LD_LIBRARY_PATH" -+export QT_QPA_PLATFORM=offscreen - export LD_LIBRARY_PATH --exec "/usr/lib/phantomjs/phantomjs" "$@" -+exec "/usr/lib/phantomjs/phantomjs" "$@" | sed -e 's/TypeError: Attempting to change the setter of an unconfigurable property.//g' - diff --git a/sdbuild/packages/phantomjs-fix/pre.sh b/sdbuild/packages/phantomjs-fix/pre.sh deleted file mode 100755 index 3a98c80aad..0000000000 --- a/sdbuild/packages/phantomjs-fix/pre.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -set -x -set -e - -target=$1 -script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - -sudo chroot / patch $target/usr/bin/phantomjs < $script_dir/phantomjs.patch diff --git a/sdbuild/packages/pybind11/qemu.sh b/sdbuild/packages/pybind11/qemu.sh index adc5acd7ac..ba5a514baf 100755 --- a/sdbuild/packages/pybind11/qemu.sh +++ b/sdbuild/packages/pybind11/qemu.sh @@ -1,7 +1,7 @@ set -x set -e -VERSION=2.5.0 +VERSION=2.6.0 cd /root wget "https://github.com/pybind/pybind11/archive/v${VERSION}.zip" unzip v${VERSION}.zip diff --git a/sdbuild/packages/pynq/Makefile b/sdbuild/packages/pynq/Makefile index 9e4e6bc3d1..6e5217b6b6 100644 --- a/sdbuild/packages/pynq/Makefile +++ b/sdbuild/packages/pynq/Makefile @@ -1 +1,4 @@ +# Copyright (C) 2022 Xilinx, Inc +# SPDX-License-Identifier: BSD-3-Clause + PACKAGE_BUILD_pynq += ${PYNQ_UPDATE} diff --git a/sdbuild/packages/pynq/post.sh b/sdbuild/packages/pynq/post.sh index cc1fde36a0..37f45db6a0 100755 --- a/sdbuild/packages/pynq/post.sh +++ b/sdbuild/packages/pynq/post.sh @@ -7,9 +7,9 @@ target=$1 script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" # sdist is built at stage 3 -if [ ${PYNQ_BOARD} == "Unknown" ]; then - dist_out=$BUILD_ROOT/PYNQ/dist - mkdir -p $dist_out - cp -rf $target/home/xilinx/pynq_git/dist/* $dist_out -fi +#if [ ${PYNQ_BOARD} == "Unknown" ]; then +# dist_out=$BUILD_ROOT/PYNQ/dist +# mkdir -p $dist_out +# cp -rf $target/home/xilinx/pynq_git/dist/* $dist_out +#fi sudo rm -rf $target/home/xilinx/pynq_git diff --git a/sdbuild/packages/pynq/qemu.sh b/sdbuild/packages/pynq/qemu.sh index d720fa3e2d..6055fe60fd 100755 --- a/sdbuild/packages/pynq/qemu.sh +++ b/sdbuild/packages/pynq/qemu.sh @@ -13,10 +13,16 @@ export BOARD=${PYNQ_BOARD} cd /home/xilinx mkdir -p jupyter_notebooks +# clone and then install extra packages +python3 -m pip install --upgrade git+https://github.com/Xilinx/PYNQ-Metadata.git +python3 -m pip install --upgrade git+https://github.com/Xilinx/PYNQ-Utils.git cd pynq_git BOARD=${PYNQ_BOARD} PYNQ_JUPYTER_NOTEBOOKS=${PYNQ_JUPYTER_NOTEBOOKS} \ python3 -m pip install dist/*.tar.gz --upgrade --no-deps --no-use-pep517 +if [ -d notebooks ]; then + cp -r notebooks/* ${PYNQ_JUPYTER_NOTEBOOKS}/ +fi cd .. old_hostname=$(hostname) @@ -34,4 +40,3 @@ chown xilinx:xilinx /home/xilinx/REVISION chown xilinx:xilinx -R /home/xilinx/pynq chown xilinx:xilinx -R /home/xilinx/jupyter_notebooks chown xilinx:xilinx -R $pynq_dir -systemctl enable pl_server diff --git a/sdbuild/packages/pynq_peripherals/qemu.sh b/sdbuild/packages/pynq_peripherals/qemu.sh index b6624f127d..05240c4b4d 100755 --- a/sdbuild/packages/pynq_peripherals/qemu.sh +++ b/sdbuild/packages/pynq_peripherals/qemu.sh @@ -13,6 +13,6 @@ pip install git+https://github.com/Xilinx/PYNQ_peripherals.git # TODO pynq CLI depends on XRT, XRT not working in QEMU when `xbutil dump` called # pynq get-notebooks pynq_peripherals -p $PYNQ_JUPYTER_NOTEBOOKS mkdir -p $PYNQ_JUPYTER_NOTEBOOKS/pynq_peripherals -cp -r /usr/local/share/pynq-venv/lib/python3.8/site-packages/pynq_peripherals/notebooks/* \ +cp -r /usr/local/share/pynq-venv/lib/python3.10/site-packages/pynq_peripherals/notebooks/* \ $PYNQ_JUPYTER_NOTEBOOKS/pynq_peripherals diff --git a/sdbuild/packages/python_packages_focal/qemu.sh b/sdbuild/packages/python_packages_focal/qemu.sh deleted file mode 100755 index aed84584d6..0000000000 --- a/sdbuild/packages/python_packages_focal/qemu.sh +++ /dev/null @@ -1,138 +0,0 @@ -export HOME=/root - -set -x -set -e - - -# Captured using pip3 freeze on image after packages installed with no versions -cd /root -cat > requirements.txt < /etc/profile.d/pynq_venv.sh -source /etc/profile.d/pynq_venv.sh - -python3 -m pip install pip==21.2.4 -python3 -m pip install -r requirements.txt -rm requirements.txt diff --git a/sdbuild/packages/python_packages_focal/post.sh b/sdbuild/packages/python_packages_jammy/post.sh similarity index 100% rename from sdbuild/packages/python_packages_focal/post.sh rename to sdbuild/packages/python_packages_jammy/post.sh diff --git a/sdbuild/packages/python_packages_focal/pre-built/README.md b/sdbuild/packages/python_packages_jammy/pre-built/README.md similarity index 100% rename from sdbuild/packages/python_packages_focal/pre-built/README.md rename to sdbuild/packages/python_packages_jammy/pre-built/README.md diff --git a/sdbuild/packages/python_packages_focal/pre.sh b/sdbuild/packages/python_packages_jammy/pre.sh similarity index 84% rename from sdbuild/packages/python_packages_focal/pre.sh rename to sdbuild/packages/python_packages_jammy/pre.sh index f72bec0fa4..60ab45fd29 100755 --- a/sdbuild/packages/python_packages_focal/pre.sh +++ b/sdbuild/packages/python_packages_jammy/pre.sh @@ -12,3 +12,5 @@ then sudo mkdir -p $target/$target_dir sudo cp -rf $script_dir/pre-built/$target_dir/* $target/$target_dir fi + +sudo cp $script_dir/requirements.txt $target/root/ diff --git a/sdbuild/packages/python_packages_jammy/qemu.sh b/sdbuild/packages/python_packages_jammy/qemu.sh new file mode 100755 index 0000000000..49694b164b --- /dev/null +++ b/sdbuild/packages/python_packages_jammy/qemu.sh @@ -0,0 +1,18 @@ +export HOME=/root + +set -x +set -e + + +# Captured using pip3 freeze on image after packages installed with no versions +cd /root + +export PYNQ_VENV=/usr/local/share/pynq-venv + +python3 -m venv --system-site-packages $PYNQ_VENV +echo "source $PYNQ_VENV/bin/activate" > /etc/profile.d/pynq_venv.sh +source /etc/profile.d/pynq_venv.sh + +python3 -m pip install pip==22.0.2 +python3 -m pip install -r requirements.txt +rm requirements.txt diff --git a/sdbuild/packages/python_packages_jammy/requirements.txt b/sdbuild/packages/python_packages_jammy/requirements.txt new file mode 100755 index 0000000000..c2bfade6d1 --- /dev/null +++ b/sdbuild/packages/python_packages_jammy/requirements.txt @@ -0,0 +1,123 @@ +alabaster==0.7.12 +anyio==3.6.1 +argon2-cffi==21.3.0 +argon2-cffi-bindings==21.2.0 +asttokens==2.0.5 +async-generator==1.10 +backcall==0.2.0 +bleach==5.0.1 +CppHeaderParser==2.7.4 +Cython==0.29.32 +dash==2.6.0 +dash-bootstrap-components==1.2.1 +dash-core-components==2.0.0 +dash-html-components==2.0.0 +dash-renderer==1.9.1 +dash-table==5.0.0 +debugpy==1.6.2 +deepdiff==5.8.1 +deltasigma==0.2.2 +docutils==0.17.1 +entrypoints==0.4 +executing==0.9.1 +fastjsonschema==2.16.1 +Flask==2.1.3 +Flask-Compress==1.12 +gTTS==2.2.4 +imagesize==1.4.1 +imutils==0.5.4 +ipykernel==6.15.1 +ipython==8.4.0 +ipython-genutils==0.2.0 +ipywidgets==7.7.1 +itsdangerous==2.1.2 +jedi==0.18.1 +json5==0.9.8 +jsonschema==4.9.0 +jupyter==1.0.0 +jupyter-client==7.3.4 +jupyter-console==6.4.4 +jupyter-contrib-core==0.4.0 +jupyter-contrib-nbextensions==0.5.1 +jupyter-core==4.11.1 +jupyter-highlight-selected-word==0.2.0 +jupyter-latex-envs==1.4.6 +jupyter-nbextensions-configurator==0.5.0 +jupyter-server==1.18.1 +jupyterlab==3.4.4 +jupyterlab-pygments==0.2.2 +jupyterlab-server==2.15.0 +jupyterlab-widgets==1.1.1 +jupyterplot==0.0.3 +lrcurve==1.1.0 +MarkupSafe==2.1.1 +matplotlib-inline==0.1.3 +mistune==0.8.4 +nbclassic==0.4.3 +nbclient==0.5.13 +nbconvert==6.5.0 +nbformat==5.4.0 +nbsphinx==0.8.9 +nbwavedrom==1.0.1 +nest-asyncio==1.5.5 +notebook==6.4.12 +notebook-shim==0.1.0 +ordered-set==4.1.0 +pandocfilters==1.5.0 +parsec==3.13 +parso==0.8.3 +patsy==0.5.2 +pbr==5.9.0 +pexpect==4.8.0 +pickleshare==0.7.5 +plotly==5.9.0 +prometheus-client==0.14.1 +prompt-toolkit==3.0.30 +ptyprocess==0.7.0 +pure-eval==0.2.2 +PyAudio==0.2.12 +pybind11==2.10.0 +pycairo==1.21.0 +pycparser==2.19 +pycurl==7.45.1 +pydantic==1.9.1 +pyeda==0.28.0 +pyrsistent==0.18.1 +python-dateutil==2.8.2 +pyzmq==23.2.0 +qtconsole==5.3.1 +QtPy==2.1.0 +rise==5.7.1 +roman==3.3 +Send2Trash==1.8.0 +setproctitle==1.3.0 +simple-term-menu==1.5.0 +simplegeneric==0.8.1 +sniffio==1.2.0 +snowballstemmer==2.2.0 +SpeechRecognition==3.8.1 +Sphinx==5.1.1 +sphinx-rtd-theme==1.0.0 +sphinxcontrib-applehelp==1.0.2 +sphinxcontrib-devhelp==1.0.2 +sphinxcontrib-htmlhelp==2.0.0 +sphinxcontrib-jsmath==1.0.1 +sphinxcontrib-qthelp==1.0.3 +sphinxcontrib-serializinghtml==1.1.5 +stack-data==0.3.0 +tenacity==8.0.1 +terminado==0.15.0 +testpath==0.6.0 +testresources==2.0.1 +tinycss2==1.1.1 +tqdm==4.64.0 +traitlets==5.3.0 +typing_extensions==4.3.0 +voila==0.3.6 +voila-gridstack==0.3.0 +wcwidth==0.2.5 +websocket-client==1.3.3 +websockets==10.3 +Werkzeug==2.2.1 +widgetsnbextension==3.6.1 +wurlitzer==3.0.2 diff --git a/sdbuild/packages/sigrok/qemu.sh b/sdbuild/packages/sigrok/qemu.sh index 50a827064c..cb6d94a1b6 100755 --- a/sdbuild/packages/sigrok/qemu.sh +++ b/sdbuild/packages/sigrok/qemu.sh @@ -31,7 +31,7 @@ tar -xf ${libsigrokdecode}.tar.gz cd ${libsigrokdecode} patch -p2 -i $patch_file export PKG_CONFIG_PATH=/opt/sigrok/lib/pkgconfig -./configure --prefix=/opt/sigrok LIBS="-lpython3.8" +./configure --prefix=/opt/sigrok LIBS="-lpython3.10" make make install cd .. diff --git a/sdbuild/packages/usbgadget/Makefile b/sdbuild/packages/usbgadget/Makefile index 14aa6d7654..a23869824e 100644 --- a/sdbuild/packages/usbgadget/Makefile +++ b/sdbuild/packages/usbgadget/Makefile @@ -1,3 +1,6 @@ +# Copyright (C) 2022 Xilinx, Inc +# SPDX-License-Identifier: BSD-3-Clause + USB_SOURCEDIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST)))) USB_WORKDIR := ${BUILD_ROOT}/usbgadget diff --git a/sdbuild/packages/usbgadget/fatfs/delete-for-mac.txt b/sdbuild/packages/usbgadget/fatfs/delete-for-mac.txt new file mode 100644 index 0000000000..e69de29bb2 diff --git a/sdbuild/packages/usbgadget/pre.sh b/sdbuild/packages/usbgadget/pre.sh index eaf39f0526..da8a3a7580 100755 --- a/sdbuild/packages/usbgadget/pre.sh +++ b/sdbuild/packages/usbgadget/pre.sh @@ -12,3 +12,7 @@ if [ -f $BUILD_ROOT/PYNQ/pynq/notebooks/Welcome\ to\ Pynq.ipynb ]; then sudo cp -f $BUILD_ROOT/PYNQ/pynq/notebooks/Welcome\ to\ Pynq.ipynb \ $target/usr/local/share/fatfs_contents fi + +if [ -f $target/home/xilinx/REVISION ]; then + sudo cp -f $target/home/xilinx/REVISION $target/usr/local/share/fatfs_contents +fi diff --git a/sdbuild/packages/usbgadget/qemu.sh b/sdbuild/packages/usbgadget/qemu.sh index 65bee5c6f7..22d3beab17 100755 --- a/sdbuild/packages/usbgadget/qemu.sh +++ b/sdbuild/packages/usbgadget/qemu.sh @@ -5,28 +5,6 @@ set -e for f in /etc/profile.d/*.sh; do source $f; done -mkdir /mnt/fatfs -mount /usr/local/share/fatfs /mnt/fatfs - -# HTML version of the Welcome Notebook -if [ -f /usr/local/share/fatfs_contents/Welcome\ to\ Pynq.ipynb ]; then - jupyter nbconvert --to html \ - /usr/local/share/fatfs_contents/Welcome\ to\ Pynq.ipynb - rm -f /usr/local/share/fatfs_contents/Welcome\ to\ Pynq.ipynb - cp -f /usr/local/share/fatfs_contents/Welcome\ to\ Pynq.html \ - /mnt/fatfs -fi - -# Copy over the release REVISION -if [ -f /home/xilinx/REVISION ]; then - cp -f /home/xilinx/REVISION /mnt/fatfs -fi - -# Default to USB Gadgets for Windows (RNDIS driver) -touch /mnt/fatfs/delete-for-mac.txt - -umount /mnt/fatfs - if [ -f /etc/default/isc-dhcp-server ] && \ grep -q "INTERFACES=" /etc/default/isc-dhcp-server; then if ! grep -q "usb0" /etc/default/isc-dhcp-server; then diff --git a/sdbuild/packages/xrfclk/package/setup.py b/sdbuild/packages/xrfclk/package/setup.py index 68d00b416e..dab324e1cd 100644 --- a/sdbuild/packages/xrfclk/package/setup.py +++ b/sdbuild/packages/xrfclk/package/setup.py @@ -1,31 +1,5 @@ # Copyright (c) 2020, Xilinx, Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# 1. Redistributions of source code must retain the above copyright notice, -# this list of conditions and the following disclaimer. -# -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# 3. Neither the name of the copyright holder nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION). HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# SPDX-License-Identifier: BSD-3-Clause from setuptools import setup @@ -51,3 +25,4 @@ '': ['*.py', '*.so', '*.txt'], } ) + diff --git a/sdbuild/packages/xrfclk/package/xrfclk/__init__.py b/sdbuild/packages/xrfclk/package/xrfclk/__init__.py index 0a65a206d5..6d19348e08 100644 --- a/sdbuild/packages/xrfclk/package/xrfclk/__init__.py +++ b/sdbuild/packages/xrfclk/package/xrfclk/__init__.py @@ -1,36 +1,9 @@ # Copyright (c) 2021, Xilinx, Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# 1. Redistributions of source code must retain the above copyright notice, -# this list of conditions and the following disclaimer. -# -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# 3. Neither the name of the copyright holder nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION). HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# SPDX-License-Identifier: BSD-3-Clause from .xrfclk import * -__author__ = "Yun Rock Qu" -__copyright__ = "Copyright 2021, Xilinx" -__email__ = "pynq_support@xilinx.com" + + diff --git a/sdbuild/packages/xrfclk/package/xrfclk/xrfclk.py b/sdbuild/packages/xrfclk/package/xrfclk/xrfclk.py index c8f4e6e4da..3856747a03 100644 --- a/sdbuild/packages/xrfclk/package/xrfclk/xrfclk.py +++ b/sdbuild/packages/xrfclk/package/xrfclk/xrfclk.py @@ -1,31 +1,5 @@ # Copyright (c) 2021, Xilinx, Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# 1. Redistributions of source code must retain the above copyright notice, -# this list of conditions and the following disclaimer. -# -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# 3. Neither the name of the copyright holder nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION). HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# SPDX-License-Identifier: BSD-3-Clause import os @@ -35,9 +9,6 @@ from pathlib import Path from collections import defaultdict -__author__ = "Yun Rock Qu, Lewis Brown" -__copyright__ = "Copyright 2021, Xilinx" -__email__ = "pynq_support@xilinx.com" board = os.environ['BOARD'] @@ -279,3 +250,5 @@ def _read_tics_output(): _Config[chip][float(freq)] = registers + + diff --git a/sdbuild/packages/xrfdc/package/setup.py b/sdbuild/packages/xrfdc/package/setup.py index 1c2f9a7a20..620fff6902 100644 --- a/sdbuild/packages/xrfdc/package/setup.py +++ b/sdbuild/packages/xrfdc/package/setup.py @@ -1,31 +1,5 @@ # Copyright (c) 2019, Xilinx, Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# 1. Redistributions of source code must retain the above copyright notice, -# this list of conditions and the following disclaimer. -# -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# 3. Neither the name of the copyright holder nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION). HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# SPDX-License-Identifier: BSD-3-Clause from setuptools import setup @@ -54,3 +28,4 @@ 'wurlitzer', ] ) + diff --git a/sdbuild/packages/xrfdc/package/src/libmetal_stubs.c b/sdbuild/packages/xrfdc/package/src/libmetal_stubs.c index 269e2654bb..7d11ab8f98 100644 --- a/sdbuild/packages/xrfdc/package/src/libmetal_stubs.c +++ b/sdbuild/packages/xrfdc/package/src/libmetal_stubs.c @@ -60,7 +60,6 @@ unsigned int metal_register_generic_device(void* h) { return 0; } unsigned int metal_device_open(void* h) { return 0; } __attribute__((constructor)) void foo(void) { - printf("library loaded!\n"); _metal.common.log_level = METAL_LOG_WARNING; _metal.common.log_handler = metal_default_log_handler; } diff --git a/sdbuild/packages/xrfdc/package/src/xparameters.h b/sdbuild/packages/xrfdc/package/src/xparameters.h index 5d267b5143..ac95704222 100644 --- a/sdbuild/packages/xrfdc/package/src/xparameters.h +++ b/sdbuild/packages/xrfdc/package/src/xparameters.h @@ -1,3 +1,6 @@ +// Copyright (C) 2022 Xilinx, Inc +// SPDX-License-Identifier: BSD-3-Clause + /* Definitions for driver RFDC */ #define XPAR_XRFDC_NUM_INSTANCES 0 #define XPAR_SCUGIC_NUM_INSTANCES 0 diff --git a/sdbuild/packages/xrfdc/package/xrfdc/__init__.py b/sdbuild/packages/xrfdc/package/xrfdc/__init__.py index 3c51faf744..edddc3e28b 100644 --- a/sdbuild/packages/xrfdc/package/xrfdc/__init__.py +++ b/sdbuild/packages/xrfdc/package/xrfdc/__init__.py @@ -1,31 +1,5 @@ # Copyright (c) 2018, Xilinx, Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# 1. Redistributions of source code must retain the above copyright notice, -# this list of conditions and the following disclaimer. -# -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# 3. Neither the name of the copyright holder nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION). HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# SPDX-License-Identifier: BSD-3-Clause import cffi @@ -35,9 +9,6 @@ from wurlitzer import pipes -__author__ = "Peter Ogden" -__copyright__ = "Copyright 2018, Xilinx" -__email__ = "pynq_support@xilinx.com" _THIS_DIR = os.path.dirname(__file__) @@ -378,7 +349,17 @@ def GetFIFOStatusObs(self, *EnablePtr): class RFdc(pynq.DefaultIP): - bindto = ["xilinx.com:ip:usp_rf_data_converter:2.4", + """The class RFdc is bound to the IP xilinx.com:ip:usp_rf_data_converter:2.3, + xilinx.com:ip:usp_rf_data_converter:2.4 or xilinx.com:ip:usp_rf_data_converter:2.6. + Once the overlay is loaded, the data converter IP will be allocated the driver + code implemented in this class. + + For a complete list of wrapped functions see: + https://github.com/Xilinx/PYNQ/tree/master/sdbuild/packages/xrfdc/package + """ + + bindto = ["xilinx.com:ip:usp_rf_data_converter:2.6", + "xilinx.com:ip:usp_rf_data_converter:2.4", "xilinx.com:ip:usp_rf_data_converter:2.3"] def __init__(self, description): @@ -466,4 +447,7 @@ def _call_function(self, name, *args): TRSHD_OFF = 0x0 TRSHD_STICKY_OVER = 0x1 TRSHD_STICKY_UNDER = 0x2 -TRSHD_HYSTERISIS = 0x3 \ No newline at end of file +TRSHD_HYSTERISIS = 0x3 + + + diff --git a/sdbuild/packages/xrfdc/package/xrfdc/config.py b/sdbuild/packages/xrfdc/package/xrfdc/config.py index eeb60ca92a..3f2f4b4686 100644 --- a/sdbuild/packages/xrfdc/package/xrfdc/config.py +++ b/sdbuild/packages/xrfdc/package/xrfdc/config.py @@ -1,36 +1,7 @@ # Copyright (c) 2018, Xilinx, Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# 1. Redistributions of source code must retain the above copyright notice, -# this list of conditions and the following disclaimer. -# -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# 3. Neither the name of the copyright holder nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION). HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -__author__ = "Peter Ogden" -__copyright__ = "Copyright 2018, Xilinx" -__email__ = "pynq_support@xilinx.com" +# SPDX-License-Identifier: BSD-3-Clause + + _DAC_ADP = [ @@ -131,3 +102,5 @@ def populate_config(obj, params): params, _ADC_ADP, i, j) _set_configs(obj.ADCTile_Config[i].ADCBlock_Digital_Config[j], params, _ADC_DDP, i, j) + + diff --git a/sdbuild/packages/xsdfec/package/setup.py b/sdbuild/packages/xsdfec/package/setup.py index 315f4f2a18..a814b66b0f 100644 --- a/sdbuild/packages/xsdfec/package/setup.py +++ b/sdbuild/packages/xsdfec/package/setup.py @@ -1,31 +1,5 @@ # Copyright (c) 2019, Xilinx, Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# 1. Redistributions of source code must retain the above copyright notice, -# this list of conditions and the following disclaimer. -# -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# 3. Neither the name of the copyright holder nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION). HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# SPDX-License-Identifier: BSD-3-Clause from setuptools import setup @@ -54,3 +28,4 @@ 'parsec', ] ) + diff --git a/sdbuild/packages/xsdfec/package/src/libmetal_stubs.c b/sdbuild/packages/xsdfec/package/src/libmetal_stubs.c index 68a11d0d44..7f77f4f9e2 100644 --- a/sdbuild/packages/xsdfec/package/src/libmetal_stubs.c +++ b/sdbuild/packages/xsdfec/package/src/libmetal_stubs.c @@ -1,32 +1,6 @@ /* * Copyright (c) 2019, Xilinx, Inc. - * All rights reserved. - - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - - * 3. Neither the name of the copyright holder nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION). HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * SPDX-License-Identifier: BSD-3-Clause */ #include @@ -88,3 +62,4 @@ __attribute__((constructor)) void foo(void) { _metal.common.log_level = METAL_LOG_WARNING; _metal.common.log_handler = metal_default_log_handler; } + diff --git a/sdbuild/packages/xsdfec/package/src/xil_stubs.c b/sdbuild/packages/xsdfec/package/src/xil_stubs.c index a928532f3a..8225f24d70 100644 --- a/sdbuild/packages/xsdfec/package/src/xil_stubs.c +++ b/sdbuild/packages/xsdfec/package/src/xil_stubs.c @@ -1,32 +1,6 @@ /* * Copyright (c) 2019, Xilinx, Inc. - * All rights reserved. - - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - - * 3. Neither the name of the copyright holder nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, - * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; - * OR BUSINESS INTERRUPTION). HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, - * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR - * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * SPDX-License-Identifier: BSD-3-Clause */ #include @@ -46,3 +20,4 @@ void Xil_Assert(const char* file, int line) { printf("Assertion failed at %s:%d\n", file, line); exit(1); } + diff --git a/sdbuild/packages/xsdfec/package/xsdfec/__init__.py b/sdbuild/packages/xsdfec/package/xsdfec/__init__.py index 6bf5fb1a1c..6339c4bf1c 100644 --- a/sdbuild/packages/xsdfec/package/xsdfec/__init__.py +++ b/sdbuild/packages/xsdfec/package/xsdfec/__init__.py @@ -1,31 +1,5 @@ # Copyright (c) 2019, Xilinx, Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# 1. Redistributions of source code must retain the above copyright notice, -# this list of conditions and the following disclaimer. -# -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# 3. Neither the name of the copyright holder nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR -# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -# OR BUSINESS INTERRUPTION). HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# SPDX-License-Identifier: BSD-3-Clause import cffi @@ -38,9 +12,6 @@ import pynq -__author__ = "Craig Ramsay" -__copyright__ = "Copyright 2019, Xilinx" -__email__ = "pynq_support@xilinx.com" _whitespace = ps.regex(r'\s*') @@ -511,3 +482,5 @@ def _set(self, value): setattr(SdFec, prop_name, _create_c_array_property(prop_name+'_Words', int(max_len), type_name, access)) + + diff --git a/sdbuild/packages/xsdfec/package/xsdfec/xsdfec_functions.c b/sdbuild/packages/xsdfec/package/xsdfec/xsdfec_functions.c index 2e6301a5d0..bdb1f601bb 100644 --- a/sdbuild/packages/xsdfec/package/xsdfec/xsdfec_functions.c +++ b/sdbuild/packages/xsdfec/package/xsdfec/xsdfec_functions.c @@ -1,3 +1,6 @@ +// Copyright (C) 2022 Xilinx, Inc +// SPDX-License-Identifier: BSD-3-Clause + /****************************************************************************** * * Copyright (C) 2019 Xilinx, Inc. All rights reserved.