diff options
8 files changed, 113 insertions, 2 deletions
diff --git a/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc b/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc index 2aceba4f..a83bdebe 100644 --- a/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc +++ b/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc @@ -1,7 +1,7 @@ DESCRIPTION = "ARM Trusted Firmware" LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://license.md;md5=829bdeb34c1d9044f393d5a16c068371" +LIC_FILES_CHKSUM = "file://license.rst;md5=33065335ea03d977d0569f270b39603e" PROVIDES = "virtual/arm-trusted-firmware" @@ -13,6 +13,7 @@ S = "${WORKDIR}/git" B = "${WORKDIR}/build" XILINX_RELEASE_VERSION ?= "" +ATF_VERSION ?= "1.4" ATF_VERSION_EXTENSION ?= "-xilinx-${XILINX_RELEASE_VERSION}" PV = "${ATF_VERSION}${ATF_VERSION_EXTENSION}+git${SRCPV}" diff --git a/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2018.1.bb b/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2018.1.bb new file mode 100644 index 00000000..6a9eea68 --- /dev/null +++ b/meta-xilinx-bsp/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware_2018.1.bb @@ -0,0 +1,7 @@ +ATF_VERSION = "1.4" +XILINX_RELEASE_VERSION = "v2018.1" +BRANCH ?= "master" +SRCREV ?= "df4a7e97d57494c7d79de51b1e0e450d982cea98" + +include arm-trusted-firmware.inc + diff --git a/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2018.1.bb b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2018.1.bb new file mode 100644 index 00000000..0b5b085a --- /dev/null +++ b/meta-xilinx-bsp/recipes-bsp/u-boot/u-boot-xlnx_2018.1.bb @@ -0,0 +1,23 @@ +UBOOT_VERSION = "v2018.01" +XILINX_RELEASE_VERSION = "v2018.1" + +UBRANCH ?= "master" + +SRCREV ?= "1c81b42a326e5b74a5b79e55de9c52b5781b7a8a" + +include u-boot-xlnx.inc +include u-boot-spl-zynq-init.inc + +LICENSE = "GPLv2+" +LIC_FILES_CHKSUM = "file://README;beginline=1;endline=6;md5=157ab8408beab40cd8ce1dc69f702a6c" + +# u-boot-xlnx has support for these +HAS_PLATFORM_INIT ?= " \ + zynq_microzed_config \ + zynq_zed_config \ + zynq_zc702_config \ + zynq_zc706_config \ + zynq_zybo_config \ + xilinx_zynqmp_zcu102_rev1_0_config \ + " + diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/files/memfd.patch b/meta-xilinx-bsp/recipes-devtools/qemu/files/memfd.patch new file mode 100644 index 00000000..62e8d380 --- /dev/null +++ b/meta-xilinx-bsp/recipes-devtools/qemu/files/memfd.patch @@ -0,0 +1,57 @@ +Upstream-Status: Backport +Signed-off-by: Ross Burton <ross.burton@intel.com> + +From 75e5b70e6b5dcc4f2219992d7cffa462aa406af0 Mon Sep 17 00:00:00 2001 +From: Paolo Bonzini <pbonzini@redhat.com> +Date: Tue, 28 Nov 2017 11:51:27 +0100 +Subject: [PATCH] memfd: fix configure test +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Recent glibc added memfd_create in sys/mman.h. This conflicts with +the definition in util/memfd.c: + + /builddir/build/BUILD/qemu-2.11.0-rc1/util/memfd.c:40:12: error: static declaration of memfd_create follows non-static declaration + +Fix the configure test, and remove the sys/memfd.h inclusion since the +file actually does not exist---it is a typo in the memfd_create(2) man +page. + +Cc: Marc-André Lureau <marcandre.lureau@redhat.com> +Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> +--- + configure | 2 +- + util/memfd.c | 4 +--- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/configure b/configure +index 9c8aa5a98b..99ccc1725a 100755 +--- a/configure ++++ b/configure +@@ -3923,7 +3923,7 @@ fi + # check if memfd is supported + memfd=no + cat > $TMPC << EOF +-#include <sys/memfd.h> ++#include <sys/mman.h> + + int main(void) + { +diff --git a/util/memfd.c b/util/memfd.c +index 4571d1aba8..412e94a405 100644 +--- a/util/memfd.c ++++ b/util/memfd.c +@@ -31,9 +31,7 @@ + + #include "qemu/memfd.h" + +-#ifdef CONFIG_MEMFD +-#include <sys/memfd.h> +-#elif defined CONFIG_LINUX ++#if defined CONFIG_LINUX && !defined CONFIG_MEMFD + #include <sys/syscall.h> + #include <asm/unistd.h> + +-- +2.11.0 diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-devicetrees_2018.1.bb b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-devicetrees_2018.1.bb new file mode 100644 index 00000000..a73b9e57 --- /dev/null +++ b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-devicetrees_2018.1.bb @@ -0,0 +1,6 @@ +require qemu-devicetrees.inc + +XILINX_RELEASE_VERSION = "v2018.1" + +BRANCH ?= "master" +SRCREV ?= "d5017f8119b6493d8b2fcdfd5caa4e8b16580877" diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx.inc b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx.inc index 9b59ecce..b6c5dee5 100644 --- a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx.inc +++ b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx.inc @@ -10,12 +10,16 @@ LIC_FILES_CHKSUM = " \ file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913 \ " +FILESEXTRAPATHS_prepend := "${THISDIR}/files:" + PV = "${XILINX_QEMU_VERSION}-xilinx-${XILINX_RELEASE_VERSION}+git${SRCPV}" BRANCH ?= "" REPO ?= "git://github.com/Xilinx/qemu.git;protocol=https" BRANCHARG = "${@['nobranch=1', 'branch=${BRANCH}'][d.getVar('BRANCH', True) != '']}" -SRC_URI = "${REPO};${BRANCHARG}" +SRC_URI = "${REPO};${BRANCHARG} \ + file://memfd.patch \ + " S = "${WORKDIR}/git" diff --git a/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx_2018.1.bb b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx_2018.1.bb new file mode 100644 index 00000000..1d6697cd --- /dev/null +++ b/meta-xilinx-bsp/recipes-devtools/qemu/qemu-xilinx_2018.1.bb @@ -0,0 +1,6 @@ +require qemu-xilinx.inc + +XILINX_RELEASE_VERSION = "v2018.1" +XILINX_QEMU_VERSION ?= "v2.11.0" +BRANCH ?= "master" +SRCREV ?= "1d5516986ea296d91a599ac23252e302a4003914" diff --git a/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2018.1.bb b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2018.1.bb new file mode 100644 index 00000000..c3a8f764 --- /dev/null +++ b/meta-xilinx-bsp/recipes-kernel/linux/linux-xlnx_2018.1.bb @@ -0,0 +1,7 @@ +LINUX_VERSION = "4.14" +XILINX_RELEASE_VERSION = "v2018.1" +KBRANCH ?= "xlnx_rebase_v4.14" +SRCREV ?= "4ac76ffacb54712b0361e51d0b7156e53d062e3c" + +include linux-xlnx.inc + |