diff options
| author | Nathan Rossi <nathan@nathanrossi.com> | 2017-02-11 21:47:26 +1000 |
|---|---|---|
| committer | Nathan Rossi <nathan@nathanrossi.com> | 2017-03-09 21:53:36 +1000 |
| commit | 5f0cc3cc149f6073f00f43c81db22aa695ebb325 (patch) | |
| tree | c4eaf0731dc43c1c884617b6b4c24e7f6564d8ca /conf | |
| parent | be91292d155b734acbabb13501e4781a7211cdcb (diff) | |
| download | meta-xilinx-5f0cc3cc149f6073f00f43c81db22aa695ebb325.tar.gz | |
machine-xilinx-default.inc: Remove UBOOT_OFEMBED for UBOOT_BINARY
Both u-boot-xlnx and u-boot (mainline) now agree on the name for the
output binary which includes the dtb. Additionally both versions load
'u-boot.img' from SPL. The UBOOT_OFEMBED variable and conditional value
setting are no longer needed.
Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/machine/include/machine-xilinx-default.inc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/conf/machine/include/machine-xilinx-default.inc b/conf/machine/include/machine-xilinx-default.inc index 673944d9..4264d046 100644 --- a/conf/machine/include/machine-xilinx-default.inc +++ b/conf/machine/include/machine-xilinx-default.inc | |||
| @@ -27,11 +27,7 @@ UBOOT_SUFFIX ?= "img" | |||
| 27 | UBOOT_SUFFIX_zynqmp ?= "bin" | 27 | UBOOT_SUFFIX_zynqmp ?= "bin" |
| 28 | UBOOT_SUFFIX_microblaze ?= "bin" | 28 | UBOOT_SUFFIX_microblaze ?= "bin" |
| 29 | 29 | ||
| 30 | # u-boot-xlnx setups up all zynq configs to have embedded device trees (OF_EMBED=y) | 30 | UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}" |
| 31 | UBOOT_OFEMBED ?= "" | ||
| 32 | UBOOT_OFEMBED_zynq ?= "${@bb.utils.contains_any('PREFERRED_PROVIDER_virtual/bootloader', 'u-boot-xlnx u-boot-xlnx-dev', '', '-dtb', d)}" | ||
| 33 | |||
| 34 | UBOOT_BINARY ?= "u-boot${UBOOT_OFEMBED}.${UBOOT_SUFFIX}" | ||
| 35 | UBOOT_ELF ?= "u-boot" | 31 | UBOOT_ELF ?= "u-boot" |
| 36 | UBOOT_ELF_aarch64 ?= "u-boot.elf" | 32 | UBOOT_ELF_aarch64 ?= "u-boot.elf" |
| 37 | 33 | ||