summaryrefslogtreecommitdiff
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:39:48 +0100
commit72a7049526ee107005bd39c7bdd814ed71345829 (patch)
tree0364d0dac122db7b2a565bf8d6f009c1d6b183d7
parent6ef8e6f2f9b0583fa0881e0dfc52462405b21ede (diff)
downloadopenembedded-core-72a7049526ee107005bd39c7bdd814ed71345829.tar.gz
openembedded-core-72a7049526ee107005bd39c7bdd814ed71345829.tar.bz2
openembedded-core-72a7049526ee107005bd39c7bdd814ed71345829.zip
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 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>
-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}"
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"