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 <bradleyb@fuzziesquirrel.com>

12 files changed, 109 insertions, 1 deletions

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 3d927e76f..2ffd5b21f 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
@@ -33,6 +33,11 @@ PREFERRED_PROVIDER_virtual/egl_mali400 = "libmali-xlnx"
 PREFERRED_PROVIDER_virtual/libgl_mali400 = "mesa-gl"
 PREFERRED_PROVIDER_virtual/mesa_mali400 = "mesa-gl"
 
+# microblaze does not get on with pie for reasons not looked into as yet
+GCCPIE_microblaze = ""
+GLIBCPIE_microblaze = ""
+SECURITY_CFLAGS_microblaze = ""
+SECURITY_LDFLAGS_microblaze = ""
 
 XSERVER ?= " \
 	xserver-xorg \
diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf b/meta-xilinx/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf
index 73ff40fdd..d79e4efd9 100644
--- a/meta-xilinx/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf
+++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/kc705-microblazeel.conf
@@ -6,7 +6,7 @@
 require conf/machine/include/tune-microblaze.inc
 require conf/machine/include/machine-xilinx-default.inc
 
-TUNE_FEATURES_tune-microblaze += "v10.0 barrel-shift reorder pattern-compare multiply-high divide-hard"
+TUNE_FEATURES_tune-microblaze += "v11.0 barrel-shift reorder pattern-compare multiply-high divide-hard"
 
 MACHINE_FEATURES = ""
 
diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-mh-div-generic.conf b/meta-xilinx/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-mh-div-generic.conf
new file mode 100644
index 000000000..00aede111
--- /dev/null
+++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-mh-div-generic.conf
@@ -0,0 +1,17 @@
+#@TYPE: Machine
+#@NAME: microblazeel-v11.0-bs-cmp-mh-div-generic
+#@DESCRIPTION: microblazeel-v11.0-bs-cmp-mh-div
+
+require conf/machine/include/tune-microblaze.inc
+require conf/machine/include/machine-xilinx-default.inc
+
+TUNE_FEATURES_tune-microblaze += "v11.0 barrel-shift pattern-compare reorder divide-hard multiply-high"
+
+MACHINE_FEATURES = ""
+
+KERNEL_IMAGETYPE = "linux.bin.ub"
+KERNEL_IMAGETYPES = ""
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+EXTRA_IMAGEDEPENDS += "libyaml-native python3-cython-native python3-pyyaml-native"
diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-ml-generic.conf b/meta-xilinx/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-ml-generic.conf
new file mode 100644
index 000000000..30afbd71b
--- /dev/null
+++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/microblazeel-v11.0-bs-cmp-ml-generic.conf
@@ -0,0 +1,17 @@
+#@TYPE: Machine
+#@NAME: microblazeel-v11.0-bs-cmp-ml-generic
+#@DESCRIPTION: microblazeel-v11.0-bs-cmp-ml
+
+require conf/machine/include/tune-microblaze.inc
+require conf/machine/include/machine-xilinx-default.inc
+
+TUNE_FEATURES_tune-microblaze += "v11.0 barrel-shift reorder pattern-compare multiply-low"
+
+MACHINE_FEATURES = ""
+
+KERNEL_IMAGETYPE = "linux.bin.ub"
+KERNEL_IMAGETYPES = ""
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+EXTRA_IMAGEDEPENDS += "libyaml-native python3-cython-native python3-pyyaml-native"
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 \
diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf b/meta-xilinx/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf
index 911bf90ed..c229dac65 100644
--- a/meta-xilinx/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf
+++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf
@@ -18,6 +18,7 @@ MACHINE_FEATURES = "ext2 vfat usbhost usbgadget"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
 UBOOT_MACHINE = "zynq_picozed_config"
 SPL_BINARY ?= "spl/boot.bin"
