diff options
| author | Nathan Rossi <nathan.rossi@xilinx.com> | 2015-05-04 15:00:14 +1000 |
|---|---|---|
| committer | Nathan Rossi <nathan.rossi@xilinx.com> | 2015-05-04 15:00:14 +1000 |
| commit | d6b82f4a97e653e992299ac33299264a7d6f90f1 (patch) | |
| tree | 3d84bab8cb40a0402553cf0bed957385bb77a2a6 /conf | |
| parent | 5be5c3b0d6eb539d4ce8bf5b101c7aee7d7a74b8 (diff) | |
| download | meta-xilinx-d6b82f4a97e653e992299ac33299264a7d6f90f1.tar.gz | |
machine-xilinx-board.inc: Fixup value for u-boot image file
* Default the value of UBOOT_BINARY in machine-xilinx-default.inc so
that machine-xilinx-board.inc can use the variable to define the file
name of the u-boot image
Signed-off-by: Nathan Rossi <nathan.rossi@xilinx.com>
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/machine/include/machine-xilinx-board.inc | 2 | ||||
| -rw-r--r-- | conf/machine/include/machine-xilinx-default.inc | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/conf/machine/include/machine-xilinx-board.inc b/conf/machine/include/machine-xilinx-board.inc index 8818b24b..ba9a36be 100644 --- a/conf/machine/include/machine-xilinx-board.inc +++ b/conf/machine/include/machine-xilinx-board.inc | |||
| @@ -2,5 +2,5 @@ | |||
| 2 | 2 | ||
| 3 | EXTRA_IMAGEDEPENDS += "virtual/bootloader" | 3 | EXTRA_IMAGEDEPENDS += "virtual/bootloader" |
| 4 | 4 | ||
| 5 | IMAGE_BOOT_FILES ?= "${KERNEL_IMAGETYPE} u-boot.${UBOOT_SUFFIX}" | 5 | IMAGE_BOOT_FILES ?= "${KERNEL_IMAGETYPE} ${UBOOT_BINARY}" |
| 6 | 6 | ||
diff --git a/conf/machine/include/machine-xilinx-default.inc b/conf/machine/include/machine-xilinx-default.inc index cc03747e..43ef4096 100644 --- a/conf/machine/include/machine-xilinx-default.inc +++ b/conf/machine/include/machine-xilinx-default.inc | |||
| @@ -20,6 +20,7 @@ PREFERRED_VERSION_u-boot-xlnx ?= "v2015.01%" | |||
| 20 | 20 | ||
| 21 | UBOOT_SUFFIX ?= "img" | 21 | UBOOT_SUFFIX ?= "img" |
| 22 | UBOOT_SUFFIX_zynqmp ?= "bin" | 22 | UBOOT_SUFFIX_zynqmp ?= "bin" |
| 23 | UBOOT_BINARY ?= "u-boot.${UBOOT_SUFFIX}" | ||
| 23 | UBOOT_BINARY_zynq ?= "u-boot-dtb.${UBOOT_SUFFIX}" | 24 | UBOOT_BINARY_zynq ?= "u-boot-dtb.${UBOOT_SUFFIX}" |
| 24 | 25 | ||
| 25 | # Device Trees | 26 | # Device Trees |
