7 files changed, 328 insertions, 87 deletions

diff --git a/conf/template.zcu102-zynqmp/bblayers.conf.sample b/conf/template.zcu102-zynqmp/bblayers.conf.sample
new file mode 100644
index 0000000..02157cd
--- /dev/null
+++ b/conf/template.zcu102-zynqmp/bblayers.conf.sample
@@ -0,0 +1,21 @@
+# POKY_BBLAYERS_CONF_VERSION is increased each time build/conf/bblayers.conf
+# changes incompatibly
+POKY_BBLAYERS_CONF_VERSION = "2"
+
+BBPATH = "${TOPDIR}"
+BBFILES ?= ""
+
+BBLAYERS ?= " \
+  ##OEROOT##/meta \
+  ##OEROOT##/meta-poky \
+  ##OEROOT##/meta-enea-bsp-common \
+  ##OEROOT##/meta-enea-bsp-arm \
+  ##OEROOT##/meta-xilinx/meta-xilinx-bsp \
+  ##OEROOT##/meta-el-common \
+  ##OEROOT##/meta-openembedded/meta-oe \
+  ##OEROOT##/meta-openembedded/meta-networking \
+  ##OEROOT##/meta-openembedded/meta-filesystems \
+  ##OEROOT##/meta-openembedded/meta-python \
+  ##OEROOT##/meta-amp \
+  ##OEROOT##/meta-el-accelerated \
+  "
diff --git a/conf/template.zcu102-zynqmp/conf-notes.txt b/conf/template.zcu102-zynqmp/conf-notes.txt
new file mode 100644
index 0000000..e85f39b
--- /dev/null
+++ b/conf/template.zcu102-zynqmp/conf-notes.txt
@@ -0,0 +1,10 @@
+Common targets are:
+    enea-image-accelerated
+        the platform release image.
+
+    enea-image-accelerated-sdk
+        builds an image containing userspace tools and kernel configurations
+        necessary for developing, debugging and profiling applications and
+        kernel modules. In combination with '-c populate_sdk' builds a
+        self-extracting archive installing the complete Linux cross-compilation
+        toolchain for the platform.
diff --git a/conf/template.zcu102-zynqmp/local.conf.sample b/conf/template.zcu102-zynqmp/local.conf.sample
new file mode 100644
index 0000000..eed45b8
--- /dev/null
+++ b/conf/template.zcu102-zynqmp/local.conf.sample
@@ -0,0 +1,250 @@
+#
+# This file is your local configuration file and is where all local user settings
+# are placed. The comments in this file give some guide to the options a new user
+# to the system might want to change but pretty much any configuration option can
+# be set in this file. More adventurous users can look at local.conf.extended
+# which contains other examples of configuration which can be placed in this file
+# but new users likely won't need any of them initially.
+#
+# Lines starting with the '#' character are commented out and in some cases the
+# default values are provided as comments to show people example syntax. Enabling
+# the option is a question of removing the # character and making any change to the
+# variable as required.
+
+#
+# Machine Selection
+#
+# You need to select a specific machine to target the build with. There are a selection
+# of emulated machines available which can boot and run in the QEMU emulator:
+#
+#MACHINE ?= "qemuarm"
+#MACHINE ?= "qemuarm64"
+#MACHINE ?= "qemumips"
+#MACHINE ?= "qemumips64"
+#MACHINE ?= "qemuppc"
+#MACHINE ?= "qemux86"
+#MACHINE ?= "qemux86-64"
+#
+# There are also the following hardware board target machines included for
+# demonstration purposes:
+#
+#MACHINE ?= "beaglebone"
+#MACHINE ?= "genericx86"
+#MACHINE ?= "genericx86-64"
+#MACHINE ?= "mpc8315e-rdb"
+#MACHINE ?= "edgerouter"
+#
+# This sets the default machine to be qemux86 if no other machine is selected:
+MACHINE = "zcu102-zynqmp"
+TOOLCHAIN_TARGET_TASK_append = " kernel-devsrc"
+
+#
+# Where to place downloads
+#
+# During a first build the system will download many different source code tarballs
+# from various upstream projects. This can take a while, particularly if your network
+# connection is slow. These are all stored in DL_DIR. When wiping and rebuilding you
+# can preserve this directory to speed up this part of subsequent builds. This directory
+# is safe to share between multiple builds on the same machine too.
+#
+# The default is a downloads directory under TOPDIR which is the build directory.
+#
+#DL_DIR ?= "${TOPDIR}/downloads"
+
+#
+# Where to place shared-state files
+#
+# BitBake has the capability to accelerate builds based on previously built output.
+# This is done using "shared state" files which can be thought of as cache objects
+# and this option determines where those files are placed.
+#
+# You can wipe out TMPDIR leaving this directory intact and the build would regenerate
+# from these files if no changes were made to the configuration. If changes were made
+# to the configuration, only shared state files where the state was still valid would
+# be used (done using checksums).
+#
+# The default is a sstate-cache directory under TOPDIR.
+#
+#SSTATE_DIR ?= "${TOPDIR}/sstate-cache"
+
+#
+# Where to place the build output
+#
+# This option specifies where the bulk of the building work should be done and
+# where BitBake should place its temporary files and output. Keep in mind that
+# this includes the extraction and compilation of many applications and the toolchain
+# which can use Gigabytes of hard disk space.
+#
+# The default is a tmp directory under TOPDIR.
+#
+#TMPDIR = "${TOPDIR}/tmp"
+
+#
+# Default policy config
+#
+# The distribution setting controls which policy settings are used as defaults.
+# The default value is fine for general Yocto project use, at least initially.
+# Ultimately when creating custom policy, people will likely end up subclassing
+# these defaults.
+#
+DISTRO = "enea"
+# As an example of a subclass there is a "bleeding" edge policy configuration
+# where many versions are set to the absolute latest code from the upstream
+# source control systems. This is just mentioned here as an example, its not
+# useful to most new users.
+# DISTRO ?= "poky-bleeding"
+
+#
+# Package Management configuration
+#
+# This variable lists which packaging formats to enable. Multiple package backends
+# can be enabled at once and the first item listed in the variable will be used
+# to generate the root filesystems.
+# Options are:
+#  - 'package_deb' for debian style deb files
+#  - 'package_ipk' for ipk files are used by opkg (a debian style embedded package manager)
+#  - 'package_rpm' for rpm style packages
+# E.g.: PACKAGE_CLASSES ?= "package_rpm package_deb package_ipk"
+# We default to rpm:
+PACKAGE_CLASSES = "package_rpm"
+
+#
+# SDK/ADT target architecture
+#
+# This variable specifies the architecture to build SDK/ADT items for and means
+# you can build the SDK packages for architectures other than the machine you are
+# running the build on (i.e. building i686 packages on an x86_64 host).
+# Supported values are i686 and x86_64
+#SDKMACHINE ?= "i686"
+
+#
+# Extra image configuration defaults
+#
+# The EXTRA_IMAGE_FEATURES variable allows extra packages to be added to the generated
+# images. Some of these options are added to certain image types automatically. The
+# variable can contain the following options:
+#  "dbg-pkgs"       - add -dbg packages for all installed packages
+#                     (adds symbol information for debugging/profiling)
+#  "dev-pkgs"       - add -dev packages for all installed packages
+#                     (useful if you want to develop against libs in the image)
+#  "ptest-pkgs"     - add -ptest packages for all ptest-enabled packages
+#                     (useful if you want to run the package test suites)
+#  "tools-sdk"      - add development tools (gcc, make, pkgconfig etc.)
+#  "tools-debug"    - add debugging tools (gdb, strace)
+#  "eclipse-debug"  - add Eclipse remote debugging support
+#  "tools-profile"  - add profiling tools (oprofile, lttng, valgrind)
+#  "tools-testapps" - add useful testing tools (ts_print, aplay, arecord etc.)
+#  "debug-tweaks"   - make an image suitable for development
+#                     e.g. ssh root access has a blank password
+# There are other application targets that can be used here too, see
+# meta/classes/image.bbclass and meta/classes/core-image.bbclass for more details.
+# We default to enabling the debugging tweaks.
+EXTRA_IMAGE_FEATURES = "debug-tweaks"
+
+#
+# Additional image features
+#
+# The following is a list of additional classes to use when building images which
+# enable extra features. Some available options which can be included in this variable
+# are:
+#   - 'buildstats' collect build statistics
+#   - 'image-mklibs' to reduce shared library files size for an image
+#   - 'image-prelink' in order to prelink the filesystem image
+#   - 'image-swab' to perform host system intrusion detection
+# NOTE: if listing mklibs & prelink both, then make sure mklibs is before prelink
+# NOTE: mklibs also needs to be explicitly enabled for a given image, see local.conf.extended
+USER_CLASSES ?= "buildstats image-mklibs image-prelink"
+
+#
+# Runtime testing of images
+#
+# The build system can test booting virtual machine images under qemu (an emulator)
+# after any root filesystems are created and run tests against those images. To
+# enable this uncomment this line. See classes/testimage(-auto).bbclass for
+# further details.
+#TEST_IMAGE = "1"
+#
+# Interactive shell configuration
+#
+# Under certain circumstances the system may need input from you and to do this it
+# can launch an interactive shell. It needs to do this since the build is
+# multithreaded and needs to be able to handle the case where more than one parallel
+# process may require the user's attention. The default is iterate over the available
+# terminal types to find one that works.
+#
+# Examples of the occasions this may happen are when resolving patches which cannot
+# be applied, to use the devshell or the kernel menuconfig
+#
+# Supported values are auto, gnome, xfce, rxvt, screen, konsole (KDE 3.x only), none
+# Note: currently, Konsole support only works for KDE 3.x due to the way
+# newer Konsole versions behave
+#OE_TERMINAL = "auto"
+# By default disable interactive patch resolution (tasks will just fail instead):
+PATCHRESOLVE = "noop"
+
+#
+# Disk Space Monitoring during the build
+#
+# Monitor the disk space during the build. If there is less that 1GB of space or less
+# than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully
+# shutdown the build. If there is less that 100MB or 1K inodes, perform a hard abort
+# of the build. The reason for this is that running completely out of space can corrupt
+# files and damages the build in ways which may not be easily recoverable.
+# It's necesary to monitor /tmp, if there is no space left the build will fail
+# with very exotic errors.
+BB_DISKMON_DIRS = "\
+    STOPTASKS,${TMPDIR},1G,100K \
+    STOPTASKS,${DL_DIR},1G,100K \
+    STOPTASKS,${SSTATE_DIR},1G,100K \
+    STOPTASKS,/tmp,100M,100K \
+    ABORT,${TMPDIR},100M,1K \
+    ABORT,${DL_DIR},100M,1K \
+    ABORT,${SSTATE_DIR},100M,1K \
+    ABORT,/tmp,10M,1K"
+
+#
+# Shared-state files from other locations
+#
+# As mentioned above, shared state files are prebuilt cache data objects which can
+# used to accelerate build time. This variable can be used to configure the system
+# to search other mirror locations for these objects before it builds the data itself.
+#
+# This can be a filesystem directory, or a remote url such as http or ftp. These
+# would contain the sstate-cache results from previous builds (possibly from other
+# machines). This variable works like fetcher MIRRORS/PREMIRRORS and points to the
+# cache locations to check for the shared objects.
+# NOTE: if the mirror uses the same structure as SSTATE_DIR, you need to add PATH
+# at the end as shown in the examples below. This will be substituted with the
+# correct path within the directory structure.
+#SSTATE_MIRRORS ?= "\
+#file://.* http://someserver.tld/share/sstate/PATH;downloadfilename=PATH \n \
+#file://.* file:///some/local/dir/sstate/PATH"
+
+
+#
+# Qemu configuration
+#
+# By default qemu will build with a builtin VNC server where graphical output can be
+# seen. The two lines below enable the SDL backend too. By default libsdl-native will
+# be built, if you want to use your host's libSDL instead of the minimal libsdl built
+# by libsdl-native then uncomment the ASSUME_PROVIDED line below.
+PACKAGECONFIG_append_pn-qemu-native = " sdl"
+PACKAGECONFIG_append_pn-nativesdk-qemu = " sdl"
+#ASSUME_PROVIDED += "libsdl-native"
+
+# CONF_VERSION is increased each time build/conf/ changes incompatibly and is used to
+# track the version of this file when it was generated. This can safely be ignored if
+# this doesn't mean anything to you.
+CONF_VERSION = "1"
+
+DISTRO_FEATURES_remove = " x11"
+
+LICENSE_FLAGS_WHITELIST = "commercial_oseutils"
+
+BBMASK += " \
+    meta-enea-bsp-arm/recipes-kernel/linux/linux-raspberrypi-rt_4.19.bbappend \
+    meta-enea-bsp-arm/recipes-kernel/linux/linux-raspberrypi_4.9.bbappend \
+    meta-amp/recipes-kernel/linux/linux-intel_%.bbappend \
+    "
+# For Ultrascale+ don't include the kernel source in the image
+IMAGE_INSTALL_remove += "kernel-devsrc"
diff --git a/recipes-kernel/linux/kernel-devsrc.bb b/recipes-kernel/linux/kernel-devsrc.bb
index 8bbfa23..8522366 100644
--- a/recipes-kernel/linux/kernel-devsrc.bb
+++ b/recipes-kernel/linux/kernel-devsrc.bb
@@ -83,4 +83,4 @@ do_install[lockfiles] = "${TMPDIR}/kernel-scripts.lock"
 
 PACKAGES = "kernel-devsrc"
 FILES_${PN} = "${KERNEL_SRC_PATH}"
