linux target name might be not equal linux file name

PATCH Superseded Waldemar Brodkorb 2 participants 2 messages Jun 24, 2014

Share & tools

Waldemar Brodkorb

author

2014-06-24 13:18 UTC #0 lore raw

PATCH 1/1 linux target name might be not equal linux file name

For example the upcoming qemu-xtensa patch is using this feature, where the target is called "zImage", but the resulting kernel name is "Image.elf".

Signed-off-by Waldemar Brodkorb <[email protected]>

---
 linux/Config.in |    6 ++++++
 linux/linux.mk  |   10 ++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

linux/Config.in +6 -0

index ece48a7..0f4337f 100644
@@ -244,6 +244,12 @@ config BR2_LINUX_KERNEL_IMAGE_TARGET_NAME
 	  Specify the kernel make target to build the kernel that you
 	  need.
 
+config BR2_LINUX_KERNEL_IMAGE_NAME
+	string "Kernel image name"
+	depends on BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM
+	help
+	  Specify the kernel filename.
+
 config BR2_LINUX_KERNEL_UIMAGE_LOADADDR
 	string "load address (for 3.7+ multi-platform image)"
 	depends on BR2_arm || BR2_armeb

linux/linux.mk +6 -4

index bd3f2ac..1e7d2e2 100644
@@ -80,8 +80,10 @@ endif
 KERNEL_DTBS = $(addsuffix .dtb,$(KERNEL_DTS_NAME))
 
 ifeq ($(BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM),y)
-LINUX_IMAGE_NAME = $(call qstrip,$(BR2_LINUX_KERNEL_IMAGE_TARGET_NAME))
+LINUX_IMAGE_NAME = $(call qstrip,$(BR2_LINUX_KERNEL_IMAGE_NAME))
+LINUX_TARGET_NAME = $(call qstrip,$(BR2_LINUX_KERNEL_IMAGE_TARGET_NAME))
 else
+LINUX_TARGET_NAME = $(LINUX_IMAGE_NAME)
 ifeq ($(BR2_LINUX_KERNEL_UIMAGE),y)
 LINUX_IMAGE_NAME = uImage
 else ifeq ($(BR2_LINUX_KERNEL_APPENDED_UIMAGE),y)

@@ -259,7 +261,7 @@ endif
 define LINUX_BUILD_CMDS
 	$(if $(BR2_LINUX_KERNEL_USE_CUSTOM_DTS),
 		cp $(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH) $(KERNEL_ARCH_PATH)/boot/dts/)
-	$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_IMAGE_NAME)
+	$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_TARGET_NAME)
 	@if grep -q "CONFIG_MODULES=y" $(@D)/.config; then 	\
 		$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) modules ;	\
 	fi

@@ -331,8 +333,8 @@ endif
 # been generated in $(BINARIES_DIR)/rootfs.cpio.
 $(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)
+	# Build the kernel. for custom kernels make target may be unequal to kernel file name
+	$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_TARGET_NAME)
 	$(LINUX_APPEND_DTB)
 	# Copy the kernel image to its final destination
 	cp $(LINUX_IMAGE_PATH) $(BINARIES_DIR)

Signature · 1 line

1.7.10.4

Arnout Vandecappelle

2014-06-24 16:01 UTC #1 lore raw

PATCH 1/1 linux target name might be not equal linux file name

Quoted 15 lines · Waldemar Brodkorb

For example the upcoming qemu-xtensa patch is using this feature, where the target is called "zImage", but the resulting kernel name is "Image.elf".
Signed-off-by Waldemar Brodkorb <[email protected]>
---
 linux/Config.in |    6 ++++++
 linux/linux.mk  |   10 ++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)
linux/Config.in +0 -0
index ece48a7..0f4337f 100644

linux/Config.in config BR2_LINUX_KERNEL_IMAGE_TARGET_NAME · line 249

Quoted 6 lines

linux/Config.in +3 -0

@@ -244,6 +244,12 @@ config BR2_LINUX_KERNEL_IMAGE_TARGET_NAME
 	  Specify the kernel make target to build the kernel that you
 	  need.
 
