summaryrefslogtreecommitdiff
path: root/conf/machine
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openembedded.org>2005-12-06 14:16:33 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-12-06 14:16:33 +0000
commit4cff548ae08c8724bf27ea62c134c8df99cbde14 (patch)
treea7f5ae83797b16efe1ce4892ea992ed7f68038a6 /conf/machine
parent7acfd26c06a4d910fda1f246fa21cb0610c7cf4c (diff)
disapproval of revision '1836da10f903d9ee68a7255b7a5d899128f4f43c'
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/handheld-common.conf6
-rw-r--r--conf/machine/ipaq-common.conf6
-rw-r--r--conf/machine/ipaq-pxa270.conf3
3 files changed, 6 insertions, 9 deletions
diff --git a/conf/machine/handheld-common.conf b/conf/machine/handheld-common.conf
index a014c2be65..dab1d01e70 100644
--- a/conf/machine/handheld-common.conf
+++ b/conf/machine/handheld-common.conf
@@ -17,8 +17,8 @@ input uinput \
"
# Configuration bits for "generic handheld"
-BOOTSTRAP_EXTRA_DEPENDS += "pcmciautils apmd ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin scap network-suspend-scripts"
-BOOTSTRAP_EXTRA_RDEPENDS += "pcmciautils apm apmd network-suspend-scripts"
-BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin scap ${@linux_module_packages('${HANDHELD_MODULES}', d)}"
+BOOTSTRAP_EXTRA_DEPENDS += "pcmcia-cs apmd ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin network-suspend-scripts"
+BOOTSTRAP_EXTRA_RDEPENDS += "pcmcia-cs apm apmd network-suspend-scripts"
+BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin ${@linux_module_packages('${HANDHELD_MODULES}', d)}"
INHERIT += "linux_modules"
diff --git a/conf/machine/ipaq-common.conf b/conf/machine/ipaq-common.conf
index 95ac3d73f6..791abd2103 100644
--- a/conf/machine/ipaq-common.conf
+++ b/conf/machine/ipaq-common.conf
@@ -1,8 +1,8 @@
-IPAQ_MODULES = "apm h3600_generic_sleeve ipaq-sleeve ipaq-mtd-asset nvrd sa1100-rtc ipaq-hal h3600_ts usb-eth wavelan_cs keybdev"
+IPAQ_MODULES = "apm h3600_generic_sleeve ipaq-sleeve ipaq-mtd-asset nvrd atmelwlandriver sa1100-rtc ipaq-hal h3600_ts usb-eth wavelan_cs keybdev"
-BOOTSTRAP_EXTRA_DEPENDS += "kbdd bl hostap-modules orinoco-modules"
+BOOTSTRAP_EXTRA_DEPENDS += "kbdd bl hostap-modules orinoco-modules atmelwlandriver"
BOOTSTRAP_EXTRA_DEPENDS_append_kernel24 += "mipv6"
-BOOTSTRAP_EXTRA_RRECOMMENDS += "kbdd bl hostap-modules-cs orinoco-modules-cs ${@linux_module_packages('${IPAQ_MODULES}', d)}"
+BOOTSTRAP_EXTRA_RRECOMMENDS += "kbdd bl hostap-modules-cs orinoco-modules-cs atmelwlandriver ${@linux_module_packages('${IPAQ_MODULES}', d)}"
BOOTSTRAP_EXTRA_RRECOMMENDS_append_kernel24 += "mipv6"
PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
diff --git a/conf/machine/ipaq-pxa270.conf b/conf/machine/ipaq-pxa270.conf
index d8432702c2..626b5cf218 100644
--- a/conf/machine/ipaq-pxa270.conf
+++ b/conf/machine/ipaq-pxa270.conf
@@ -30,9 +30,6 @@ GUI_MACHINE_CLASS = "bigscreen"
GPE_EXTRA_DEPENDS += "gaim"
GPE_EXTRA_INSTALL += "gaim"
-GPE_EXTRA_DEPENDS += " nano less gdb strace avahi-daemon zeroconf"
-GPE_EXTRA_INSTALL += " nano less gdb strace avahi-daemon zeroconf"
-
# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
include conf/machine/tune-xscale.conf