[Buildroot] [PATCH] Fixed LINUX26_IMAGE_PATH

[Buildroot] [PATCH] Fixed LINUX26_IMAGE_PATH

[Henri Häkkinen]

Kernel image is actually located in boot/images/ rather than in boot/
---
 linux/linux.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/linux/linux.mk b/linux/linux.mk
index 593a1b4..355276e 100644
--- a/linux/linux.mk
+++ b/linux/linux.mk
@@ -42,7 +42,7 @@ else ifeq ($(BR2_LINUX_KERNEL_VMLINUX),y)
 LINUX26_IMAGE_NAME=vmlinux.bin
 endif
 
-LINUX26_IMAGE_PATH=$(LINUX26_DIR)/arch/$(KERNEL_ARCH)/boot/$(LINUX26_IMAGE_NAME)
+LINUX26_IMAGE_PATH=$(LINUX26_DIR)/arch/$(KERNEL_ARCH)/boot/images/$(LINUX26_IMAGE_NAME)
 
 # Download
 $(LINUX26_DIR)/.stamp_downloaded:
-- 
1.7.0.4

[Buildroot] [PATCH] Fixed LINUX26_IMAGE_PATH

[Baruch Siach]

Hi Heri,

On Wed, Jun 30, 2010 at 01:43:47PM +0300, Henri H?kkinen wrote:
> Kernel image is actually located in boot/images/ rather than in boot/

This depends on architecture. ARM put its images in boot/. Which architecture 
is yours?

baruch

> ---
>  linux/linux.mk |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/linux/linux.mk b/linux/linux.mk
> index 593a1b4..355276e 100644
> --- a/linux/linux.mk
> +++ b/linux/linux.mk
> @@ -42,7 +42,7 @@ else ifeq ($(BR2_LINUX_KERNEL_VMLINUX),y)
>  LINUX26_IMAGE_NAME=vmlinux.bin
>  endif
>  
> -LINUX26_IMAGE_PATH=$(LINUX26_DIR)/arch/$(KERNEL_ARCH)/boot/$(LINUX26_IMAGE_NAME)
> +LINUX26_IMAGE_PATH=$(LINUX26_DIR)/arch/$(KERNEL_ARCH)/boot/images/$(LINUX26_IMAGE_NAME)
>  
>  # Download
>  $(LINUX26_DIR)/.stamp_downloaded:

-- 
                                                     ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -

[Buildroot] [PATCH] Fixed LINUX26_IMAGE_PATH

[Thomas Petazzoni]

Hello Henri,

I've seen your message on IRC, but you left too early for me to react
on your question.

On Wed, 30 Jun 2010 13:43:47 +0300
Henri H?kkinen <henuxd@gmail.com> wrote:

> Kernel image is actually located in boot/images/ rather than in boot/
> ---
>  linux/linux.mk |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/linux/linux.mk b/linux/linux.mk
> index 593a1b4..355276e 100644
> --- a/linux/linux.mk
> +++ b/linux/linux.mk
> @@ -42,7 +42,7 @@ else ifeq ($(BR2_LINUX_KERNEL_VMLINUX),y)
>  LINUX26_IMAGE_NAME=vmlinux.bin
>  endif
>  
> -LINUX26_IMAGE_PATH=$(LINUX26_DIR)/arch/$(KERNEL_ARCH)/boot/$(LINUX26_IMAGE_NAME)
> +LINUX26_IMAGE_PATH=$(LINUX26_DIR)/arch/$(KERNEL_ARCH)/boot/images/$(LINUX26_IMAGE_NAME)

This will break ARM/x86 and many other architectures. Instead, we
probably need something like:

ifeq ($(KERNEL_ARCH),avr32)
LINUX26_IMAGE_PATH=$(LINUX26_DIR)/arch/$(KERNEL_ARCH)/boot/images/$(LINUX26_IMAGE_NAME)
else
LINUX26_IMAGE_PATH=$(LINUX26_DIR)/arch/$(KERNEL_ARCH)/boot/$(LINUX26_IMAGE_NAME)
endif

Regards,

Thomas
-- 
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[Buildroot] [PATCH] Fixed LINUX26_IMAGE_PATH

[Thiago A. Corrêa]

Hi,

On Wed, Jun 30, 2010 at 9:03 AM, Thomas Petazzoni
<thomas.petazzoni@free-electrons.com> wrote:
>
> This will break ARM/x86 and many other architectures. Instead, we
> probably need something like:
>
> ifeq ($(KERNEL_ARCH),avr32)
> LINUX26_IMAGE_PATH=$(LINUX26_DIR)/arch/$(KERNEL_ARCH)/boot/images/$(LINUX26_IMAGE_NAME)
> else
> LINUX26_IMAGE_PATH=$(LINUX26_DIR)/arch/$(KERNEL_ARCH)/boot/$(LINUX26_IMAGE_NAME)
> endif
>

I actually had to fix this yesterday for avr32, but I assumed that it
would be valid for all archs, so I didn't do the ifeq in my private
changes.
Sounds good to me.

But this was something that the kernel people changed AFAIK, it might
apply to other targets as well in the future (?). Also, it's a bit
version dependent, older kernels had it built in boot instead of
boot/images

Kind Regards,
    Thiago A. Correa