From patchwork Fri Jul 20 05:56:43 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: kernel bbclass: recreate uImage unless KEEPUIMAGE is set Date: Fri, 20 Jul 2012 05:56:43 -0000 From: Khem Raj X-Patchwork-Id: 32691 Message-Id: <1342763803-32218-1-git-send-email-raj.khem@gmail.com> To: openembedded-core@lists.openembedded.org Cc: Koen Kooi From: Koen Kooi 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 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 Signed-off-by: Koen Kooi Signed-off-by: Khem Raj Acked-by: Bruce Ashfield --- meta/classes/kernel.bbclass | 2 +- meta/conf/distro/include/default-distrovars.inc | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index ce4d7de..efe4a9f 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}" = "x" ; 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 f770919..7448415 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 ?? = "1" PCMCIA_MANAGER ?= "pcmciautils"