diff options
| author | Nathan Rossi <nathan@nathanrossi.com> | 2016-03-25 22:12:59 +1000 |
|---|---|---|
| committer | Nathan Rossi <nathan@nathanrossi.com> | 2016-03-25 22:15:21 +1000 |
| commit | 2081558f0be9cd20c64224eb1f329c7b89893e50 (patch) | |
| tree | 74c12562b9728bfcda7be9d84f102353c7e2c1ac | |
| parent | e569dd145ee9f11c7268ddc0acb11461475d7078 (diff) | |
| download | meta-xilinx-2081558f0be9cd20c64224eb1f329c7b89893e50.tar.gz | |
machine-xilinx-default.inc: Handle 'u-boot-dtb.img' for Zynq
Handle the case where mainline u-boot does not default to having the
target device tree embedded into the u-boot ELF via OF_EMBED, which is
default for the u-boot-xlnx source tree. Select the UBOOT_BINARY value
based on the currently configured virtual/bootloader provider.
Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
| -rw-r--r-- | conf/machine/include/machine-xilinx-default.inc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/conf/machine/include/machine-xilinx-default.inc b/conf/machine/include/machine-xilinx-default.inc index ec581c06..f8dc362a 100644 --- a/conf/machine/include/machine-xilinx-default.inc +++ b/conf/machine/include/machine-xilinx-default.inc | |||
| @@ -22,7 +22,12 @@ PREFERRED_PROVIDER_virtual/bootloader ??= "${XILINX_DEFAULT_UBOOT}" | |||
| 22 | 22 | ||
| 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 | |
| 26 | # u-boot-xlnx setups up all zynq configs to have embedded device trees (OF_EMBED=y) | ||
| 27 | UBOOT_OFEMBED ?= "" | ||
| 28 | UBOOT_OFEMBED_zynq ?= "${@bb.utils.contains('PREFERRED_PROVIDER_virtual/bootloader', 'u-boot-xlnx', '', '-dtb', d)}" | ||
| 29 | |||
| 30 | UBOOT_BINARY ?= "u-boot${UBOOT_OFEMBED}.${UBOOT_SUFFIX}" | ||
| 26 | UBOOT_ELF ?= "u-boot" | 31 | UBOOT_ELF ?= "u-boot" |
| 27 | UBOOT_ELF_aarch64 ?= "u-boot.elf" | 32 | UBOOT_ELF_aarch64 ?= "u-boot.elf" |
| 28 | 33 | ||