From: Mathias Kresin <dev@kresin.me>
Date: Wed, 14 Mar 2018 21:07:08 +0000 (+0100)
Subject: mvebu: unset uboot build by default
X-Git-Tag: v18.06.0-rc1~630
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2d67ef86382f32847bdfe120912cbaff11a956d5;p=oweals%2Fopenwrt.git

mvebu: unset uboot build by default

Initialise the UBOOT variable by default. Otherwise it will be
unintended inherit to following images if set and causes an uboot build
where not required.

Signed-off-by: Mathias Kresin <dev@kresin.me>
---

diff --git a/target/linux/mvebu/image/Makefile b/target/linux/mvebu/image/Makefile
index 55e1a0b2dc..4f6d8f529e 100644
--- a/target/linux/mvebu/image/Makefile
+++ b/target/linux/mvebu/image/Makefile
@@ -87,7 +87,9 @@ define Device/Default
   KERNEL_NAME := zImage
   KERNEL := kernel-bin | append-dtb | uImage none
   SUPPORTED_DEVICES = $$(DEVICE_DTS)
+  UBOOT :=
 endef
+DEVICE_VARS += UBOOT
 
 define Device/UBI
   IMAGES := sysupgrade.bin
diff --git a/target/linux/mvebu/image/cortex-a9.mk b/target/linux/mvebu/image/cortex-a9.mk
index aa56a721a8..d9defe880d 100644
--- a/target/linux/mvebu/image/cortex-a9.mk
+++ b/target/linux/mvebu/image/cortex-a9.mk
@@ -158,7 +158,6 @@ define Device/turris-omnia
   IMAGE/omnia-medkit-$$(IMAGE_PREFIX)-initramfs.tar.gz := omnia-medkit-initramfs | gzip
   IMAGE_NAME = $$(2)
   DEVICE_DTS := armada-385-turris-omnia
-  UBOOT :=
 endef
 TARGET_DEVICES += turris-omnia