From 1a4b7ee28bf7413af6513fb45ad0d0736048f866 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Sun, 16 Dec 2018 17:11:34 -0800 Subject: reset upstream subtrees to yocto 2.6 Reset the following subtrees on thud HEAD: poky: 87e3a9739d meta-openembedded: 6094ae18c8 meta-security: 31dc4e7532 meta-raspberrypi: a48743dc36 meta-xilinx: c42016e2e6 Also re-apply backports that didn't make it into thud: poky: 17726d0 systemd-systemctl-native: handle Install wildcards meta-openembedded: 4321a5d libtinyxml2: update to 7.0.1 042f0a3 libcereal: Add native and nativesdk classes e23284f libcereal: Allow empty package 030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG 179a1b9 gtest: update to 1.8.1 Squashed OpenBMC subtree compatibility updates: meta-aspeed: Brad Bishop (1): aspeed: add yocto 2.6 compatibility meta-ibm: Brad Bishop (1): ibm: prepare for yocto 2.6 meta-ingrasys: Brad Bishop (1): ingrasys: set layer compatibility to yocto 2.6 meta-openpower: Brad Bishop (1): openpower: set layer compatibility to yocto 2.6 meta-phosphor: Brad Bishop (3): phosphor: set layer compatibility to thud phosphor: libgpg-error: drop patches phosphor: react to fitimage artifact rename Ed Tanous (4): Dropbear: upgrade options for latest upgrade yocto2.6: update openssl options busybox: remove upstream watchdog patch systemd: Rebase CONFIG_CGROUP_BPF patch Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7 Signed-off-by: Brad Bishop --- .../conf/machine/include/machine-xilinx-board.inc | 2 -- .../machine/include/machine-xilinx-default.inc | 37 ++++++++++++++++++++++ .../conf/machine/include/machine-xilinx-qemu.inc | 6 +--- .../conf/machine/include/tune-versal.inc | 14 ++++++++ .../conf/machine/include/zynqmp-pmu-config.inc | 20 ------------ 5 files changed, 52 insertions(+), 27 deletions(-) create mode 100644 meta-xilinx/meta-xilinx-bsp/conf/machine/include/tune-versal.inc delete mode 100644 meta-xilinx/meta-xilinx-bsp/conf/machine/include/zynqmp-pmu-config.inc (limited to 'meta-xilinx/meta-xilinx-bsp/conf/machine/include') diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/include/machine-xilinx-board.inc b/meta-xilinx/meta-xilinx-bsp/conf/machine/include/machine-xilinx-board.inc index ba9a36be8..17041e41a 100644 --- a/meta-xilinx/meta-xilinx-bsp/conf/machine/include/machine-xilinx-board.inc +++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/include/machine-xilinx-board.inc @@ -2,5 +2,3 @@ EXTRA_IMAGEDEPENDS += "virtual/bootloader" -IMAGE_BOOT_FILES ?= "${KERNEL_IMAGETYPE} ${UBOOT_BINARY}" - diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc b/meta-xilinx/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc index 77fbec884..153a47fba 100644 --- a/meta-xilinx/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc +++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/include/machine-xilinx-default.inc @@ -25,6 +25,14 @@ UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}" UBOOT_ELF ?= "u-boot" UBOOT_ELF_aarch64 ?= "u-boot.elf" +#Hardware accelaration +PREFERRED_PROVIDER_virtual/libgles1_mali400 = "libmali-xlnx" +PREFERRED_PROVIDER_virtual/libgles2_mali400 = "libmali-xlnx" +PREFERRED_PROVIDER_virtual/egl_mali400 = "libmali-xlnx" +PREFERRED_PROVIDER_virtual/libgl_mali400 = "mesa-gl" +PREFERRED_PROVIDER_virtual/mesa_mali400 = "mesa-gl" + + XSERVER ?= " \ xserver-xorg \ xf86-input-evdev \ @@ -34,6 +42,35 @@ XSERVER ?= " \ ${XSERVER_EXT} \ " +IMAGE_BOOT_FILES ?= "${@get_default_image_boot_files(d)}" + +def get_default_image_boot_files(d): + files = [] + + # kernel images + kerneltypes = set((d.getVar("KERNEL_IMAGETYPE") or "").split()) + kerneltypes |= set((d.getVar("KERNEL_IMAGETYPES") or "").split()) + for i in kerneltypes: + files.append(i) + + # u-boot image + if d.getVar("UBOOT_BINARY"): + files.append(d.getVar("UBOOT_BINARY")) + + # device trees (device-tree only), these are first as they are likely desired over the kernel ones + if "device-tree" in (d.getVar("MACHINE_ESSENTIAL_EXTRA_RDEPENDS") or ""): + files.append("devicetree/*.dtb") + + + # device trees (kernel only) + if d.getVar("KERNEL_DEVICETREE"): + dtbs = d.getVar("KERNEL_DEVICETREE").split(" ") + dtbs = [os.path.basename(d) for d in dtbs] + for dtb in dtbs: + files.append(dtb) + + return " ".join(files) + XSERVER_EXT ?= "" XSERVER_EXT_zynqmp ?= "xf86-video-armsoc" diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/include/machine-xilinx-qemu.inc b/meta-xilinx/meta-xilinx-bsp/conf/machine/include/machine-xilinx-qemu.inc index dd275f3b4..5eb4b5c47 100644 --- a/meta-xilinx/meta-xilinx-bsp/conf/machine/include/machine-xilinx-qemu.inc +++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/include/machine-xilinx-qemu.inc @@ -8,15 +8,11 @@ def qemu_default_dtb(d): if d.getVar("IMAGE_BOOT_FILES", True): dtbs = d.getVar("IMAGE_BOOT_FILES", True).split(" ") # IMAGE_BOOT_FILES has extra renaming info in the format ';' + # Note: Wildcard sources work here only because runqemu expands them at run time dtbs = [f.split(";")[0] for f in dtbs] dtbs = [f for f in dtbs if f.endswith(".dtb")] if len(dtbs) != 0: return dtbs[0] - if d.getVar("KERNEL_DEVICETREE", True): - dtbs = d.getVar("KERNEL_DEVICETREE", True).split(" ") - dtbs = [os.path.basename(d) for d in dtbs] - if len(dtbs) != 0: - return d.getVar("KERNEL_IMAGETYPE", True) + "-" + dtbs[0] return "" def qemu_default_serial(d): diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/include/tune-versal.inc b/meta-xilinx/meta-xilinx-bsp/conf/machine/include/tune-versal.inc new file mode 100644 index 000000000..83acf6e08 --- /dev/null +++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/include/tune-versal.inc @@ -0,0 +1,14 @@ +DEFAULTTUNE ?= "aarch64" +SOC_FAMILY ?= "versal" + +# Available SOC_VARIANT's for versal: +# virt + +SOC_VARIANT ?= "" + +require conf/machine/include/arm/arch-armv8.inc +require conf/machine/include/soc-family.inc + +# Linux Configuration +KERNEL_IMAGETYPE ?= "Image" + diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/include/zynqmp-pmu-config.inc b/meta-xilinx/meta-xilinx-bsp/conf/machine/include/zynqmp-pmu-config.inc deleted file mode 100644 index fd9e98090..000000000 --- a/meta-xilinx/meta-xilinx-bsp/conf/machine/include/zynqmp-pmu-config.inc +++ /dev/null @@ -1,20 +0,0 @@ - -# Enable the use of zynqmp-pmu for specific recipes only -def zynqmp_pmu_enable_for_bpns(d): - bpn = d.getVar("BPN") - crossbpns = ["binutils", "gcc"] - targetbpns = ["libgcc", "newlib", "libgloss"] - if bpn in targetbpns: - return True - if bpn in crossbpns and bb.data.inherits_class('cross', d): - return True - return False - -BBCLASSEXTEND_append = "${@' zynqmp-pmu' if zynqmp_pmu_enable_for_bpns(d) else ''}" - -# Add the pkgarch to the extra list, this is done to avoid warnings about -# missing manifests due to implicit dependency chains on populate_sysroot when -# a recipe/task depends on a IMAGE_EXTRADEPENDS/do_deploy task which is -# provided by a zynqmp-pmu-* target. -PACKAGE_EXTRA_ARCHS_append = " microblazeel-v9.2-bs-cmp" - -- cgit v1.2.3