diff options
| author | Florian Boor <florian.boor@kernelconcepts.de> | 2005-07-21 14:21:28 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-07-21 14:21:28 +0000 |
| commit | c0a250728e6985d545e336fe82df3918e6c5a442 (patch) | |
| tree | c8f435ec69fd68750ff530deaabad2c9df989250 /conf | |
| parent | 06a7a3e0cdf0c08f25cb3dc4ce5ae57f416c31a7 (diff) | |
| parent | e445bbb501bc1eb0725dfb65d73c4438f1991f2e (diff) | |
merge of f5dd78fd37750576d502b8124f093d45ca992ca6
and f9869d372bd0705706ba5562f7a5b7bb25208ff3
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/bitbake.conf | 1 | ||||
| -rw-r--r-- | conf/machine/c7x0.conf | 2 | ||||
| -rw-r--r-- | conf/machine/zaurus-clamshell-2.6.conf | 2 |
3 files changed, 4 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 diff --git a/conf/machine/zaurus-clamshell-2.6.conf b/conf/machine/zaurus-clamshell-2.6.conf index 7b6761b250..3ce5924d04 100644 --- a/conf/machine/zaurus-clamshell-2.6.conf +++ b/conf/machine/zaurus-clamshell-2.6.conf @@ -27,6 +27,8 @@ BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel- # Infrared Modules BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-irda kernel-module-ircomm kernel-module-ircomm-tty \ kernel-module-irlan kernel-module-irnet kernel-module-ir-usb" +# PPP Modules +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-ppp-generic kernel-module-ppp-async" #USB Gadget Modules BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage kernel-module-g-serial \ |