diff --git a/README.md b/README.md
index 0959d34ec47289988077be8eb3d6ae8cf76fda3e..f51f0109212dda215f893a02ccec72251e4401a9 100644
--- a/README.md
+++ b/README.md
@@ -21,20 +21,6 @@ the demo there. Users do not have to run any additional steps.
to the PYNQ image. These steps do not need to be performed
by users, since they will be taken care of when this package is being installed.*
-## Wily Release
-For Ubuntu 15.10, please make sure the file
-`/etc/apt/sources.list.d/multistrap-wily.list` looks like the following:
-
-```
-deb [arch=armhf] http://old-releases.ubuntu.com/ubuntu wily universe main
-deb-src http://old-releases.ubuntu.com/ubuntu wily universe main
-```
-
-And run `apt-get update` before installing any package.
-
-users can safely ignore this step if they are on the latest PYNQ image.
-(For example, PYNQ image v2.1 deploys Ubuntu 16.04.)
-
## Boot Files
This package requires the boot files to be compatible.
For example, the device tree must have the following patch:
@@ -94,16 +80,6 @@ The ethernet entry must have bridging enabled as above.
Again, if you are on the latest PYNQ image, you do not have
to do this step.
-## Installing Packages
-There are several packages installed during the setup:
-
-```shell
-apt-get install tcpdump iptables ebtables bridge-utils
-pip3.6 install scapy-python3 wurlitzer pytest-runner paho-mqtt netifaces
-```
-This step does not need to be run by the users, since it
-has been taken care of by the installation process.
-
## Modifying `eth0` Port
Users can modify the `eth0` port on Linux
(`/etc/network/interfaces.d/eth0`). An example of the modified file is stored
diff --git a/pynq_networking/kernel_module/Makefile b/pynq_networking/kernel_module/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..1450056073b178580affa4da4168d19c1c7337b5
--- /dev/null
+++ b/pynq_networking/kernel_module/Makefile
@@ -0,0 +1,21 @@
+PROJECT :=
+DIR := ${CURDIR}
+RECIPE := ${DIR}/petalinux_project/project-spec/meta-user/recipes-modules/pynqenet
+
+all: check module
+
+check:
+ @if [ -z "${PROJECT}" ]; then \
+ echo "Please specify a valid petalinux project path."; \
+ echo " e.g. make PROJECT=<petalinux_project_path>"; \
+ exit 1; \
+ fi
+
+module:
+ cd ${PROJECT} &&\
+ petalinux-create --force -t modules -n pynqenet --enable &&\
+ cp -rf ${RECIPE} project-spec/meta-user/recipes-modules/pynqenet &&\
+ petalinux-build -c kernel &&\
+ petalinux-build -c pynqenet -x do_install &&\
+ cp -f build/tmp/work/plnx_zynq7-xilinx-linux-gnueabi/pynqenet/1.0-r0/pynqenet.ko ${DIR}
+
diff --git a/pynq_networking/kernel_module/README.md b/pynq_networking/kernel_module/README.md
old mode 100755
new mode 100644
index 40a5b17517345cef13f6c715cf020c0a9d413952..56524a6dc950ed3d9a01219173c801fe8e896360
--- a/pynq_networking/kernel_module/README.md
+++ b/pynq_networking/kernel_module/README.md
@@ -3,10 +3,21 @@
The kernel driver will be inserted during run-time. This folder contains
the pre-compiled object file along with its source codes.
-The `pynqenet.ko` file must be compiled with the Linux source codes; this
-is not recommended for the users. However, users can directly use the
-pre-compiled object file.
+The `pynqenet.ko` file must be compiled with the Petalinux source codes; this
+requires the users to have the Petalinux project for the PYNQ image. To
+get the Petalinux project, users have to follow the SD build flow in the
+original PYNQ repository.
-In any case the kernel object file has to be compiled, users can run `make`
-inside `/src` folder. This will pull in the PYNQ repository and rebuilt the
-boot files. The kernel module will be rebuilt after that.
+## Rebuilding the Kernel Module
+We provide a makefile to build the `pynqenet.ko` file. For example,
+
+```shell
+make PROJECT=<pynq_repo>/sdbuild/build/Pynq-Z1/petalinux_project
+```
+
+Notice that the above path will usually be available after you have at least
+built the boot files for the corresponding board once.
+
+## Compatibility
+
+Currently only zynq-7000 devices are supported.
diff --git a/pynq_networking/kernel_module/petalinux_project/project-spec/meta-user/recipes-modules/pynqenet/README b/pynq_networking/kernel_module/petalinux_project/project-spec/meta-user/recipes-modules/pynqenet/README
new file mode 100644
index 0000000000000000000000000000000000000000..efba73fb2440a90e7d60a260c91d56916fb33ef0
--- /dev/null
+++ b/pynq_networking/kernel_module/petalinux_project/project-spec/meta-user/recipes-modules/pynqenet/README
@@ -0,0 +1,53 @@
+PetaLinux User Module Template
+===================================
+
+This directory contains a PetaLinux kernel module created from a template.
+
+If you are developing your module from scratch, simply start editing the
+file pynqenet.c.
+
+You can easily import any existing module code by copying it into this
+directory, and editing the automatically generated Makefile as described below.
+
+The "all:" target in the Makefile template will compile compile the module.
+
+Before building the module, you will need to enable the module from
+PetaLinux menuconfig by running:
+ "petalinux-config -c rootfs"
+You will see your module in the "modules --->" submenu.
+
+To compile and install your module to the target file system copy on the host,
+simply run the command.
+ "petalinux-build -c kernel" to build kernel first, and then run
+ "petalinux-build -c pynqenet" to build the module
+
+You will also need to rebuild PetaLinux bootable images so that the images
+is updated with the updated target filesystem copy, run this command:
+ "petalinux-build -c rootfs"
+
+You can also run one PetaLinux command to compile the module, install it
+to the target filesystem host copy and update the bootable images as follows:
+ "petalinux-build"
+
+If OF(OpenFirmware) is configured, you need to add the device node to the
+DTS(Device Tree Source) file so that the device can be probed when the module is
+loaded. Here is an example of the device node in the device tree:
+
+ pynqenet_instance: pynqenet@XXXXXXXX {
+ compatible = "vendor,pynqenet";
+ reg = <PHYSICAL_START_ADDRESS ADDRESS_RANGE>;
+ interrupt-parent = <&INTR_CONTROLLER_INSTANCE>;
+ interrupts = < INTR_NUM INTR_SENSITIVITY >;
+ };
+Notes:
+ * "pynqenet@XXXXXXXX" is the label of the device node, it is usually the "DEVICE_TYPE@PHYSICAL_START_ADDRESS". E.g. "pynqenet@89000000".
+ * "compatible" needs to match one of the the compatibles in the module's compatible list.
+ * "reg" needs to be pair(s) of the physical start address of the device and the address range.
+ * If the device has interrupt, the "interrupt-parent" needs to be the interrupt controller which the interrupt connects to. and the "interrupts" need to be pair(s) of the interrupt ID and the interrupt sensitivity.
+
+For more information about the the DTS file, please refer to this document in the Linux kernel: linux-2.6.x/Documentation/powerpc/booting-without-of.txt
+
+
+To add extra source code files (for example, to split a large module into
+multiple source files), add the relevant .o files to the list in the local
+Makefile where indicated.
diff --git a/pynq_networking/kernel_module/petalinux_project/project-spec/meta-user/recipes-modules/pynqenet/files/COPYING b/pynq_networking/kernel_module/petalinux_project/project-spec/meta-user/recipes-modules/pynqenet/files/COPYING
new file mode 100644
index 0000000000000000000000000000000000000000..6d45519c8c6cc926a7d6d96ebc45de7226f66099
--- /dev/null
+++ b/pynq_networking/kernel_module/petalinux_project/project-spec/meta-user/recipes-modules/pynqenet/files/COPYING
@@ -0,0 +1,340 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/pynq_networking/kernel_module/petalinux_project/project-spec/meta-user/recipes-modules/pynqenet/files/Makefile b/pynq_networking/kernel_module/petalinux_project/project-spec/meta-user/recipes-modules/pynqenet/files/Makefile
new file mode 100644
index 0000000000000000000000000000000000000000..56773988482279a28fe9e867685830d3514a680a
--- /dev/null
+++ b/pynq_networking/kernel_module/petalinux_project/project-spec/meta-user/recipes-modules/pynqenet/files/Makefile
@@ -0,0 +1,14 @@
+obj-m := pynqenet.o
+
+SRC := $(shell pwd)
+
+all:
+ $(MAKE) -C $(KERNEL_SRC) M=$(SRC)
+
+modules_install:
+ $(MAKE) -C $(KERNEL_SRC) M=$(SRC) modules_install
+
+clean:
+ rm -f *.o *~ core .depend .*.cmd *.ko *.mod.c
+ rm -f Module.markers Module.symvers modules.order
+ rm -rf .tmp_versions Modules.symvers
\ No newline at end of file
diff --git a/pynq_networking/kernel_module/src/module_param_hex.h b/pynq_networking/kernel_module/petalinux_project/project-spec/meta-user/recipes-modules/pynqenet/files/module_param_hex.h
similarity index 100%
rename from pynq_networking/kernel_module/src/module_param_hex.h
rename to pynq_networking/kernel_module/petalinux_project/project-spec/meta-user/recipes-modules/pynqenet/files/module_param_hex.h
diff --git a/pynq_networking/kernel_module/src/pynqenet.c b/pynq_networking/kernel_module/petalinux_project/project-spec/meta-user/recipes-modules/pynqenet/files/pynqenet.c
similarity index 100%
rename from pynq_networking/kernel_module/src/pynqenet.c
rename to pynq_networking/kernel_module/petalinux_project/project-spec/meta-user/recipes-modules/pynqenet/files/pynqenet.c
diff --git a/pynq_networking/kernel_module/src/pynqenet.h b/pynq_networking/kernel_module/petalinux_project/project-spec/meta-user/recipes-modules/pynqenet/files/pynqenet.h
similarity index 100%
rename from pynq_networking/kernel_module/src/pynqenet.h
rename to pynq_networking/kernel_module/petalinux_project/project-spec/meta-user/recipes-modules/pynqenet/files/pynqenet.h
diff --git a/pynq_networking/kernel_module/src/xlnx_dma.h b/pynq_networking/kernel_module/petalinux_project/project-spec/meta-user/recipes-modules/pynqenet/files/xlnx_dma.h
similarity index 100%
rename from pynq_networking/kernel_module/src/xlnx_dma.h
rename to pynq_networking/kernel_module/petalinux_project/project-spec/meta-user/recipes-modules/pynqenet/files/xlnx_dma.h
diff --git a/pynq_networking/kernel_module/src/xlnx_irq.h b/pynq_networking/kernel_module/petalinux_project/project-spec/meta-user/recipes-modules/pynqenet/files/xlnx_irq.h
similarity index 100%
rename from pynq_networking/kernel_module/src/xlnx_irq.h
rename to pynq_networking/kernel_module/petalinux_project/project-spec/meta-user/recipes-modules/pynqenet/files/xlnx_irq.h
diff --git a/pynq_networking/kernel_module/petalinux_project/project-spec/meta-user/recipes-modules/pynqenet/pynqenet.bb b/pynq_networking/kernel_module/petalinux_project/project-spec/meta-user/recipes-modules/pynqenet/pynqenet.bb
new file mode 100644
index 0000000000000000000000000000000000000000..deccc53dc65168f11ebb070eb88e07c26ea50904
--- /dev/null
+++ b/pynq_networking/kernel_module/petalinux_project/project-spec/meta-user/recipes-modules/pynqenet/pynqenet.bb
@@ -0,0 +1,20 @@
+SUMMARY = "Recipe for build an external pynqenet Linux kernel module"
+SECTION = "PETALINUX/modules"
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e"
+
+inherit module
+
+SRC_URI = "file://Makefile \
+ file://pynqenet.c \
+ file://module_param_hex.h \
+ file://pynqenet.h \
+ file://xlnx_dma.h \
+ file://xlnx_irq.h \
+ file://COPYING \
+ "
+
+S = "${WORKDIR}"
+
+# The inherit of module.bbclass will automatically name module packages with
+# "kernel-module-" prefix as required by the oe-core build environment.
diff --git a/pynq_networking/kernel_module/pynqenet.ko b/pynq_networking/kernel_module/pynqenet.ko
index c32100da490e8be8a16bb0002f8a7a273d20763f..dc6b0cc8cbb6003cf7176af33b69968c983a812d 100644
Binary files a/pynq_networking/kernel_module/pynqenet.ko and b/pynq_networking/kernel_module/pynqenet.ko differ
diff --git a/pynq_networking/kernel_module/src/Makefile b/pynq_networking/kernel_module/src/Makefile
deleted file mode 100644
index 03b6d921165f7a1ceca861cbf1d2999bd48539f0..0000000000000000000000000000000000000000
--- a/pynq_networking/kernel_module/src/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-## Make sure to source the correct settings file before running this
-## e.g. source /proj/gsd/vivado/Vivado/2017.2/settings64.csh
-## kernel configuration file can be found as kernel.config in boot_config folder
-
-PYNQ_TAG := image_v2.1
-RELEASE := Pynq-Z1-Xenial
-ARCH := arm
-CROSS_COMPILE := arm-linux-gnueabihf-
-
-obj-m += pynqenet.o
-
-all: git_clone kernel_module
-
-git_clone:
- /usr/bin/git clone https://github.com/Xilinx/PYNQ.git .pynq_git
- cd .pynq_git/sdbuild && \
- /usr/bin/git checkout -b $(PYNQ_TAG) origin/$(PYNQ_TAG) && \
- make boot_files RELEASE=$(RELEASE) && \
- cd ../..
-
-kernel_module:
- ARCH=$(ARCH) CROSS_COMPILE=$(CROSS_COMPILE) \
- make -C $(PWD)/.pynq_git/sdbuild/.build/linux/ M=$(PWD) modules
- cp -rf $(PWD)/pynqenet.ko $(PWD)/../
-
-clean:
- make -C $(PWD)/.pynq_git/sdbuild/.build/linux/ M=$(PWD) clean
diff --git a/pynq_networking/lib/accelerator.py b/pynq_networking/lib/accelerator.py
index f01f172e8ce35b9ae8809a17443a55577cb1ddb6..6ce678e2199af7d6b4fc9b2b6707081e3cc876a7 100644
--- a/pynq_networking/lib/accelerator.py
+++ b/pynq_networking/lib/accelerator.py
@@ -36,7 +36,7 @@ from uuid import getnode
from socket import inet_aton
import logging
logging.getLogger("scapy.runtime").setLevel(logging.ERROR)
-from scapy.all import *
+from kamene.all import *
from wurlitzer import sys_pipes
from pynq import PL, MMIO
from .broker import ip_str_to_int, mac_str_to_int
diff --git a/pynq_networking/lib/broker.py b/pynq_networking/lib/broker.py
index 0746d21c43ad35829a4265798b76bdf3275f4ccd..308b202a761d4c68e4841c84557c3f0641c54c71 100644
--- a/pynq_networking/lib/broker.py
+++ b/pynq_networking/lib/broker.py
@@ -37,7 +37,7 @@ import netifaces
from uuid import getnode
import logging
logging.getLogger("scapy.runtime").setLevel(logging.ERROR)
-from scapy.all import *
+from kamene.all import *
from .mqtt import *
from .mqttsn_sw import *
diff --git a/pynq_networking/lib/mqtt.py b/pynq_networking/lib/mqtt.py
old mode 100755
new mode 100644
index c57663369dc3fefb4a5353b5c3d3442a19f20d62..509838094e8cb5d1f5822a2f96813096f78411c8
--- a/pynq_networking/lib/mqtt.py
+++ b/pynq_networking/lib/mqtt.py
@@ -31,7 +31,7 @@
import struct
import logging
logging.getLogger("scapy.runtime").setLevel(logging.ERROR)
-from scapy.all import *
+from kamene.all import *
__author__ = "Stephen Neuendorffer"
diff --git a/pynq_networking/lib/mqttsn.py b/pynq_networking/lib/mqttsn.py
index 7ca53ef7c7f3c5d39c8a07f0381807c5b6c75711..d19b070e967c777286e41e710ae9fdd48fa422d1 100644
--- a/pynq_networking/lib/mqttsn.py
+++ b/pynq_networking/lib/mqttsn.py
@@ -31,7 +31,7 @@
import struct
import logging
logging.getLogger("scapy.runtime").setLevel(logging.ERROR)
-from scapy.all import *
+from kamene.all import *
__author__ = "Stephen Neuendorffer"
diff --git a/pynq_networking/lib/mqttsn_hw.py b/pynq_networking/lib/mqttsn_hw.py
old mode 100755
new mode 100644
index d1cc619d38f2ce15f57b15631dca63ba08795a40..093e2e2a399366abc9c897626da85255ac11f323
--- a/pynq_networking/lib/mqttsn_hw.py
+++ b/pynq_networking/lib/mqttsn_hw.py
@@ -31,7 +31,7 @@
import struct
import logging
logging.getLogger("scapy.runtime").setLevel(logging.ERROR)
-from scapy.all import *
+from kamene.all import *
from .pynqsocket import L2PynqSocket
from .broker import ip_str_to_int, mac_str_to_int, int_2_ip_str
from .mqttsn import *
diff --git a/pynq_networking/lib/mqttsn_sw.py b/pynq_networking/lib/mqttsn_sw.py
old mode 100755
new mode 100644
index 516dbbb40610bbd22927078cf88eaa925330db9f..396c47157a7a2ca1661fa181e026fd5aba0cdfee
--- a/pynq_networking/lib/mqttsn_sw.py
+++ b/pynq_networking/lib/mqttsn_sw.py
@@ -31,7 +31,7 @@
import struct
import logging
logging.getLogger("scapy.runtime").setLevel(logging.ERROR)
-from scapy.all import *
+from kamene.all import *
from .mqttsn import *
diff --git a/pynq_networking/lib/pynqsocket.py b/pynq_networking/lib/pynqsocket.py
old mode 100755
new mode 100644
index f85acd640737a6582014d95384ede7c8b7cd92fe..bcd0f614a4a9c421a1715986447da30b3fa78d0c
--- a/pynq_networking/lib/pynqsocket.py
+++ b/pynq_networking/lib/pynqsocket.py
@@ -30,7 +30,7 @@
import logging
logging.getLogger("scapy.runtime").setLevel(logging.ERROR)
-from scapy.all import *
+from kamene.all import *
from .slurper import PacketSlurper
diff --git a/setup.py b/setup.py
index 5a699c16e03efccd607e83fdeaf6bc35fac65287..682348b0344a41c2df33ea31767a7a9f86a106d9 100644
--- a/setup.py
+++ b/setup.py
@@ -151,12 +151,11 @@ def if_up_br0():
print("Bringing up br0 done ...")
-if len(sys.argv) > 1 and sys.argv[1] == 'install':
- update_interfaces()
- build_submodules()
- copy_overlay_notebooks()
- run_make("pynq_networking/rsmb/rsmb/src/", "broker_mqtts")
- if_up_br0()
+update_interfaces()
+build_submodules()
+copy_overlay_notebooks()
+run_make("pynq_networking/rsmb/rsmb/src/", "broker_mqtts")
+if_up_br0()
def package_files(directory):
@@ -169,7 +168,7 @@ def package_files(directory):
pynq_package_files.extend(package_files('pynq_networking'))
setup(name='pynq_networking',
- version='2.3',
+ version='2.4',
description='PYNQ networking package',
author='Xilinx networking group',
author_email='stephenn@xilinx.com',
@@ -180,11 +179,11 @@ setup(name='pynq_networking',
'': pynq_package_files,
},
install_requires=[
- 'scapy-python3',
+ 'kamene',
'wurlitzer',
'pytest-runner',
'paho-mqtt',
'netifaces',
- 'pynq>=2.3'
+ 'pynq>=2.4'
]
)