From: grant.likely@secretlab.ca (Grant Likely)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] Build a uImage with dtb already appended
Date: Tue, 02 Aug 2011 15:31:48 +0100 [thread overview]
Message-ID: <20110802143148.21599.22870.stgit@ponder> (raw)
Do not commit to mainline; this is a useful hack only for now.
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
---
arch/arm/Makefile | 3 +++
arch/arm/boot/Makefile | 8 ++++++++
2 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 70c424e..0677b86 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -282,6 +282,9 @@ zImage Image xipImage bootpImage uImage: vmlinux
zinstall uinstall install: vmlinux
$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@
+uImage-dtb.%:
+ $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@
+
%.dtb:
$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@
diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile
index a1edfd5..a64493b 100644
--- a/arch/arm/boot/Makefile
+++ b/arch/arm/boot/Makefile
@@ -57,6 +57,9 @@ $(obj)/zImage: $(obj)/compressed/vmlinux FORCE
$(call if_changed,objcopy)
@echo ' Kernel: $@ is ready'
+$(obj)/zImage-dtb.%: $(obj)/%.dtb $(obj)/zImage
+ cat $(obj)/zImage $< > $@
+
endif
# Rule to build device tree blobs
@@ -77,11 +80,16 @@ $(obj)/uImage: LOADADDR=$(ZRELADDR)
endif
$(obj)/uImage: STARTADDR=$(LOADADDR)
+$(obj)/uImage-dtb.%: STARTADDR=$(LOADADDR)
$(obj)/uImage: $(obj)/zImage FORCE
$(call if_changed,uimage)
@echo ' Image $@ is ready'
+$(obj)/uImage-dtb.%: $(obj)/zImage-dtb.% FORCE
+ $(call if_changed,uimage)
+ @echo ' Image $@ is ready'
+
$(obj)/bootp/bootp: $(obj)/zImage initrd FORCE
$(Q)$(MAKE) $(build)=$(obj)/bootp $@
@:
next reply other threads:[~2011-08-02 14:31 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-02 14:31 Grant Likely [this message]
2011-08-02 15:33 ` [PATCH] fix for: Build a uImage with dtb already appended Nicolas Ferre
2012-06-29 20:39 ` [PATCH v2] Build a zImage or " Domenico Andreoli
2015-01-15 2:08 ` [PATCH] Build a " Christoph Junghans
2015-01-15 2:31 ` Olof Johansson
2015-01-15 7:33 ` Willy Tarreau
2015-01-15 10:45 ` Russell King - ARM Linux
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110802143148.21599.22870.stgit@ponder \
--to=grant.likely@secretlab.ca \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).