aboutsummaryrefslogtreecommitdiff
path: root/target
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <jacmet@sunsite.dk>2010-05-28 12:03:56 +0200
committerGravatar Peter Korsgaard <jacmet@sunsite.dk>2010-05-28 12:03:56 +0200
commit98de259aee970b70f06f7e98253fbf20419057a0 (patch)
treee18a576c8fd629e075888f6bdcf01f490b5cdc6e /target
parent170b3d3d0550b8000cfc0cf789a5a902237353e1 (diff)
downloadbuildroot-98de259aee970b70f06f7e98253fbf20419057a0.tar.gz
buildroot-98de259aee970b70f06f7e98253fbf20419057a0.tar.bz2
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: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'target')
-rw-r--r--target/linux/Makefile.in7
-rw-r--r--target/linux/Makefile.in.advanced5
2 files changed, 11 insertions, 1 deletions
diff --git a/target/linux/Makefile.in b/target/linux/Makefile.in
index 6983d2548f..f019824406 100644
--- a/target/linux/Makefile.in
+++ b/target/linux/Makefile.in
@@ -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
diff --git a/target/linux/Makefile.in.advanced b/target/linux/Makefile.in.advanced
index 9e495f3e0f..86d94ca409 100644
--- a/target/linux/Makefile.in.advanced
+++ b/target/linux/Makefile.in.advanced
@@ -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