diff options
author | Mark Hatle <mark.hatle@xilinx.com> | 2022-01-21 12:58:07 -0800 |
---|---|---|
committer | Mark Hatle <mark.hatle@xilinx.com> | 2022-01-23 12:17:00 -0800 |
commit | 02a68744c96ceb5350d0eb3b2f5834be545cc63c (patch) | |
tree | 0b3844d875e25a291147daa2e1fc3bea02e7a71d /meta-xilinx-core/conf/machine | |
parent | 84db3b3d44099132f6aa0e6049d5727e4a0b0fbc (diff) | |
download | meta-xilinx-02a68744c96ceb5350d0eb3b2f5834be545cc63c.tar.gz |
machine-xilinx-default.inc: Fix bootbin and UBOOT SUFFIX type
The default for virtual/boot-bin should be xilinx-bootbin.
The default UBOOT_SUFFIX should be 'bin'. Otherwise u-boot-xlnx may fail
being able to not find u-boot.img.
Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
Diffstat (limited to 'meta-xilinx-core/conf/machine')
-rw-r--r-- | meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc b/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc index dd02ab1f..a15e92c6 100644 --- a/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc +++ b/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc | |||
@@ -12,12 +12,11 @@ PREFERRED_PROVIDER_virtual/kernel ??= "linux-xlnx" | |||
12 | 12 | ||
13 | # U-Boot Configuration | 13 | # U-Boot Configuration |
14 | PREFERRED_PROVIDER_virtual/bootloader ??= "u-boot-xlnx" | 14 | PREFERRED_PROVIDER_virtual/bootloader ??= "u-boot-xlnx" |
15 | PREFERRED_PROVIDER_virtual/boot-bin ??= "${PREFERRED_PROVIDER_virtual/bootloader}" | 15 | PREFERRED_PROVIDER_virtual/boot-bin ??= "xilinx-bootbin" |
16 | 16 | ||
17 | do_image_wic[depends] += "${@' '.join('%s:do_deploy' % r for r in (d.getVar('WIC_DEPENDS') or "").split())}" | 17 | do_image_wic[depends] += "${@' '.join('%s:do_deploy' % r for r in (d.getVar('WIC_DEPENDS') or "").split())}" |
18 | 18 | ||
19 | UBOOT_SUFFIX ?= "img" | 19 | UBOOT_SUFFIX ?= "bin" |
20 | UBOOT_SUFFIX:microblaze ?= "bin" | ||
21 | 20 | ||
22 | UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}" | 21 | UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}" |
23 | UBOOT_ELF ?= "u-boot" | 22 | UBOOT_ELF ?= "u-boot" |