mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-12 06:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Sync conf files with OE - includes adding zaurusd to images and fixing PCMCIA_MANAGER handling

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@327 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
2006-03-23 22:30:35 +00:00
parent f7f54600f1
commit b3f42b7599
13 changed files with 256 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
openembedded/conf/machine/include/handheld-common.conf
View File

@@ -7,7 +7,7 @@ ide-cs ide-disk ide-probe-mod \
loop \
vfat ext2 \
sunrpc nfs \
btuart-cs dtl1-cs bt3c-cs rfcomm bnep l2cap sco hci_uart \
btuart-cs dtl1-cs bt3c-cs rfcomm bnep l2cap sco hci_uart hidp \
pcnet-cs serial-cs airo-cs \
af_packet \
ppp-async ppp-deflate ppp-mppe \
@@ -16,8 +16,6 @@ irda irlan irnet irport irtty ircomm-tty \
input uinput \
"
PCMCIA_MANAGER ?= "pcmcia-cs"
# Configuration bits for "generic handheld"
BOOTSTRAP_EXTRA_RDEPENDS += "${PCMCIA_MANAGER} apm apmd network-suspend-scripts"
BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin ${@linux_module_packages('${HANDHELD_MODULES}', d)}"

14
openembedded/conf/machine/include/tosa-2.6.conf
View File

@@ -1,14 +1,6 @@
include conf/machine/include/zaurus-clamshell-2.6.conf
# SOUND Modules
BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-snd kernel-module-snd-ac97-bus kernel-module-snd-ac97-codec kernel-module-snd-mixer-oss kernel-module-snd-page-alloc kernel-module-snd-pcm kernel-module-snd-pcm-oss kernel-module-snd-pxa2xx-ac97 kernel-module-snd-pxa2xx-pcm kernel-module-snd-timer kernel-module-soundcore"
module_autoload_snd-pxa2xx-ac97 = "snd-pxa2xx-ac97"
module_autoload_snd-pcm-oss ="snd-pcm-oss"
# wlan-ng Modules
BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules-usb"
# WM97xx Modules
BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-wm97xx-core kernel-module-wm9705 kernel-module-pxa-wm97xx"
module_autoload_wm9705 = "wm9705"
#module_autoload_pxa-wm97xx = "pen_int=0"
#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-wm97xx"
#module_autoload_wm97xx = "wm97xx"
#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-wm97xx-core kernel-module-wm9705 kernel-module-pxa-wm97xx"

1
openembedded/conf/machine/include/zaurus-clamshell-2.4.conf
View File

@@ -42,3 +42,4 @@ BOOTSTRAP_EXTRA_RDEPENDS_append_borzoi = " kernel-module-usbcore kernel-module-u
kernel-module-usbkbd kernel-module-usb-storage kernel-module-hci-usb \
kernel-module-usb-ohci-pxa27x kernel-module-bfusb"
GPE_EXTRA_INSTALL += "chkhinge"

21
openembedded/conf/machine/include/zaurus-clamshell-2.6.conf
View File

@@ -2,10 +2,13 @@
# Don't forget to include zaurus-clamshell.conf as well
PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
PREFERRED_VERSION_wpa_supplicant = "0.4.7"
PCMCIA_MANAGER ?= "pcmciautils"
BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \
pcmciautils apm wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \
ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf"
${PCMCIA_MANAGER} apm wireless-tools irda-utils udev-utils console-tools hostap-utils prism3-firmware prism3-support \
ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils-alsactl alsa-utils-alsamixer module-init-tools alsa-conf zaurusd"
# Ethernet modules
BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-pcnet-cs"
@@ -36,10 +39,12 @@ BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-hostap kernel-module-hostap-cs \
hostap-conf orinoco-conf"
# Sound Modules
BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-soundcore kernel-module-snd kernel-module-snd-page-alloc kernel-module-snd-timer \
kernel-module-snd-pcm kernel-module-snd-mixer-oss kernel-module-snd-pcm-oss \
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_c7x0 += " kernel-module-snd-soc-corgi kernel-module-snd-soc-wm8731 "
BOOTSTRAP_EXTRA_RDEPENDS_append_akita += " kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 "
BOOTSTRAP_EXTRA_RDEPENDS_append_borzoi += " kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 "
BOOTSTRAP_EXTRA_RDEPENDS_append_spitz += " kernel-module-snd-soc-spitz kernel-module-snd-soc-wm8750 "
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 "

