diff options
| author | Nathan Rossi <nathan@nathanrossi.com> | 2015-11-26 20:03:39 +1000 |
|---|---|---|
| committer | Nathan Rossi <nathan@nathanrossi.com> | 2015-11-26 20:03:39 +1000 |
| commit | e95274e56ff441c1f4cf45ba791ab16166f05bf8 (patch) | |
| tree | bdacd18e85f828746a4a0ae68a56136d0599aafa /conf/machine/include | |
| parent | d9d299cd58cdfe3d2c2eb6c643d74d6f511858ec (diff) | |
| download | meta-xilinx-e95274e56ff441c1f4cf45ba791ab16166f05bf8.tar.gz | |
Fix up UBOOT_BINARY for Zynq and setup SPL to load correctly
u-boot-xlnx 'xilinx-v2015.2' (fixed in newer versions) incorrectly sets
the SPL image to load as 'u-boot-dtb.img' despite the images being built
having embedded device trees (OF_EMBED=y). This change fixes this up so that
there are no hacks to the u-boot recipes and no overrides to use the
incorrectly named U-Boot image file.
Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
Diffstat (limited to 'conf/machine/include')
| -rw-r--r-- | conf/machine/include/machine-xilinx-default.inc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/conf/machine/include/machine-xilinx-default.inc b/conf/machine/include/machine-xilinx-default.inc index 054a2e18..15f85fed 100644 --- a/conf/machine/include/machine-xilinx-default.inc +++ b/conf/machine/include/machine-xilinx-default.inc | |||
| @@ -23,7 +23,6 @@ PREFERRED_PROVIDER_virtual/bootloader ??= "${XILINX_DEFAULT_UBOOT}" | |||
| 23 | UBOOT_SUFFIX ?= "img" | 23 | UBOOT_SUFFIX ?= "img" |
| 24 | UBOOT_SUFFIX_zynqmp ?= "bin" | 24 | UBOOT_SUFFIX_zynqmp ?= "bin" |
| 25 | UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}" | 25 | UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}" |
| 26 | UBOOT_BINARY_zynq ?= "u-boot-dtb.${UBOOT_SUFFIX}" | ||
| 27 | UBOOT_ELF ?= "u-boot" | 26 | UBOOT_ELF ?= "u-boot" |
| 28 | UBOOT_ELF_aarch64 ?= "u-boot.elf" | 27 | UBOOT_ELF_aarch64 ?= "u-boot.elf" |
| 29 | 28 | ||