diff options
| author | Matthias Hentges <oe@hentges.net> | 2005-07-21 20:19:17 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-07-21 20:19:17 +0000 |
| commit | 0f1d1982b7905f3dae21837a7a2ecf0448991d72 (patch) | |
| tree | 490c44cf0cf5fb0a73eb4b060d2b1b405c13c4ce /conf | |
| parent | 5c8f0ac921d317857f53af063b6158fe450e3977 (diff) | |
| parent | e40c5b40e67325fd054d160367f0d52c4bfc91b9 (diff) | |
merge of 92eb0d6f08f5ac3bdb8b69280bd69145bd2b42ab
and f4954b87346baa782592647d49aced9350906ce0
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/bitbake.conf | 1 | ||||
| -rw-r--r-- | conf/machine/c7x0.conf | 2 |
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 |