* [PATCH] Build a uImage with dtb already appended
@ 2011-08-02 14:31 Grant Likely
2011-08-02 15:33 ` [PATCH] fix for: " Nicolas Ferre
2012-06-29 20:39 ` [PATCH v2] Build a zImage or " Domenico Andreoli
0 siblings, 2 replies; 3+ messages in thread
From: Grant Likely @ 2011-08-02 14:31 UTC (permalink / raw)
To: niklas.hernaeus, nicolas.ferre, linux-kernel, linux-arm-kernel
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 $@
@:
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] fix for: Build a uImage with dtb already appended
2011-08-02 14:31 [PATCH] Build a uImage with dtb already appended Grant Likely
@ 2011-08-02 15:33 ` Nicolas Ferre
2012-06-29 20:39 ` [PATCH v2] Build a zImage or " Domenico Andreoli
1 sibling, 0 replies; 3+ messages in thread
From: Nicolas Ferre @ 2011-08-02 15:33 UTC (permalink / raw)
To: grant.likely, niklas.hernaeus
Cc: linux-kernel, linux-arm-kernel, Nicolas Ferre
---
arch/arm/boot/Makefile | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile
index a64493b..68d6f23 100644
--- a/arch/arm/boot/Makefile
+++ b/arch/arm/boot/Makefile
@@ -75,8 +75,10 @@ quiet_cmd_uimage = UIMAGE $@
ifeq ($(CONFIG_ZBOOT_ROM),y)
$(obj)/uImage: LOADADDR=$(CONFIG_ZBOOT_ROM_TEXT)
+$(obj)/uImage-dtb.%: LOADADDR=$(CONFIG_ZBOOT_ROM_TEXT)
else
$(obj)/uImage: LOADADDR=$(ZRELADDR)
+$(obj)/uImage-dtb.%: LOADADDR=$(ZRELADDR)
endif
$(obj)/uImage: STARTADDR=$(LOADADDR)
--
1.7.4.1
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH v2] Build a zImage or uImage with dtb already appended
2011-08-02 14:31 [PATCH] Build a uImage with dtb already appended Grant Likely
2011-08-02 15:33 ` [PATCH] fix for: " Nicolas Ferre
@ 2012-06-29 20:39 ` Domenico Andreoli
1 sibling, 0 replies; 3+ messages in thread
From: Domenico Andreoli @ 2012-06-29 20:39 UTC (permalink / raw)
To: Grant Likely; +Cc: linux-kernel, linux-arm-kernel
From: Domenico Andreoli <domenico.andreoli@linux.com>
Add new targets to build zImage and uImage with DTB appended (i.e. make
'uImage-dtb.am335x-bone' or 'make zImage-dtb.omap3-evm').
Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Domenico Andreoli <domenico.andreoli@linux.com>
---
On Tue, Aug 02, 2011 at 03:31:48PM +0100, Grant Likely wrote:
> Do not commit to mainline; this is a useful hack only for now.
>
Is this a better moment for this patch?
Anyway, here is an update for v3.5-rc4. Added zImage-dtb.* as a valid
target and the .gitignore entries.
cheers
Domenico
---
arch/arm/Makefile | 6 ++++++
arch/arm/boot/.gitignore | 2 ++
arch/arm/boot/Makefile | 7 +++++++
3 files changed, 15 insertions(+)
Index: b/arch/arm/Makefile
===================================================================
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -283,6 +283,12 @@ zImage Image xipImage bootpImage uImage:
zinstall uinstall install: vmlinux
$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@
+zImage-dtb.%:
+ $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@
+
+uImage-dtb.%:
+ $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@
+
%.dtb:
$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@
Index: b/arch/arm/boot/Makefile
===================================================================
--- a/arch/arm/boot/Makefile
+++ b/arch/arm/boot/Makefile
@@ -55,6 +55,9 @@ $(obj)/zImage: $(obj)/compressed/vmlinux
$(call if_changed,objcopy)
@echo ' Kernel: $@ is ready'
+$(obj)/zImage-dtb.%: $(obj)/%.dtb $(obj)/zImage
+ cat $(obj)/zImage $< > $@
+
endif
targets += $(dtb-y)
@@ -90,6 +93,10 @@ $(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 $@
@:
Index: b/arch/arm/boot/.gitignore
===================================================================
--- a/arch/arm/boot/.gitignore
+++ b/arch/arm/boot/.gitignore
@@ -1,6 +1,8 @@
Image
zImage
+zImage-dtb.*
xipImage
bootpImage
uImage
+uImage-dtb.*
*.dtb
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-06-29 20:39 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-08-02 14:31 [PATCH] Build a uImage with dtb already appended Grant Likely
2011-08-02 15:33 ` [PATCH] fix for: " Nicolas Ferre
2012-06-29 20:39 ` [PATCH v2] Build a zImage or " Domenico Andreoli
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®