From 8d41bd1c8f4c36ed9c1c73e0586031af8a0f292c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Tue, 9 May 2006 16:10:18 +0000 Subject: Sync conf files with OE git-svn-id: https://svn.o-hand.com/repos/poky/trunk@373 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- openembedded/conf/machine/include/poodle-2.4.conf | 10 ------ openembedded/conf/machine/include/poodle-2.6.conf | 41 +++++++++++++++++++++- openembedded/conf/machine/include/tosa-2.4.conf | 20 ----------- .../conf/machine/include/tune-arm926ejs.conf | 3 +- .../conf/machine/include/zaurus-clamshell-2.4.conf | 40 --------------------- 5 files changed, 42 insertions(+), 72 deletions(-) delete mode 100644 openembedded/conf/machine/include/poodle-2.4.conf delete mode 100644 openembedded/conf/machine/include/tosa-2.4.conf delete mode 100644 openembedded/conf/machine/include/zaurus-clamshell-2.4.conf (limited to 'openembedded/conf/machine/include') diff --git a/openembedded/conf/machine/include/poodle-2.4.conf b/openembedded/conf/machine/include/poodle-2.4.conf deleted file mode 100644 index 5453fda60..000000000 --- a/openembedded/conf/machine/include/poodle-2.4.conf +++ /dev/null @@ -1,10 +0,0 @@ -PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa" - -# Later versions are broken on kernel 2.4 -PREFERRED_VERSION_orinoco-modules = "0.13e" - -BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules orinoco-modules-cs sharp-sdmmc-support \ -kernel-module-net-fd kernel-module-registers kernel-module-pxa-bi \ -kernel-module-usbdcore kernel-module-usbdmonitor \ -hostap-utils prism3-firmware prism3-support" - diff --git a/openembedded/conf/machine/include/poodle-2.6.conf b/openembedded/conf/machine/include/poodle-2.6.conf index 885bf40b4..907635552 100644 --- a/openembedded/conf/machine/include/poodle-2.6.conf +++ b/openembedded/conf/machine/include/poodle-2.6.conf @@ -1,4 +1,43 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" -BOOTSTRAP_EXTRA_RDEPENDS = "kernel udev sysfsutils hostap-modules-cs orinoco-modules-cs udev-utils" +PCMCIA_MANAGER ?= "pcmciautils" +BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \ +${PCMCIA_MANAGER} apm wireless-tools irda-utils udev-utils keymaps hostap-utils prism3-firmware prism3-support \ +ppp ppp-dialin alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf zaurusd" + +# Ethernet modules +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcnet-cs" +# NFS Modules +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-nfs kernel-module-lockd kernel-module-sunrpc" +# Crypto Modules +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-des kernel-module-md5" +# SMB and CRAMFS +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-smbfs kernel-module-cramfs" +# Serial Modules +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-8250 kernel-module-serial-cs" +# 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 \ + kernel-module-bt3c-cs kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs" +# Infrared Modules +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pxaficp-ir kernel-module-irda kernel-module-ircomm \ + kernel-module-ircomm-tty kernel-module-irlan kernel-module-irnet kernel-module-ir-usb" + +# USB Gadget Modules +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-gadgetfs kernel-module-g-file-storage \ + kernel-module-g-serial kernel-module-g-ether" + +# Wireless Modules +BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-hostap kernel-module-hostap-cs \ + kernel-module-hermes kernel-module-orinoco \ + kernel-module-orinoco-cs kernel-module-spectrum-cs \ + hostap-conf orinoco-conf" + +# Sound Modules +###BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-snd-mixer-oss kernel-module-snd-pcm-oss" +BOOTSTRAP_EXTRA_SOUND = "kernel-module-soundcore kernel-module-snd kernel-module-snd-page-alloc kernel-module-snd-timer \ + kernel-module-snd-pcm \ + kernel-module-snd-soc-core kernel-module-snd-soc-pxa2xx kernel-module-snd-soc-pxa2xx-i2s" + +###BOOTSTRAP_EXTRA_RDEPENDS_append_poodle += "${BOOTSTRAP_EXTRA_SOUND} kernel-module-snd-soc-poodle kernel-module-snd-soc-wm8731 " diff --git a/openembedded/conf/machine/include/tosa-2.4.conf b/openembedded/conf/machine/include/tosa-2.4.conf deleted file mode 100644 index 88df07cdd..000000000 --- a/openembedded/conf/machine/include/tosa-2.4.conf +++ /dev/null @@ -1,20 +0,0 @@ -PREFERRED_PROVIDER_xserver = "xserver-kdrive" -PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa" - -# Later versions are broken on kernel 2.4 -PREFERRED_VERSION_orinoco-modules = "0.13e" - -BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules wlan-ng-utils console-tools \ - kernel-module-acm \ - kernel-module-evdev kernel-module-net-fd \ - kernel-module-pxa-bi kernel-module-registers \ - kernel-module-storage-fd kernel-module-usb-ohci-tc6393 \ - kernel hostap-modules-cs orinoco-modules-cs \ - sharp-sdmmc-support kernel-module-pxa-bi \ - kernel-module-ip-gre kernel-module-irnet kernel-module-ipip \ - kernel-module-usbcore kernel-module-usbdcore kernel-module-usbdmonitor kernel-module-usb-storage" - -RRECOMMENDS += "kernel-module-usbdserial kernel-module-usbkbd \ - kernel-module-usbmouse kernel-module-hid usbutils \ - kernel-module-evdev" - diff --git a/openembedded/conf/machine/include/tune-arm926ejs.conf b/openembedded/conf/machine/include/tune-arm926ejs.conf index 5e2f6b7c6..d2c7bfac8 100644 --- a/openembedded/conf/machine/include/tune-arm926ejs.conf +++ b/openembedded/conf/machine/include/tune-arm926ejs.conf @@ -1,3 +1,4 @@ #if gcc breaks change arm926ejs to arm926ej-s -TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs" +#TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs" +TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ej-s" PACKAGE_ARCH = "armv5te" diff --git a/openembedded/conf/machine/include/zaurus-clamshell-2.4.conf b/openembedded/conf/machine/include/zaurus-clamshell-2.4.conf deleted file mode 100644 index aaee8765a..000000000 --- a/openembedded/conf/machine/include/zaurus-clamshell-2.4.conf +++ /dev/null @@ -1,40 +0,0 @@ -# Zaurus Clamshell specific configuration for kernel 2.4 -# Don't forget to include zaurus-clamshell.conf as well - -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" - -# Later versions are broken on kernel 2.4 -PREFERRED_VERSION_orinoco-modules = "0.13e" - -BOOTSTRAP_EXTRA_RDEPENDS += "kernel hostap-modules-cs orinoco-modules-cs sharp-sdmmc-support \ -pcmcia-cs apmd apm wireless-tools console-tools irda-utils hostap-utils prism3-firmware prism3-support \ -wpa-supplicant-nossl ppp ppp-dialin openswan" - -# Misc Modules -BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-net-fd kernel-module-registers" - -# USB Client Modules -BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-usbdcore kernel-module-usbdmonitor" - -# Bluetooth Modules -BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-bluez kernel-module-l2cap kernel-module-rfcomm kernel-module-hci-vhci \ - kernel-module-bnep kernel-module-hidp kernel-module-hci-uart kernel-module-sco \ - kernel-module-bluecard-cs kernel-module-btuart-cs kernel-module-dtl1-cs \ - kernel-module-firmware-class kernel-module-bt3c-cs" - -# BI Module -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" - -# USB Host Modules -BOOTSTRAP_EXTRA_RDEPENDS_append_spitz = " 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_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" - -GPE_EXTRA_INSTALL += "chkhinge" -- cgit v1.2.3