+UBOOT_ELF_zynq = "u-boot"
 
 EXTRA_IMAGEDEPENDS += " \
 		u-boot-zynq-uenv \
diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf b/meta-xilinx/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf
new file mode 100644
index 000000000..04508540d
--- /dev/null
+++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/zcu1285-zynqmp.conf
@@ -0,0 +1,38 @@
+#@TYPE: Machine
+#@NAME: zcu1285-zynqmp
+#@DESCRIPTION: Machine support for ZCU1285 Evaluation Board.
+#
+
+SOC_VARIANT ?= "dr"
+
+require conf/machine/include/tune-zynqmp.inc
+require conf/machine/include/machine-xilinx-overrides.inc
+require conf/machine/include/machine-xilinx-default.inc
+
+MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
+
+UBOOT_MACHINE = "xilinx_zynqmp_zc1275_revB_defconfig"
+SPL_BINARY ?= "spl/boot.bin"
+
+SERIAL_CONSOLE ?= "115200 ttyPS0"
+
+SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
+
+KERNEL_DEVICETREE = "xilinx/zynqmp-zcu1285-revA.dtb"
+
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-xlnx"
+PREFERRED_PROVIDER_virtual/bootloader ?= "u-boot-xlnx"
+
+PMU_FIRMWARE_IMAGE_NAME ?= "pmu-firmware-zynqmp-pmu"
+PMU_FIRMWARE_DEPLOY_DIR ?= "${TOPDIR}/pmutmp/deploy/images/zynqmp-pmu"
+
+EXTRA_IMAGEDEPENDS += " \
+		u-boot-zynq-uenv \
+		arm-trusted-firmware \
+		virtual/boot-bin \
+		virtual/bootloader \
+		"
+IMAGE_BOOT_FILES += " \
+		uEnv.txt \
+		atf-uboot.ub \
+		"
diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf b/meta-xilinx/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf
index 36c51b70b..0b0a0de28 100644
--- a/meta-xilinx/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf
+++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf
@@ -17,6 +17,7 @@ require conf/machine/include/machine-xilinx-default.inc
 # u-boot configuration
 UBOOT_MACHINE = "zynq_zed_config"
 SPL_BINARY ?= "spl/boot.bin"
+UBOOT_ELF_zynq = "u-boot"
 
 EXTRA_IMAGEDEPENDS += " \
 		u-boot-zynq-uenv \
diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf b/meta-xilinx/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf
index ba355d568..87634fcc2 100644
--- a/meta-xilinx/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf
+++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf
@@ -22,6 +22,7 @@ MACHINE_ESSENTIAL_EXTRA_RDEPENDS += "device-tree"
 UBOOT_MACHINE = "zynq_zybo_config"
 SPL_BINARY ?= "spl/boot.bin"
 FORCE_PLATFORM_INIT = "1"
+UBOOT_ELF_zynq = "u-boot"
 
 EXTRA_IMAGEDEPENDS += " \
 		u-boot-zynq-uenv \
diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf b/meta-xilinx/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf
index 049add9cc..732fa9435 100644
--- a/meta-xilinx/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf
+++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf
@@ -18,6 +18,7 @@ MACHINE_FEATURES = "ext2 vfat usbhost usbgadget"
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
 UBOOT_MACHINE = "zynq_zybo_config"
 SPL_BINARY ?= "spl/boot.bin"
+UBOOT_ELF_zynq = "u-boot"
 
 EXTRA_IMAGEDEPENDS += " \
 		u-boot-zynq-uenv \
diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/zynq-generic.conf b/meta-xilinx/meta-xilinx-bsp/conf/machine/zynq-generic.conf
new file mode 100644
index 000000000..12fd13881
--- /dev/null
+++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/zynq-generic.conf
@@ -0,0 +1,11 @@
+#@TYPE: Machine
+#@NAME:
+#@DESCRIPTION: zynq devices
+
+require conf/machine/include/tune-zynq.inc
+require conf/machine/include/machine-xilinx-overrides.inc
+require conf/machine/include/machine-xilinx-default.inc
+
+MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost usbgadget"
+
+EXTRA_IMAGEDEPENDS += "libyaml-native python3-cython-native python3-pyyaml-native"
diff --git a/meta-xilinx/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf b/meta-xilinx/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf
new file mode 100644
index 000000000..98385d251
--- /dev/null
+++ b/meta-xilinx/meta-xilinx-bsp/conf/machine/zynqmp-generic.conf
@@ -0,0 +1,15 @@
+#@TYPE: Machine
+#@NAME:
+#@DESCRIPTION: zynqmp devices
+
+require conf/machine/include/tune-zynqmp.inc
+require conf/machine/include/machine-xilinx-overrides.inc
+require conf/machine/include/machine-xilinx-default.inc
+require conf/machine/include/machine-xilinx-qemu.inc
+
+MACHINE_FEATURES = "rtc ext2 ext3 vfat usbhost"
+
+PREFERRED_PROVIDER_qemu-helper-native = "qemu-xilinx-helper-native"
+
+EXTRA_IMAGEDEPENDS += "libyaml-native python3-cython-native python3-pyyaml-native"
+