summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
Diffstat (limited to 'conf')
-rw-r--r--conf/bitbake.conf1
-rw-r--r--conf/machine/c7x0.conf2
2 files changed, 2 insertions, 1 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 1df713f2eb..a6a137d4de 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -139,6 +139,7 @@ STAGING_BINDIR = "${STAGING_DIR}/${BUILD_SYS}/bin"
STAGING_LIBDIR = "${STAGING_DIR}/${HOST_SYS}/lib"
STAGING_INCDIR = "${STAGING_DIR}/${HOST_SYS}/include"
STAGING_DATADIR = "${STAGING_DIR}/${HOST_SYS}/share"
+STAGING_LOADER_DIR = "${STAGING_DIR}/${HOST_SYS}/loader"
DEPLOY_DIR = "${TMPDIR}/deploy"
DEPLOY_DIR_TAR = "${DEPLOY_DIR}/tar"
diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf
index 122f2de435..c5e42a2bed 100644
--- a/conf/machine/c7x0.conf
+++ b/conf/machine/c7x0.conf
@@ -2,7 +2,7 @@
#@NAME: Sharp Zaurus SL-C7x0
#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C700, Sharp Zaurus SL-C750, Sharp Zaurus SL-C760, Sharp Zaurus SL-C860 devices
-KERNEL_VERSION ?= "2.4"
+KERNEL_VERSION ?= "2.6"
include conf/machine/zaurus-clamshell.conf
include conf/machine/zaurus-clamshell-${KERNEL_VERSION}.conf