From: Koen Kooi Date: Mon, 23 Jul 2012 20:45:30 +0000 (-0700) Subject: kernel bbclass: Recreate uImage only when KEEPUIMAGE != "yes" X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dcadeda69ee14efdc49059906866587f619e17cf;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git kernel bbclass: Recreate uImage only when KEEPUIMAGE != "yes" The intent of the uImage code in this class includes the following 1) be able to specify custom load addresses without needing to patch the kernel 2) add better information to the uImage description field The current state is a NOP anyway, the kernel will always build a uImage when you tell it to 'make uImage'. weakly Set KEEPUIMAGE to 'yes' in default-distrovars.inc which preserve the current OE-Core behavior. Machines which are being ported from oe.dev and need to regenerate uImage can set this to be empty (From OE-Core rev: 72a7049526ee107005bd39c7bdd814ed71345829) Signed-off-by: Koen Kooi Signed-off-by: Khem Raj Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index ce4d7de01cb..ab984e3e88d 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 f7709196cb8..ef8232d19c2 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"