2018-09-12 06:32:57 +00:00
|
|
|
From d0894715f1f1b93057420d04b3dbe84a23cb54e4 Mon Sep 17 00:00:00 2001
|
2018-06-07 06:57:52 +00:00
|
|
|
From: =?UTF-8?q?Andreas=20F=C3=A4rber?= <afaerber@suse.de>
|
|
|
|
|
Date: Sun, 3 Jun 2018 05:47:38 +0200
|
|
|
|
|
Subject: [PATCH] rockchip: make_fit_atf.py depends on u-boot
|
|
|
|
|
MIME-Version: 1.0
|
|
|
|
|
Content-Type: text/plain; charset=UTF-8
|
|
|
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
|
|
|
|
|
|
u-boot.itb depends on u-boot-nodtb.bin, which in turn depends on u-boot.
|
|
|
|
|
u-boot.its from Rockchip make_fit_atf.py (used by {evb,firefly}-rk3399)
|
|
|
|
|
wants to read u-boot but is lacking this dependency, so that u-boot.itb
|
|
|
|
|
cannot be built in one go. Detect its use and add the missing dependency.
|
|
|
|
|
|
|
|
|
|
Reported-by: Yousaf Kaukab <yousaf.kaukab@suse.com>
|
|
|
|
|
Signed-off-by: Andreas Färber <afaerber@suse.de>
|
|
|
|
|
---
|
|
|
|
|
Makefile | 5 ++++-
|
|
|
|
|
1 file changed, 4 insertions(+), 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/Makefile b/Makefile
|
2018-09-12 06:32:57 +00:00
|
|
|
index 1891c3a4ac..cf7b008b22 100644
|
2018-06-07 06:57:52 +00:00
|
|
|
--- a/Makefile
|
|
|
|
|
+++ b/Makefile
|
2018-09-12 06:32:57 +00:00
|
|
|
@@ -1064,7 +1064,10 @@ U_BOOT_ITS = $(subst ",,$(CONFIG_SPL_FIT_SOURCE))
|
2018-06-07 06:57:52 +00:00
|
|
|
else
|
|
|
|
|
ifneq ($(CONFIG_SPL_FIT_GENERATOR),"")
|
|
|
|
|
U_BOOT_ITS := u-boot.its
|
|
|
|
|
-$(U_BOOT_ITS): FORCE
|
|
|
|
|
+ifeq ($(CONFIG_SPL_FIT_GENERATOR),"arch/arm/mach-rockchip/make_fit_atf.py")
|
|
|
|
|
+U_BOOT_ITS_DEPS += u-boot
|
|
|
|
|
+endif
|
|
|
|
|
+$(U_BOOT_ITS): $(U_BOOT_ITS_DEPS) FORCE
|
|
|
|
|
$(srctree)/$(CONFIG_SPL_FIT_GENERATOR) \
|
|
|
|
|
$(patsubst %,arch/$(ARCH)/dts/%.dtb,$(subst ",,$(CONFIG_OF_LIST))) > $@
|
|
|
|
|
endif
|
