merge of '1fc3f2af2bc1ab6996667fc87696b79af25ad493'

     and '7227e7b465491a16d241c26424306e622bb8da05'

16 files changed, 30 insertions, 0 deletions

diff --git a/conf/machine/alix.conf b/conf/machine/alix.conf
index adb8f23fa3..77312791dc 100644
--- a/conf/machine/alix.conf
+++ b/conf/machine/alix.conf
@@ -22,3 +22,5 @@ IMAGE_FSTYPES += "tar.gz"
 MACHINE_EXTRA_RRECOMMENDS = "\
 	kernel-modules \
 	"
+
+KERNEL_IMAGETYPE = "bzImage"
diff --git a/conf/machine/at32stk1000.conf b/conf/machine/at32stk1000.conf
index faa4785fb4..2231f80ed2 100644
--- a/conf/machine/at32stk1000.conf
+++ b/conf/machine/at32stk1000.conf
@@ -19,3 +19,5 @@ SERIAL_CONSOLE = "115200"
 # used by some images
 ROOT_FLASH_SIZE = "8"
 EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536"
+
+KERNEL_IMAGETYPE = "uImage"
diff --git a/conf/machine/at91sam9263ek.conf b/conf/machine/at91sam9263ek.conf
index ad94420196..4f3ae577a9 100644
--- a/conf/machine/at91sam9263ek.conf
+++ b/conf/machine/at91sam9263ek.conf
@@ -19,3 +19,5 @@ SERIAL_CONSOLE = "115200 ttyS0"
 EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
 
 require conf/machine/include/tune-arm926ejs.conf
+
+KERNEL_IMAGETYPE = "uImage"
diff --git a/conf/machine/atngw100.conf b/conf/machine/atngw100.conf
index b725831321..4df1030570 100644
--- a/conf/machine/atngw100.conf
+++ b/conf/machine/atngw100.conf
@@ -18,3 +18,4 @@ SERIAL_CONSOLE = "115200"
 ROOT_FLASH_SIZE = "8"
 EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536"
 
+KERNEL_IMAGETYPE = "uImage"
diff --git a/conf/machine/epia.conf b/conf/machine/epia.conf
index 5a3b5875a3..ea4b568338 100644
--- a/conf/machine/epia.conf
+++ b/conf/machine/epia.conf
@@ -5,6 +5,7 @@ PACKAGE_EXTRA_ARCHS = "i386 i486"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-epia"
 OLDEST_KERNEL = "2.6.5"
+KERNEL_IMAGETYPE = "bzImage"
 
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
diff --git a/conf/machine/geodegx.conf b/conf/machine/geodegx.conf
index 7f9c35cbc5..d1ea1b311e 100644
--- a/conf/machine/geodegx.conf
+++ b/conf/machine/geodegx.conf
@@ -8,3 +8,5 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-geodegx"
 BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules"
 
 udevdir = "/dev"
+
+KERNEL_IMAGETYPE = "bzImage"
diff --git a/conf/machine/geodelx.conf b/conf/machine/geodelx.conf
index 841f4a8418..835a581801 100644
--- a/conf/machine/geodelx.conf
+++ b/conf/machine/geodelx.conf
@@ -5,3 +5,5 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
 PREFERRED_PROVIDER_virtual/kernel="linux-geodelx"
 
 SELECTED_OPTIMIZATION_glibc := "${@'${SELECTED_OPTIMIZATION}'.replace('-fomit-frame-pointer', '')}"
+
+KERNEL_IMAGETYPE = "bzImage"
diff --git a/conf/machine/guinness.conf b/conf/machine/guinness.conf
index 1996a1603b..c35d3b381e 100644
--- a/conf/machine/guinness.conf
+++ b/conf/machine/guinness.conf
@@ -11,6 +11,8 @@ PREFERRED_PROVIDER_xserver = "xserver-xorg"
 
 udevdir = "/dev"
 
