Commit 98de259a authored by Peter Korsgaard's avatar Peter Korsgaard
Browse files

linux: zImage target no longer available on x86 



The legacy zImage target for x86 was removed from the kernel in 2.6.30,
and we state in Config.in that we'll use bzImage if BR2_PACKAGE_LINUX_FORMAT
isn't set, so ensure we do so for x86.

Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 170b3d3d

target/linux/Makefile.in

+6 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ ifeq ($(DOWNLOAD_LINUX26_VERSION),) 
# User did not define linux version, try using headers

ifeq ($(LINUX_HEADERS_VERSION),)

# We did not have headers (this is for real???)

# Version of linuc before patches

# Version of linux before patches

DOWNLOAD_LINUX26_VERSION=2.6.22.1

# Version of Linux after applying any patches

LINUX26_VERSION=2.6.22.1
@@ -44,9 +44,14 @@ ifndef LINUX26_FORMAT 
ifneq ($(call qstrip,$(BR2_PACKAGE_LINUX_FORMAT)),)

LINUX26_FORMAT=$(call qstrip,$(BR2_PACKAGE_LINUX_FORMAT))

else

ifneq ($(filter i386 x86-64,$(KERNEL_ARCH)),)

# zImage target no longer available on x86 since 2.6.30

LINUX26_FORMAT=bzImage

else

LINUX26_FORMAT=zImage

endif

endif

endif



# Has to be set by the target/device

ifndef LINUX26_BINLOC

target/linux/Makefile.in.advanced

+5 −0
Original line number Diff line number Diff line
@@ -111,9 +111,14 @@ ifndef LINUX26_FORMAT 
ifneq ($(call qstrip,$(BR2_PACKAGE_LINUX_FORMAT)),)

LINUX26_FORMAT:=$(call qstrip,$(BR2_PACKAGE_LINUX_FORMAT))

else

ifneq ($(filter i386 x86-64,$(KERNEL_ARCH)),)

# zImage target no longer available on x86 since 2.6.30

LINUX26_FORMAT=bzImage

else

LINUX26_FORMAT:=zImage

endif

endif

endif



# -----------------------------------------------------------------------------

# Has to be set by the target/device