-RDEPENDS_${PN} = "bc"
+RDEPENDS_${PN} = "bc python python3"
diff --git a/recipes-kernel/linux/kernel.devsrc.acclx b/recipes-kernel/linux/kernel.devsrc.acclx
deleted file mode 100644
index 8bbfa23..0000000
--- a/recipes-kernel/linux/kernel.devsrc.acclx
+++ /dev/null
@@ -1,86 +0,0 @@
-SUMMARY = "Linux kernel Development Source"
-DESCRIPTION = "Development source linux kernel. When built, this recipe packages the \
-source of the preferred virtual/kernel provider and makes it available for full kernel \
-development or external module builds"
-
-SECTION = "kernel"
-
-LICENSE = "GPLv2"
-
-inherit linux-kernel-base
-
-# Whilst not a module, this ensures we don't get multilib extended (which would make no sense)
-inherit module-base
-
-# We need the kernel to be staged (unpacked, patched and configured) before
-# we can grab the source and make the source package. We also need the bits from
-# ${B} not to change while we install, so virtual/kernel must finish do_compile.
-do_install[depends] += "virtual/kernel:do_shared_workdir"
-# Need the source, not just the output of populate_sysroot
-do_install[depends] += "virtual/kernel:do_install"
-
-# There's nothing to do here, except install the source where we can package it
-do_fetch[noexec] = "1"
-do_unpack[noexec] = "1"
-do_patch[noexec] = "1"
-do_configure[noexec] = "1"
-do_compile[noexec] = "1"
-do_populate_sysroot[noexec] = "1"
-
-S = "${STAGING_KERNEL_DIR}"
-B = "${STAGING_KERNEL_BUILDDIR}"
-
-KERNEL_VERSION = "${@get_kernelversion_headers('${S}')}"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-
-do_install() {
-        kerneldir=${D}${KERNEL_SRC_PATH}
-        install -d $kerneldir
-
-        #
-        # Copy the staging dir source (and module build support) into the devsrc structure.
-        # We can keep this copy simple and take everything, since a we'll clean up any build
-        # artifacts afterwards, and the extra i/o is not significant
-        #
-        cd ${B}
-        find . -type d -name '.git*' -prune -o -path '.debug' -prune -o -type f -print0 | cpio --null -pdlu $kerneldir
-        cd ${S}
-        find . -type d -name '.git*' -prune -o -type d -name '.kernel-meta' -prune -o -type f -print0 | cpio --null -pdlu $kerneldir
-
-        # Explicitly set KBUILD_OUTPUT to ensure that the image directory is cleaned and not
-        # The main build artifacts. We clean the directory to avoid QA errors on mismatched
-        # architecture (since scripts and helpers are native format).
-        KBUILD_OUTPUT="$kerneldir"
-        oe_runmake -C $kerneldir CC="${KERNEL_CC}" LD="${KERNEL_LD}" clean _mrproper_scripts
-        # make clean generates an absolute path symlink called "source"
-        # in $kerneldir points to $kerneldir, which doesn't make any
-        # sense, so remove it.
-        if [ -L $kerneldir/source ]; then
-            bbnote "Removing $kerneldir/source symlink"
-            rm -f $kerneldir/source
-        fi
-
-        # As of Linux kernel version 3.0.1, the clean target removes
-        # arch/powerpc/lib/crtsavres.o which is present in
-        # KBUILD_LDFLAGS_MODULE, making it required to build external modules.
-        if [ ${ARCH} = "powerpc" ]; then
-                mkdir -p $kerneldir/arch/powerpc/lib/
-                cp ${B}/arch/powerpc/lib/crtsavres.o $kerneldir/arch/powerpc/lib/crtsavres.o
-        fi
-
-        # Remove fixdep/objtool as they won't be target binaries
-        for i in fixdep objtool; do
-                if [ -e $kerneldir/tools/objtool/$i ]; then
-                        rm -rf $kerneldir/tools/objtool/$i
-                fi
-        done
-
-        chown -R root:root ${D}
-}
-# Ensure we don't race against "make scripts" during cpio
-do_install[lockfiles] = "${TMPDIR}/kernel-scripts.lock"
-
-PACKAGES = "kernel-devsrc"
-FILES_${PN} = "${KERNEL_SRC_PATH}"
-RDEPENDS_${PN} = "bc"
diff --git a/recipes-u-boot/u-boot/files/0001-Fixed-missformed-CONFIG_PMUFW_INIT_FILE.patch b/recipes-u-boot/u-boot/files/0001-Fixed-missformed-CONFIG_PMUFW_INIT_FILE.patch
new file mode 100644
index 0000000..3d54c3b
--- /dev/null
+++ b/recipes-u-boot/u-boot/files/0001-Fixed-missformed-CONFIG_PMUFW_INIT_FILE.patch
@@ -0,0 +1,35 @@
+From 845ef4193cf00feef7de9c248adab642eda725b8 Mon Sep 17 00:00:00 2001
+From: Daniel BORNAZ <daniel.bornaz@enea.com>
+Date: Tue, 7 Jul 2020 11:13:02 +0200
+Subject: [PATCH] Fixed missformed CONFIG_PMUFW_INIT_FILE
+
+---
+ scripts/Makefile.spl | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl
+index e5b604e2d2..9ae6672907 100644
+--- a/scripts/Makefile.spl
++++ b/scripts/Makefile.spl
+@@ -180,12 +180,12 @@ ifdef CONFIG_ARCH_ZYNQ
+ MKIMAGEFLAGS_boot.bin = -T zynqimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE)
+ endif
+ ifdef CONFIG_ARCH_ZYNQMP
+-ifneq ($(CONFIG_PMUFW_INIT_FILE),"")
+-spl/boot.bin: zynqmp-check-pmufw
+-zynqmp-check-pmufw: FORCE
+-       ( cd $(srctree) && test -r $(CONFIG_PMUFW_INIT_FILE) ) \
+-               || ( echo "Cannot read $(CONFIG_PMUFW_INIT_FILE)" && false )
+-endif
++# ifneq ($(CONFIG_PMUFW_INIT_FILE),"")
++# spl/boot.bin: zynqmp-check-pmufw
++# zynqmp-check-pmufw: FORCE
++#      ( cd $(srctree) && test -r $(CONFIG_PMUFW_INIT_FILE) ) \
++#              || ( echo "Cannot read $(CONFIG_PMUFW_INIT_FILE)" && false )
++# endif
+ MKIMAGEFLAGS_boot.bin = -T zynqmpimage -R $(srctree)/$(CONFIG_BOOT_INIT_FILE) \
+        -n "$(shell cd $(srctree); readlink -f $(CONFIG_PMUFW_INIT_FILE))"
+ endif
+-- 
+2.20.1
+
diff --git a/recipes-u-boot/u-boot/u-boot-xlnx_2019.1.bbappend b/recipes-u-boot/u-boot/u-boot-xlnx_2019.1.bbappend
new file mode 100644
index 0000000..1d03d10
--- /dev/null
+++ b/recipes-u-boot/u-boot/u-boot-xlnx_2019.1.bbappend
@@ -0,0 +1,11 @@
+include u-boot-spl-zynq-init.inc
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+
+SRC_URI_append = "\
+    file://0001-Fixed-missformed-CONFIG_PMUFW_INIT_FILE.patch \
+    "
+
+python() {
+    d.appendVar("EXTRA_OEMAKE", " TEST=NOTHING")
+}