* [Buildroot] [PATCH] linux target name might be not equal linux file name
@ 2014-06-24 13:18 Waldemar Brodkorb
2014-06-24 16:01 ` Arnout Vandecappelle
0 siblings, 1 reply; 2+ messages in thread
From: Waldemar Brodkorb @ 2014-06-24 13:18 UTC (permalink / raw)
To: buildroot
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 <wbx@openadk.org>
---
linux/Config.in | 6 ++++++
linux/linux.mk | 10 ++++++----
2 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/linux/Config.in b/linux/Config.in
index ece48a7..0f4337f 100644
--- a/linux/Config.in
+++ b/linux/Config.in
@@ -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
diff --git a/linux/linux.mk b/linux/linux.mk
index bd3f2ac..1e7d2e2 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -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)
--
1.7.10.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [Buildroot] [PATCH] linux target name might be not equal linux file name
2014-06-24 13:18 [Buildroot] [PATCH] linux target name might be not equal linux file name Waldemar Brodkorb
@ 2014-06-24 16:01 ` Arnout Vandecappelle
0 siblings, 0 replies; 2+ messages in thread
From: Arnout Vandecappelle @ 2014-06-24 16:01 UTC (permalink / raw)
To: buildroot
On 24/06/14 15:18, Waldemar Brodkorb wrote:
> 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 <wbx@openadk.org>
> ---
> linux/Config.in | 6 ++++++
> linux/linux.mk | 10 ++++++----
> 2 files changed, 12 insertions(+), 4 deletions(-)
>
> diff --git a/linux/Config.in b/linux/Config.in
> index ece48a7..0f4337f 100644
> --- a/linux/Config.in
> +++ b/linux/Config.in
> @@ -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.
> + 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
> diff --git a/linux/linux.mk b/linux/linux.mk
> index bd3f2ac..1e7d2e2 100644
> --- a/linux/linux.mk
> +++ b/linux/linux.mk
> @@ -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
> 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
[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
> + $(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)
>
--
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-06-24 16:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-06-24 13:18 [Buildroot] [PATCH] linux target name might be not equal linux file name Waldemar Brodkorb
2014-06-24 16:01 ` Arnout Vandecappelle
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox