summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2012-07-23 13:45:30 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-07-26 14:40:47 +0100
commitdcadeda69ee14efdc49059906866587f619e17cf (patch)
tree4a75f2489f1d78896c1a817805118c993c6c071b
parent51bc0e468a2fc0d7dc92beadee14d1c8a1268294 (diff)
downloadpoky-dcadeda69ee14efdc49059906866587f619e17cf.tar.gz
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 <koen@dominion.thruhere.net> Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/kernel.bbclass2
-rw-r--r--meta/conf/distro/include/default-distrovars.inc1
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}"
507 507
508do_uboot_mkimage() { 508do_uboot_mkimage() {
509 if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then 509 if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then
510 if test ! -e arch/${ARCH}/boot/uImage ; then 510 if test "x${KEEPUIMAGE}" != "xyes" ; then
511 ENTRYPOINT=${UBOOT_ENTRYPOINT} 511 ENTRYPOINT=${UBOOT_ENTRYPOINT}
512 if test -n "${UBOOT_ENTRYSYMBOL}"; then 512 if test -n "${UBOOT_ENTRYSYMBOL}"; then
513 ENTRYPOINT=`${HOST_PREFIX}nm ${S}/vmlinux | \ 513 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"
2 2
3OEINCLUDELOGS ?= "yes" 3OEINCLUDELOGS ?= "yes"
4KERNEL_CONSOLE ?= "ttyS0" 4KERNEL_CONSOLE ?= "ttyS0"
5KEEPUIMAGE ??= "yes"
5 6
6PCMCIA_MANAGER ?= "pcmciautils" 7PCMCIA_MANAGER ?= "pcmciautils"
7 8