aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManjukumar Matha <manjukumar.harthikote-matha@xilinx.com>2019-08-16 17:30:32 -0700
committerManjukumar Matha <manjukumar.harthikote-matha@xilinx.com>2019-08-16 17:41:49 -0700
commit68eacd5636849d2c27f6c3fcf4b8ddb47e565fd7 (patch)
treeb327b1ef09cbbfd0814b70bae2580aa58e35f3bf
parentb057aed4680ce67b280fed0e825c4d379955a199 (diff)
downloadmeta-xilinx-68eacd5636849d2c27f6c3fcf4b8ddb47e565fd7.tar.gz
meta-xilinx-68eacd5636849d2c27f6c3fcf4b8ddb47e565fd7.tar.bz2
meta-xilinx-68eacd5636849d2c27f6c3fcf4b8ddb47e565fd7.zip
conf/machine/*-zynq7.conf: Fix UBOOT_ELF for upstream u-boot version
This patch fixes the u-boot issue in do_install | DEBUG: Executing shell function do_install | install: cannot stat 'microzed_zynq7-poky-linux-gnueabi/u-boot/1_2019.01-r0/build/u-boot.elf': No such file or directory Signed-off-by: Manjukumar Matha <manjukumar.harthikote-matha@xilinx.com>
-rw-r--r--meta-xilinx-bsp/conf/machine/microzed-zynq7.conf1
-rw-r--r--meta-xilinx-bsp/conf/machine/picozed-zynq7.conf1
-rw-r--r--meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf1
-rw-r--r--meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf1
-rw-r--r--meta-xilinx-bsp/conf/machine/zybo-zynq7.conf1
5 files changed, 5 insertions, 0 deletions
diff --git a/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf b/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf
index 8869424..83c5fc1 100644
--- a/meta-xilinx-bsp/conf/machine/microzed-zynq7.conf
+++ b/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-bsp/conf/machine/picozed-zynq7.conf b/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf
index 911bf90..c229dac 100644
--- a/meta-xilinx-bsp/conf/machine/picozed-zynq7.conf
+++ b/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-bsp/conf/machine/zedboard-zynq7.conf b/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf
index 36c51b7..0b0a0de 100644
--- a/meta-xilinx-bsp/conf/machine/zedboard-zynq7.conf
+++ b/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-bsp/conf/machine/zybo-linux-bd-zynq7.conf b/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf
index ba355d5..87634fc 100644
--- a/meta-xilinx-bsp/conf/machine/zybo-linux-bd-zynq7.conf
+++ b/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-bsp/conf/machine/zybo-zynq7.conf b/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf
index 049add9..732fa94 100644
--- a/meta-xilinx-bsp/conf/machine/zybo-zynq7.conf
+++ b/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 \