summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2005-07-01 16:48:02 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-07-01 16:48:02 +0000
commit1fda5f0233832ffa3c8adff3499b64ab3f7b7248 (patch)
treee7a31ee5eb0ff8f3a8315b0628bdf698a9dc2852 /conf
parent111f86089107b5ad0964e4c83f5560ed088addef (diff)
parent98e918cd032419d07cb1e60ce354c3f6a6da394f (diff)
merge of a03f0834b5caae5065d7445ef3fed2c8700023a8
and fdb811870800bdc6cab69dcfe11f49ee8958d637
Diffstat (limited to 'conf')
-rw-r--r--conf/machine/mainstone.conf4
-rw-r--r--conf/machine/nokia770.conf5
2 files changed, 3 insertions, 6 deletions
diff --git a/conf/machine/mainstone.conf b/conf/machine/mainstone.conf
index e9ef8fae18..f3981ed4c5 100644
--- a/conf/machine/mainstone.conf
+++ b/conf/machine/mainstone.conf
@@ -1,6 +1,6 @@
#@TYPE: Machine
-#@Name: Vibren PXA255 IDP Development Platform
-#@DESCRIPTION: Machine configuration for Vibren PXA255 IDP
+#@Name: Mainstone PXA270 Development Platform
+#@DESCRIPTION: Machine configuration for Intel Mainstone PXA270 Development Platform
TARGET_ARCH = "arm"
diff --git a/conf/machine/nokia770.conf b/conf/machine/nokia770.conf
index f017726526..99544de28c 100644
--- a/conf/machine/nokia770.conf
+++ b/conf/machine/nokia770.conf
@@ -33,7 +33,7 @@ SERIAL_CONSOLE = "115200 ttyS0"
PREFERRED_PROVIDER_virtual/kernel = "linux-omap1"
BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel udev sysfsutils \
-pcmcia-cs apmd ppp wireless-tools console-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin"
+pcmcia-cs apmd ppp wireless-tools console-tools openswan wpa-supplicant-nossl lrzsz ppp-dialin"
BOOTSTRAP_EXTRA_RDEPENDS = "kernel udev sysfsutils \
pcmcia-cs apm ppp wireless-tools irda-utils udev-utils console-tools"
@@ -49,9 +49,6 @@ pcmcia-cs apm ppp wireless-tools irda-utils udev-utils console-tools"
# Bluetooth Modules
#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluetooth kernel-module-l2cap kernel-module-rfcomm kernel-module-hci-vhci \
# kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco"
-# 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"