summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-04-12 16:30:12 +0000
committerRichard Purdie <richard@openedhand.com>2006-04-12 16:30:12 +0000
commit78913760b63f4ab0fb28c5f6fee78c2f28db8a8f (patch)
treec54f8c5898e0b60a80d576aee8ade2d1d703cbef
parent38f54bc7195393ef10d337f528e6f2fcc4027a22 (diff)
downloadopenembedded-core-78913760b63f4ab0fb28c5f6fee78c2f28db8a8f.tar.gz
openembedded-core-78913760b63f4ab0fb28c5f6fee78c2f28db8a8f.tar.bz2
openembedded-core-78913760b63f4ab0fb28c5f6fee78c2f28db8a8f.zip
oe/conf: Remove borzoi machine
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@349 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--openembedded/conf/distro/angstrom-2006.9.conf2
-rw-r--r--openembedded/conf/machine/include/zaurus-clamshell-2.4.conf5
-rw-r--r--openembedded/conf/machine/include/zaurus-clamshell-2.6.conf1
3 files changed, 0 insertions, 8 deletions
diff --git a/openembedded/conf/distro/angstrom-2006.9.conf b/openembedded/conf/distro/angstrom-2006.9.conf
index ce11ddf08c..0eeefcec72 100644
--- a/openembedded/conf/distro/angstrom-2006.9.conf
+++ b/openembedded/conf/distro/angstrom-2006.9.conf
@@ -71,7 +71,6 @@ PREFERRED_VERSION_dbus = "0.61"
PCMCIA_MANAGER_c7x0 = "pcmciautils"
PCMCIA_MANAGER_akita = "pcmciautils"
PCMCIA_MANAGER_spitz = "pcmciautils"
-PCMCIA_MANAGER_borzoi = "pcmciautils"
PCMCIA_MANAGER_nokia770 = "pcmciautils"
PCMCIA_MANAGER_ipaq-pxa270 = "pcmciautils"
@@ -87,6 +86,5 @@ GPE_EXTRA_INSTALL_append_nokia770 = " libgtkinput"
#GPE_EXTRA_INSTALL_append_tosa = " libgtkinput"
#GPE_EXTRA_INSTALL_append_akita = " libgtkinput"
#GPE_EXTRA_INSTALL_append_spitz = " libgtkinput"
-#GPE_EXTRA_INSTALL_append_borzoi = " libgtkinput"
diff --git a/openembedded/conf/machine/include/zaurus-clamshell-2.4.conf b/openembedded/conf/machine/include/zaurus-clamshell-2.4.conf
index af66c7294e..aaee8765a9 100644
--- a/openembedded/conf/machine/include/zaurus-clamshell-2.4.conf
+++ b/openembedded/conf/machine/include/zaurus-clamshell-2.4.conf
@@ -4,7 +4,6 @@
PREFERRED_PROVIDERS_append_c7x0 = " virtual/kernel:c7x0-kernels-2.4-embedix"
PREFERRED_PROVIDERS_append_akita = " virtual/kernel:openzaurus-pxa27x"
PREFERRED_PROVIDERS_append_spitz = " virtual/kernel:openzaurus-pxa27x"
-PREFERRED_PROVIDERS_append_borzoi = " virtual/kernel:openzaurus-pxa27x"
# Later versions are broken on kernel 2.4
PREFERRED_VERSION_orinoco-modules = "0.13e"
@@ -29,7 +28,6 @@ BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluez kernel-module-l2cap kernel-modu
BOOTSTRAP_EXTRA_RDEPENDS_append_c7x0 = " kernel-module-pxa-bi"
BOOTSTRAP_EXTRA_RDEPENDS_append_spitz = " kernel-module-pxa27x-bi"
BOOTSTRAP_EXTRA_RDEPENDS_append_akita = " kernel-module-pxa27x-bi"
-BOOTSTRAP_EXTRA_RDEPENDS_append_borzoi = " kernel-module-pxa27x-bi"
# USB Host Modules
BOOTSTRAP_EXTRA_RDEPENDS_append_spitz = " kernel-module-usbcore kernel-module-usbmouse kernel-module-usb-monitor \
@@ -38,8 +36,5 @@ BOOTSTRAP_EXTRA_RDEPENDS_append_spitz = " kernel-module-usbcore kernel-module-u
BOOTSTRAP_EXTRA_RDEPENDS_append_akita = " kernel-module-usbcore kernel-module-usbmouse kernel-module-usb-monitor \
kernel-module-usbkbd kernel-module-usb-storage kernel-module-hci-usb \
kernel-module-usb-ohci-pxa27x kernel-module-bfusb"
-BOOTSTRAP_EXTRA_RDEPENDS_append_borzoi = " kernel-module-usbcore kernel-module-usbmouse kernel-module-usb-monitor \
- kernel-module-usbkbd kernel-module-usb-storage kernel-module-hci-usb \
- kernel-module-usb-ohci-pxa27x kernel-module-bfusb"
GPE_EXTRA_INSTALL += "chkhinge"
diff --git a/openembedded/conf/machine/include/zaurus-clamshell-2.6.conf b/openembedded/conf/machine/include/zaurus-clamshell-2.6.conf
index e73028d7ee..224dbdce9f 100644
--- a/openembedded/conf/machine/include/zaurus-clamshell-2.6.conf
+++ b/openembedded/conf/machine/include/zaurus-clamshell-2.6.conf
@@ -46,5 +46,4 @@ BOOTSTRAP_EXTRA_SOUND = "kernel-module-soundcore kernel-module-snd kernel-mod
BOOTSTRAP_EXTRA_RDEPENDS_append_c7x0 += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-corgi kernel-module-snd-soc-wm8731 "
BOOTSTRAP_EXTRA_RDEPENDS_append_akita += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 "
-BOOTSTRAP_EXTRA_RDEPENDS_append_borzoi += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 "
BOOTSTRAP_EXTRA_RDEPENDS_append_spitz += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 "