4
openembedded/conf/machine/include/zaurus-clamshell.conf
View File

@@ -1,5 +1,5 @@
TARGET_ARCH = "arm"
IPKG_ARCHS = "all arm armv4 armv5te c7x0"
IPKG_ARCHS = "all arm armv4 armv5te ${MACHINE}"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
@@ -12,7 +12,7 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img"
GUI_MACHINE_CLASS = "bigscreen"
GPE_EXTRA_INSTALL += "gaim sylpheed chkhinge"
GPE_EXTRA_INSTALL += "gaim sylpheed"
include conf/machine/include/handheld-common.conf

22
openembedded/conf/machine/ipaq-pxa270.conf
View File

@@ -4,19 +4,30 @@
TARGET_ARCH = "arm"
IPKG_ARCHS = "all arm armv4 armv5te ipaqpxa hx4700"
#use this for a hx47xx ipaq
PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
#use this for a hx2xxx ipaq
#PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
PREFERRED_VERSIONS_handhelds-pxa-2.6 = "2.6.12-hh3"
PREFERRED_VERSION_orinoco-modules = "0.15rc1"
ROOT_FLASH_SIZE = "80"
BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${PXA270_MODULES}', d)}"
EXTRA_IMAGECMD_jffs2 = "; sumtool -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
-o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs-summary.jffs2 \
-e 256KiB -p"
MODUTILS = "26"
BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params "
BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${PXA270_MODULES}', d)}"
BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools"
PXA270_MODULES = "g_ether g_file_storage g_serial gadgetfs pxa27x_udc \
snd_pcm_oss snd_mixer_oss evdev mmc_block pcmcia hidp \
nls_cp437 nls_iso8859-1 nls_utf8"
nls_cp437 nls_iso8859-1 nls_utf8 af_key"
SERIAL_CONSOLE = "115200 ttyS0"
@@ -29,10 +40,15 @@ GPE_EXTRA_INSTALL += "gaim"
# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
include conf/machine/include/tune-xscale.conf
BOOTSTRAP_EXTRA_RDEPENDS += "${@linux_module_packages('${HX4700_MODULES}', d)}"
# Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first
#include conf/machine/include/tune-iwmmxt.conf
BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${HX4700_MODULES}', d)}"
HX4700_MODULES = "i2c-pxa asic3_mmc hx4700_bt hx4700_leds hx4700_navpt hx4700_pcmcia \
hx4700_ts hx4700_wlan snd_hx4700_audio hx4700_power"
module_autoload_hx4700_power = "hx4700_power"
module_autoload_pcmcia = "pcmcia"
module_autoload_hx4700_pcmcia = "hx4700_pcmcia"

4
openembedded/conf/machine/qemuarm.conf
View File

@@ -7,13 +7,15 @@ KERNEL_VERSION ?= "2.6"
TARGET_ARCH = "arm"
IPKG_ARCHS = "all arm armv4 armv5te qemuarm"
PCMCIA_MANAGER = "pcmciautils"
PREFERRED_PROVIDER_xserver = "xserver-kdrive"
GUI_MACHINE_CLASS = "bigscreen"
GPE_EXTRA_INSTALL += "gaim sylpheed"
include conf/machine/include/handheld-common.conf
include conf/machine/include/tune-arm926ejs.conf
SERIAL_CONSOLE = "115200 ttyS0"
SERIAL_CONSOLE = "115200 ttyAMA0"
PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"