diff options
| author | Jan Luebbe <jlu@pengutronix.de> | 2012-12-18 16:05:40 +0100 |
|---|---|---|
| committer | Jan Luebbe <jlu@pengutronix.de> | 2012-12-18 16:05:40 +0100 |
| commit | eb679b42f1260c6ca4b10e94a0a5aed33ac190d8 (patch) | |
| tree | c7cb1475abfdd3e4d2c9b7e0debb76c49656ed0e /patches/linux-3.7/0149-ARM-CUSTOM-Build-a-uImage-with-dtb-already-appended.patch | |
| parent | ce6e38fa64f60a7554546f39b7f462574719e484 (diff) | |
| download | platform-pengutronix-beaglebone-eb679b42f1260c6ca4b10e94a0a5aed33ac190d8.tar.gz platform-pengutronix-beaglebone-eb679b42f1260c6ca4b10e94a0a5aed33ac190d8.tar.xz | |
kernel: update patch stack for 3.7
Thanks to Koen Kooi for maintaining the patch stack.
Signed-off-by: Jan Luebbe <jlu@pengutronix.de>
Diffstat (limited to 'patches/linux-3.7/0149-ARM-CUSTOM-Build-a-uImage-with-dtb-already-appended.patch')
| -rw-r--r-- | patches/linux-3.7/0149-ARM-CUSTOM-Build-a-uImage-with-dtb-already-appended.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/patches/linux-3.7/0149-ARM-CUSTOM-Build-a-uImage-with-dtb-already-appended.patch b/patches/linux-3.7/0149-ARM-CUSTOM-Build-a-uImage-with-dtb-already-appended.patch new file mode 100644 index 0000000..ebca33b --- /dev/null +++ b/patches/linux-3.7/0149-ARM-CUSTOM-Build-a-uImage-with-dtb-already-appended.patch @@ -0,0 +1,56 @@ +From: Grant Likely <grant.likely@secretlab.ca> +Date: Tue, 2 Aug 2011 15:30:09 +0100 +Subject: [PATCH] ARM: CUSTOM: Build a uImage with dtb already appended + +Do not commit to mainline; this is a useful hack only for now. + +Signed-off-by: Grant Likely <grant.likely@secretlab.ca> +Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com> + +Conflicts: + + arch/arm/Makefile +--- + arch/arm/Makefile | 3 +++ + arch/arm/boot/Makefile | 7 +++++++ + 2 files changed, 10 insertions(+) + +diff --git a/arch/arm/Makefile b/arch/arm/Makefile +index 5f914fc..05df486 100644 +--- a/arch/arm/Makefile ++++ b/arch/arm/Makefile +@@ -291,6 +291,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: scripts + $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@ + +diff --git a/arch/arm/boot/Makefile b/arch/arm/boot/Makefile +index 9137df5..416fbe9 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) + @$(kecho) ' Kernel: $@ is ready' + ++$(obj)/zImage-dtb.%: $(obj)/%.dtb $(obj)/zImage ++ cat $(obj)/zImage $< > $@ ++ + endif + + targets += $(dtb-y) +@@ -92,6 +95,10 @@ $(obj)/uImage: $(obj)/zImage FORCE + $(call if_changed,uimage) + @$(kecho) ' 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 $@ + @: |