From 2d67ef86382f32847bdfe120912cbaff11a956d5 Mon Sep 17 00:00:00 2001 From: Mathias Kresin <dev@kresin.me> Date: Wed, 14 Mar 2018 22:07:08 +0100 Subject: [PATCH] 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> --- target/linux/mvebu/image/Makefile | 2 ++ target/linux/mvebu/image/cortex-a9.mk | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/target/linux/mvebu/image/Makefile b/target/linux/mvebu/image/Makefile index 55e1a0b2dc1..4f6d8f529e4 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 aa56a721a80..d9defe880de 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 -- GitLab