summaryrefslogtreecommitdiffstats
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
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 8869424d..83c5fc1e 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"
14PREFERRED_PROVIDER_virtual/bootloader = "u-boot" 14PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
15UBOOT_MACHINE = "zynq_microzed_config" 15UBOOT_MACHINE = "zynq_microzed_config"
16SPL_BINARY ?= "spl/boot.bin" 16SPL_BINARY ?= "spl/boot.bin"
17UBOOT_ELF_zynq = "u-boot"
17 18
18EXTRA_IMAGEDEPENDS += " \ 19EXTRA_IMAGEDEPENDS += " \
19 u-boot-zynq-uenv \ 20 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 911bf90e..c229dac6 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"
18PREFERRED_PROVIDER_virtual/bootloader = "u-boot" 18PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
19UBOOT_MACHINE = "zynq_picozed_config" 19UBOOT_MACHINE = "zynq_picozed_config"
20SPL_BINARY ?= "spl/boot.bin" 20SPL_BINARY ?= "spl/boot.bin"
21UBOOT_ELF_zynq = "u-boot"
21 22
22EXTRA_IMAGEDEPENDS += " \ 23EXTRA_IMAGEDEPENDS += " \
23 u-boot-zynq-uenv \ 24 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 36c51b70..0b0a0de2 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
17# u-boot configuration 17# u-boot configuration
18UBOOT_MACHINE = "zynq_zed_config" 18UBOOT_MACHINE = "zynq_zed_config"
19SPL_BINARY ?= "spl/boot.bin" 19SPL_BINARY ?= "spl/boot.bin"
20UBOOT_ELF_zynq = "u-boot"
20 21
21EXTRA_IMAGEDEPENDS += " \ 22EXTRA_IMAGEDEPENDS += " \
22 u-boot-zynq-uenv \ 23 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 ba355d56..87634fcc 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"
22UBOOT_MACHINE = "zynq_zybo_config" 22UBOOT_MACHINE = "zynq_zybo_config"
23SPL_BINARY ?= "spl/boot.bin" 23SPL_BINARY ?= "spl/boot.bin"
24FORCE_PLATFORM_INIT = "1" 24FORCE_PLATFORM_INIT = "1"
25UBOOT_ELF_zynq = "u-boot"
25 26
26EXTRA_IMAGEDEPENDS += " \ 27EXTRA_IMAGEDEPENDS += " \
27 u-boot-zynq-uenv \ 28 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 049add9c..732fa943 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"
18PREFERRED_PROVIDER_virtual/bootloader = "u-boot" 18PREFERRED_PROVIDER_virtual/bootloader = "u-boot"
19UBOOT_MACHINE = "zynq_zybo_config" 19UBOOT_MACHINE = "zynq_zybo_config"
20SPL_BINARY ?= "spl/boot.bin" 20SPL_BINARY ?= "spl/boot.bin"
21UBOOT_ELF_zynq = "u-boot"
21 22
22EXTRA_IMAGEDEPENDS += " \ 23EXTRA_IMAGEDEPENDS += " \
23 u-boot-zynq-uenv \ 24 u-boot-zynq-uenv \