diff options
author | Richard Purdie <richard@openedhand.com> | 2006-04-12 16:30:12 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2006-04-12 16:30:12 +0000 |
commit | 78913760b63f4ab0fb28c5f6fee78c2f28db8a8f (patch) | |
tree | c54f8c5898e0b60a80d576aee8ade2d1d703cbef /openembedded | |
parent | 38f54bc7195393ef10d337f528e6f2fcc4027a22 (diff) | |
download | poky-78913760b63f4ab0fb28c5f6fee78c2f28db8a8f.tar.gz |
oe/conf: Remove borzoi machine
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@349 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded')
-rw-r--r-- | openembedded/conf/distro/angstrom-2006.9.conf | 2 | ||||
-rw-r--r-- | openembedded/conf/machine/include/zaurus-clamshell-2.4.conf | 5 | ||||
-rw-r--r-- | openembedded/conf/machine/include/zaurus-clamshell-2.6.conf | 1 |
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" | |||
71 | PCMCIA_MANAGER_c7x0 = "pcmciautils" | 71 | PCMCIA_MANAGER_c7x0 = "pcmciautils" |
72 | PCMCIA_MANAGER_akita = "pcmciautils" | 72 | PCMCIA_MANAGER_akita = "pcmciautils" |
73 | PCMCIA_MANAGER_spitz = "pcmciautils" | 73 | PCMCIA_MANAGER_spitz = "pcmciautils" |
74 | PCMCIA_MANAGER_borzoi = "pcmciautils" | ||
75 | PCMCIA_MANAGER_nokia770 = "pcmciautils" | 74 | PCMCIA_MANAGER_nokia770 = "pcmciautils" |
76 | PCMCIA_MANAGER_ipaq-pxa270 = "pcmciautils" | 75 | PCMCIA_MANAGER_ipaq-pxa270 = "pcmciautils" |
77 | 76 | ||
@@ -87,6 +86,5 @@ GPE_EXTRA_INSTALL_append_nokia770 = " libgtkinput" | |||
87 | #GPE_EXTRA_INSTALL_append_tosa = " libgtkinput" | 86 | #GPE_EXTRA_INSTALL_append_tosa = " libgtkinput" |
88 | #GPE_EXTRA_INSTALL_append_akita = " libgtkinput" | 87 | #GPE_EXTRA_INSTALL_append_akita = " libgtkinput" |
89 | #GPE_EXTRA_INSTALL_append_spitz = " libgtkinput" | 88 | #GPE_EXTRA_INSTALL_append_spitz = " libgtkinput" |
90 | #GPE_EXTRA_INSTALL_append_borzoi = " libgtkinput" | ||
91 | 89 | ||
92 | 90 | ||
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 @@ | |||
4 | PREFERRED_PROVIDERS_append_c7x0 = " virtual/kernel:c7x0-kernels-2.4-embedix" | 4 | PREFERRED_PROVIDERS_append_c7x0 = " virtual/kernel:c7x0-kernels-2.4-embedix" |
5 | PREFERRED_PROVIDERS_append_akita = " virtual/kernel:openzaurus-pxa27x" | 5 | PREFERRED_PROVIDERS_append_akita = " virtual/kernel:openzaurus-pxa27x" |
6 | PREFERRED_PROVIDERS_append_spitz = " virtual/kernel:openzaurus-pxa27x" | 6 | PREFERRED_PROVIDERS_append_spitz = " virtual/kernel:openzaurus-pxa27x" |
7 | PREFERRED_PROVIDERS_append_borzoi = " virtual/kernel:openzaurus-pxa27x" | ||
8 | 7 | ||
9 | # Later versions are broken on kernel 2.4 | 8 | # Later versions are broken on kernel 2.4 |
10 | PREFERRED_VERSION_orinoco-modules = "0.13e" | 9 | PREFERRED_VERSION_orinoco-modules = "0.13e" |
@@ -29,7 +28,6 @@ BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluez kernel-module-l2cap kernel-modu | |||
29 | BOOTSTRAP_EXTRA_RDEPENDS_append_c7x0 = " kernel-module-pxa-bi" | 28 | BOOTSTRAP_EXTRA_RDEPENDS_append_c7x0 = " kernel-module-pxa-bi" |
30 | BOOTSTRAP_EXTRA_RDEPENDS_append_spitz = " kernel-module-pxa27x-bi" | 29 | BOOTSTRAP_EXTRA_RDEPENDS_append_spitz = " kernel-module-pxa27x-bi" |
31 | BOOTSTRAP_EXTRA_RDEPENDS_append_akita = " kernel-module-pxa27x-bi" | 30 | BOOTSTRAP_EXTRA_RDEPENDS_append_akita = " kernel-module-pxa27x-bi" |
32 | BOOTSTRAP_EXTRA_RDEPENDS_append_borzoi = " kernel-module-pxa27x-bi" | ||
33 | 31 | ||
34 | # USB Host Modules | 32 | # USB Host Modules |
35 | BOOTSTRAP_EXTRA_RDEPENDS_append_spitz = " kernel-module-usbcore kernel-module-usbmouse kernel-module-usb-monitor \ | 33 | 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 | |||
38 | BOOTSTRAP_EXTRA_RDEPENDS_append_akita = " kernel-module-usbcore kernel-module-usbmouse kernel-module-usb-monitor \ | 36 | BOOTSTRAP_EXTRA_RDEPENDS_append_akita = " kernel-module-usbcore kernel-module-usbmouse kernel-module-usb-monitor \ |
39 | kernel-module-usbkbd kernel-module-usb-storage kernel-module-hci-usb \ | 37 | kernel-module-usbkbd kernel-module-usb-storage kernel-module-hci-usb \ |
40 | kernel-module-usb-ohci-pxa27x kernel-module-bfusb" | 38 | kernel-module-usb-ohci-pxa27x kernel-module-bfusb" |
41 | BOOTSTRAP_EXTRA_RDEPENDS_append_borzoi = " kernel-module-usbcore kernel-module-usbmouse kernel-module-usb-monitor \ | ||
42 | kernel-module-usbkbd kernel-module-usb-storage kernel-module-hci-usb \ | ||
43 | kernel-module-usb-ohci-pxa27x kernel-module-bfusb" | ||
44 | 39 | ||
45 | GPE_EXTRA_INSTALL += "chkhinge" | 40 | 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 | |||
46 | 46 | ||
47 | BOOTSTRAP_EXTRA_RDEPENDS_append_c7x0 += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-corgi kernel-module-snd-soc-wm8731 " | 47 | BOOTSTRAP_EXTRA_RDEPENDS_append_c7x0 += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-corgi kernel-module-snd-soc-wm8731 " |
48 | BOOTSTRAP_EXTRA_RDEPENDS_append_akita += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 " | 48 | BOOTSTRAP_EXTRA_RDEPENDS_append_akita += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 " |
49 | BOOTSTRAP_EXTRA_RDEPENDS_append_borzoi += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 " | ||
50 | BOOTSTRAP_EXTRA_RDEPENDS_append_spitz += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 " | 49 | BOOTSTRAP_EXTRA_RDEPENDS_append_spitz += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 " |