From 754b8faf0be432fcdcacb340fe95117cac890e40 Mon Sep 17 00:00:00 2001 From: Brad Bishop Date: Tue, 20 Aug 2019 09:16:20 -0400 Subject: subtree updates meta-raspberrypi: b112816e95..2634621374: Vincenzo Pacella (1): linux-raspberrypi: add linux-raspberrypi-rt 4.19 meta-xilinx: f3c8b1c9a8..68eacd5636: Alejandro Enedino Hernandez Samaniego (4): machine-xilinx-default.inc: Disable PIE (ASLR) for Microblaze meta-xilinx-bsp: Update layer compatibility to warrior release meta-xilinx-contrib: Update layer compatibility to warrior release meta-xilinx-standalone: Update layer compatibility to warrior release Jaewon Lee (2): microblaze-kc705-Convert-microblaze-generic-to-k.patch:update patch Update recipes for Xilinx v2019.1 release Manjukumar Matha (7): microblaze: Update to v11.0 u-boot-xlnx.inc: Add bison-native dependency for 2019.01 u-boot-zynq-scr.bb: Recipe to create u-boot.scr for Xilinx devices microblazeel*.conf: Add microblaze generic machines -generic.conf: Add generic machines for Zynq and ZU+ layer.conf: Add warning for dangling bbappends conf/machine/*-zynq7.conf: Fix UBOOT_ELF for upstream u-boot version Michael Monaghan (1): kernel-simpleimage.bbclass: Fix do_prep_simpleimage `[[: not found` Swagath Gadde (1): zcu1285-zynqmp.conf: Add support for zcu1285 board Change-Id: I0e3c5e57b0316f438d3f1fd80bd047dcbbac384e Signed-off-by: Brad Bishop --- meta-xilinx/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf | 1 + 1 file changed, 1 insertion(+) (limited to 'meta-xilinx/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf') diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf b/meta-xilinx/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf index 8869424dc..83c5fc1e5 100644 --- a/meta-xilinx/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf +++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf @@ -14,6 +14,7 @@ MACHINE_FEATURES = "ext2 vfat usbhost" PREFERRED_PROVIDER_virtual/bootloader = "u-boot" UBOOT_MACHINE = "zynq_microzed_config" SPL_BINARY ?= "spl/boot.bin" +UBOOT_ELF_zynq = "u-boot" EXTRA_IMAGEDEPENDS += " \ u-boot-zynq-uenv \ -- cgit v1.2.3