aboutsummaryrefslogtreecommitdiffstats
path: root/conf
diff options
context:
space:
mode:
authorRod Whitby <rod@whitby.id.au>2005-07-01 07:46:49 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-07-01 07:46:49 +0000
commit98e918cd032419d07cb1e60ce354c3f6a6da394f (patch)
treeccd6e3d10b42aa7dc843b9d4947fc6ffb08da565 /conf
parent63f04a6a3c2ad5a5503787afcbfbfa80136767f2 (diff)
parente479db78e83fc974bfc2c9a89973125371b87b82 (diff)
downloadopenembedded-98e918cd032419d07cb1e60ce354c3f6a6da394f.tar.gz
propagate from branch 'org.openembedded.dev' (head 40ab23b1b8e8e478cc075a3795e981566f038498)
to branch 'org.openembedded.nslu2-linux' (head bbe3a6dc7e44dab7715ed5caa3acbbbe308a7f69)
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"