Skip to contentSkip to conversation

Fixed LINUX26_IMAGE_PATH

PATCH New Henri Häkkinen 4 participants 4 messages Jun 30, 2010

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fixed LINUX26_IMAGE_PATH

Kernel image is actually located in boot/images/ rather than in boot/

---
 linux/linux.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
linux/linux.mk +1 -1
index 593a1b4..355276e 100644
@@ -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:
Signature · 1 line
1.7.0.4
#1 lore raw

PATCH 1/1 Fixed LINUX26_IMAGE_PATH

Hi Heri,

Quoted 1 line · Henri H?kkinen

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

Quoted 17 lines
---
 linux/linux.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
linux/linux.mk +1 -1
index 593a1b4..355276e 100644
@@ -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:
Signature · 3 lines
                                                     ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
#2 lore raw

PATCH 1/1 Fixed LINUX26_IMAGE_PATH

In reply to Henri Häkkinen

Hello Henri,

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

Quoted 10 lines · On Wed, 30 Jun 2010 13:43:47 +0300 Henri H?kkinen <[email protected]> wrote:

Kernel image is actually located in boot/images/ rather than in boot/

---
 linux/linux.mk |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
linux/linux.mk +0 -0
index 593a1b4..355276e 100644

linux/linux.mk else ifeq ($(BR2_LINUX_KERNEL_VMLINUX),y) · line 45

Quoted 5 lines
linux/linux.mk +1 -1
@@ -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

Signature · 4 lines
Thomas Petazzoni, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
#3 lore raw

PATCH 1/1 Fixed LINUX26_IMAGE_PATH

Hi,

Quoted 10 lines · Thomas Petazzoni

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