From: Christian Lamparter <chunkeey@gmail.com>
Date: Mon, 11 Feb 2019 17:55:32 +0000 (+0100)
Subject: build: add UBOOT_PATH to DEFAULT_DEVICE_VARS and set a default
X-Git-Tag: v19.07.0-rc1~615
X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=80f861ef757af33828edcefba8666dec5781c8db;p=openwrt%2Fopenwrt.git

build: add UBOOT_PATH to DEFAULT_DEVICE_VARS and set a default

The helper shared Build/append-uboot in include/image-commands.mk
uses it, so include this variable in DEFAULT_DEVICE_VARS.

Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
---

diff --git a/include/image.mk b/include/image.mk
index 5b02219558..530a2b1335 100644
--- a/include/image.mk
+++ b/include/image.mk
@@ -383,6 +383,8 @@ define Device/Init
   IMAGE_METADATA :=
 
   FILESYSTEMS := $(TARGET_FILESYSTEMS)
+
+  UBOOT_PATH :=  $(STAGING_DIR_IMAGE)/uboot-$(1)
 endef
 
 DEFAULT_DEVICE_VARS := \
@@ -390,7 +392,7 @@ DEFAULT_DEVICE_VARS := \
   CMDLINE UBOOTENV_IN_UBI KERNEL_IN_UBI BLOCKSIZE PAGESIZE SUBPAGESIZE \
   VID_HDR_OFFSET UBINIZE_OPTS UBINIZE_PARTS MKUBIFS_OPTS DEVICE_DTS \
   DEVICE_DTS_CONFIG DEVICE_DTS_DIR BOARD_NAME UIMAGE_NAME SUPPORTED_DEVICES \
-  IMAGE_METADATA KERNEL_ENTRY KERNEL_LOADADDR
+  IMAGE_METADATA KERNEL_ENTRY KERNEL_LOADADDR UBOOT_PATH
 
 define Device/ExportVar
   $(1) : $(2):=$$($(2))