diff mbox

[v2] Fix building initramfs kernel with appended dtb

Message ID 1375285656-24907-1-git-send-email-nford@westpond.com
State Accepted
Headers show

Commit Message

Nathan Ford July 31, 2013, 3:47 p.m. UTC
The target for building the kernel with a cpio initramfs is not
calling the append dtb commands, creating a final kernel image
without an appended dtb. Instead it needs to call kernel make on
the intermediate target, then call the append dtb commands
to produce the final image as the primary kernel build target
does.

Signed-off-by: Nathan Ford <nford@westpond.com>
---
 linux/linux.mk |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Thomas Petazzoni Aug. 1, 2013, 4 p.m. UTC | #1
Dear Nathan Ford,

On Wed, 31 Jul 2013 11:47:36 -0400, Nathan Ford wrote:
> The target for building the kernel with a cpio initramfs is not
> calling the append dtb commands, creating a final kernel image
> without an appended dtb. Instead it needs to call kernel make on
> the intermediate target, then call the append dtb commands
> to produce the final image as the primary kernel build target
> does.
> 
> Signed-off-by: Nathan Ford <nford@westpond.com>
> ---
>  linux/linux.mk |    3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

Applied, thanks!

Thomas
diff mbox

Patch

diff --git a/linux/linux.mk b/linux/linux.mk
index 17e9838..9d29d9d 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -311,7 +311,8 @@  endif
 $(LINUX_DIR)/.stamp_initramfs_rebuilt: $(LINUX_DIR)/.stamp_target_installed $(LINUX_DIR)/.stamp_images_installed $(BINARIES_DIR)/rootfs.cpio
 	@$(call MESSAGE,"Rebuilding kernel with initramfs")
 	# Build the kernel.
-	$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_IMAGE_NAME)
+	$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_IMAGE_TARGET)
+	$(LINUX_APPEND_DTB)
 	# Copy the kernel image to its final destination
 	cp $(LINUX_IMAGE_PATH) $(BINARIES_DIR)
 	# If there is a .ub file copy it to the final destination