+config BR2_LINUX_KERNEL_IMAGE_NAME
+	string "Kernel image name"
+	depends on BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM

This should default to BR2_LINUX_KERNEL_TARGET_NAME.

However, it's probably better to leave the default to an empty string, and add
default handling in the .mk file.

That default behaviour should also be described in the help text then.

Quoted 11 lines

linux/Config.in +3 -0

+	help
+	  Specify the kernel filename.
+
 config BR2_LINUX_KERNEL_UIMAGE_LOADADDR
 	string "load address (for 3.7+ multi-platform image)"
 	depends on BR2_arm || BR2_armeb

linux/linux.mk +0 -0

index bd3f2ac..1e7d2e2 100644

linux/linux.mk endif · line 86

Quoted 8 lines

linux/linux.mk +3 -1

@@ -80,8 +80,10 @@ endif
 KERNEL_DTBS = $(addsuffix .dtb,$(KERNEL_DTS_NAME))
 
 ifeq ($(BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM),y)
-LINUX_IMAGE_NAME = $(call qstrip,$(BR2_LINUX_KERNEL_IMAGE_TARGET_NAME))
+LINUX_IMAGE_NAME = $(call qstrip,$(BR2_LINUX_KERNEL_IMAGE_NAME))
+LINUX_TARGET_NAME = $(call qstrip,$(BR2_LINUX_KERNEL_IMAGE_TARGET_NAME))
 else
+LINUX_TARGET_NAME = $(LINUX_IMAGE_NAME)

Although perfectly valid, it looks a bit strange to define the contents of the
right hand side of the assignment below the assignment statement...

Anyway, for the default handling it would probably be more convenient to add
the following (untested!) after the BR2_LINUX_KERNEL_IMAGE_TARGET_CUSTOM condition.

ifeq ($(LINUX_TARGET_NAME),)
LINUX_TARGET_NAME = $(LINUX_IMAGE_NAME)
endif

Quoted 13 lines

linux/linux.mk +1 -1

 ifeq ($(BR2_LINUX_KERNEL_UIMAGE),y)
 LINUX_IMAGE_NAME = uImage
 else ifeq ($(BR2_LINUX_KERNEL_APPENDED_UIMAGE),y)

@@ -259,7 +261,7 @@ endif
 define LINUX_BUILD_CMDS
 	$(if $(BR2_LINUX_KERNEL_USE_CUSTOM_DTS),
 		cp $(BR2_LINUX_KERNEL_CUSTOM_DTS_PATH) $(KERNEL_ARCH_PATH)/boot/dts/)
-	$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_IMAGE_NAME)
+	$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_TARGET_NAME)
 	@if grep -q "CONFIG_MODULES=y" $(@D)/.config; then 	\
 		$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) modules ;	\
 	fi

linux/linux.mk endif · line 336

Quoted 6 lines

linux/linux.mk +1 -2

@@ -331,8 +333,8 @@ endif
 # been generated in $(BINARIES_DIR)/rootfs.cpio.
 $(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)
+	# Build the kernel. for custom kernels make target may be unequal to kernel file name

[minor] I think this comment is a bit out of place here. Also, currently it is
just for custom kernels but that may change in the future.

Regards,
Arnout

Quoted 5 lines

linux/linux.mk +1 -0

+	$(TARGET_MAKE_ENV) $(MAKE) $(LINUX_MAKE_FLAGS) -C $(@D) $(LINUX_TARGET_NAME)
 	$(LINUX_APPEND_DTB)
 	# Copy the kernel image to its final destination
 	cp $(LINUX_IMAGE_PATH) $(BINARIES_DIR)

Signature · 6 lines

Arnout Vandecappelle                          arnout at mind be
Senior Embedded Software Architect            +32-16-286500
Essensium/Mind                                http://www.mind.be
G.Geenslaan 9, 3001 Leuven, Belgium           BE 872 984 063 RPR Leuven
LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle
GPG fingerprint:  7CB5 E4CC 6C2E EFD4 6E3D A754 F963 ECAB 2450 2F1F