2 files changed, 2 insertions, 1 deletions

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index ce4d7de01c..ab984e3e88 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -507,7 +507,7 @@ KERNEL_IMAGE_SYMLINK_NAME ?= "${KERNEL_IMAGETYPE}-${MACHINE}"
 
 do_uboot_mkimage() {
         if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then 
-                if test ! -e arch/${ARCH}/boot/uImage ; then
+                if test "x${KEEPUIMAGE}" != "xyes" ; then
                         ENTRYPOINT=${UBOOT_ENTRYPOINT}
                         if test -n "${UBOOT_ENTRYSYMBOL}"; then
                                 ENTRYPOINT=`${HOST_PREFIX}nm ${S}/vmlinux | \
diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc
index f7709196cb..ef8232d19c 100644
--- a/meta/conf/distro/include/default-distrovars.inc
+++ b/meta/conf/distro/include/default-distrovars.inc
@@ -2,6 +2,7 @@ QA_LOGFILE = "${TMPDIR}/qa.log"
 
 OEINCLUDELOGS ?= "yes"
 KERNEL_CONSOLE ?= "ttyS0"
+KEEPUIMAGE ??= "yes"
 
 PCMCIA_MANAGER ?= "pcmciautils"