+KERNEL_IMAGETYPE = "bzImage"
+
 OLDEST_KERNEL = "2.6.17"
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
diff --git a/conf/machine/i586-generic.conf b/conf/machine/i586-generic.conf
index de620fcd61..2cae2a87dc 100644
--- a/conf/machine/i586-generic.conf
+++ b/conf/machine/i586-generic.conf
@@ -12,6 +12,8 @@ PACKAGE_EXTRA_ARCHS = "x86 i386 i486"
 PREFERRED_PROVIDER_virtual/kernel = "linux-x86"
 OLDEST_KERNEL = "2.6.18"
 
+KERNEL_IMAGETYPE = "bzImage"
+
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
 
diff --git a/conf/machine/i686-generic.conf b/conf/machine/i686-generic.conf
index 5eba33fa97..883d6b4dd0 100644
--- a/conf/machine/i686-generic.conf
+++ b/conf/machine/i686-generic.conf
@@ -11,6 +11,8 @@ PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586"
 PREFERRED_PROVIDER_virtual/kernel = "linux-x86"
 OLDEST_KERNEL = "2.6.20"
 
+KERNEL_IMAGETYPE = "bzImage"
+
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
 
diff --git a/conf/machine/kb9202.conf b/conf/machine/kb9202.conf
index 0e9c0d3b92..6501896780 100644
--- a/conf/machine/kb9202.conf
+++ b/conf/machine/kb9202.conf
@@ -18,3 +18,5 @@ require conf/machine/include/tune-arm920t.conf
 ROOT_FLASH_SIZE = "12"
 
 MACHINE_FEATURES = "kernel26 usbhost usbgadget irda"
+
+KERNEL_IMAGETYPE = "uImage"
diff --git a/conf/machine/netvista.conf b/conf/machine/netvista.conf
index e7aeab7389..8d6cd2d220 100644
--- a/conf/machine/netvista.conf
+++ b/conf/machine/netvista.conf
@@ -9,6 +9,8 @@ PACKAGE_EXTRA_ARCHS = "netvista"
 PREFERRED_PROVIDER_virtual/kernel = "linux-x86"
 XSERVER = "xserver-kdrive-vesa"
 
+KERNEL_IMAGETYPE = "bzImage"
+
 # todo: convert to task-base
 # BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
diff --git a/conf/machine/progear.conf b/conf/machine/progear.conf
index 7c293d9ebf..ffa7dad468 100644
--- a/conf/machine/progear.conf
+++ b/conf/machine/progear.conf
@@ -9,6 +9,8 @@ PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586"
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 
+KERNEL_IMAGETYPE = "bzImage"
+
 OLDEST_KERNEL = "2.6.17"
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
diff --git a/conf/machine/sarge-at91.conf b/conf/machine/sarge-at91.conf
index 6001e69cf7..f1a8b7f271 100644
--- a/conf/machine/sarge-at91.conf
+++ b/conf/machine/sarge-at91.conf
@@ -21,3 +21,5 @@ PREFERRED_PROVIDER_virtual/kernel = "linux"
 # device has own patchset for u-boot 1.1.6
 PREFERRED_VERSION_u-boot = "1.1.6"
 PREFERRED_VERSION_linux  = "2.6.21"
+
+KERNEL_IMAGETYPE = "uImage"
diff --git a/conf/machine/wrap.conf b/conf/machine/wrap.conf
index 34d6775932..d73c80214c 100644
--- a/conf/machine/wrap.conf
+++ b/conf/machine/wrap.conf
@@ -32,3 +32,5 @@ IMAGE_DEVICE_TABLES = "files/device_table-minimal.txt"
 # glibc
 GLIBC_ADDONS = "nptl"
 GLIBC_EXTRA_OECONF = "--with-tls"
+
+KERNEL_IMAGETYPE = "bzImage"
diff --git a/conf/machine/x86.conf b/conf/machine/x86.conf
index e0d4cc96a2..af0cf8996b 100644
--- a/conf/machine/x86.conf
+++ b/conf/machine/x86.conf
@@ -7,6 +7,8 @@ TARGET_ARCH = "i486"
 # TARGET_VENDOR = "-oe"
 PACKAGE_EXTRA_ARCHS = "x86"
 PREFERRED_PROVIDER_virtual/kernel = "linux-x86"
+
+KERNEL_IMAGETYPE = "bzImage"
 # todo: convert to task-base
 # BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules"
 MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"