diff options
| -rw-r--r-- | meta/conf/machine/akita.conf | 1 | ||||
| -rw-r--r-- | meta/conf/machine/cmx270.conf | 2 | ||||
| -rw-r--r-- | meta/conf/machine/include/poodle-2.6.conf | 44 | ||||
| -rw-r--r-- | meta/conf/machine/include/tosa-2.6.conf | 4 | ||||
| -rw-r--r-- | meta/conf/machine/include/tune-arm920t.conf | 3 | ||||
| -rw-r--r-- | meta/conf/machine/include/tune-arm926ejs.conf | 1 | ||||
| -rw-r--r-- | meta/conf/machine/include/tune-ep9312.conf | 2 | ||||
| -rw-r--r-- | meta/conf/machine/include/zaurus-clamshell-2.6.conf | 2 | ||||
| -rw-r--r-- | meta/conf/machine/include/zaurus-clamshell.conf | 2 | ||||
| -rw-r--r-- | meta/conf/machine/ipaq-pxa270.conf | 2 | ||||
| -rw-r--r-- | meta/conf/machine/spitz.conf | 1 |
11 files changed, 13 insertions, 51 deletions
diff --git a/meta/conf/machine/akita.conf b/meta/conf/machine/akita.conf index c191b9031..0358864c7 100644 --- a/meta/conf/machine/akita.conf +++ b/meta/conf/machine/akita.conf @@ -5,6 +5,7 @@ include conf/machine/include/zaurus-clamshell.conf include conf/machine/include/zaurus-clamshell-2.6.conf +IPKG_EXTRA_ARCHS += "iwmmxt" IMAGE_FSTYPES ?= "jffs2" ROOT_FLASH_SIZE = "58" diff --git a/meta/conf/machine/cmx270.conf b/meta/conf/machine/cmx270.conf index ad560db63..9fc91c552 100644 --- a/meta/conf/machine/cmx270.conf +++ b/meta/conf/machine/cmx270.conf @@ -2,7 +2,7 @@ #@NAME: Nokia 770 internet tablet #@DESCRIPTION: Machine configuration for the Compulab CM-X270 TARGET_ARCH = "arm" -IPKG_EXTRA_ARCHS = "armv4 armv5te" +IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te iwmmxt" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n" diff --git a/meta/conf/machine/include/poodle-2.6.conf b/meta/conf/machine/include/poodle-2.6.conf index 907635552..eff0ad4c7 100644 --- a/meta/conf/machine/include/poodle-2.6.conf +++ b/meta/conf/machine/include/poodle-2.6.conf @@ -1,43 +1 @@ -PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" - -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 " +require conf/machine/include/zaurus-clamshell-2.6.conf diff --git a/meta/conf/machine/include/tosa-2.6.conf b/meta/conf/machine/include/tosa-2.6.conf index c7805c36f..6831b0ea9 100644 --- a/meta/conf/machine/include/tosa-2.6.conf +++ b/meta/conf/machine/include/tosa-2.6.conf @@ -1,6 +1,6 @@ include conf/machine/include/zaurus-clamshell-2.6.conf # wlan-ng Modules -BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules-usb" +MACHINE_EXTRA_RDEPENDS += "wlan-ng-modules-usb" # WM97xx Modules -#BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-wm97xx-core kernel-module-wm9705 kernel-module-pxa-wm97xx" +#MACHINE_EXTRA_RRECOMMENDS += "kernel-module-wm97xx-core kernel-module-wm9705 kernel-module-pxa-wm97xx" diff --git a/meta/conf/machine/include/tune-arm920t.conf b/meta/conf/machine/include/tune-arm920t.conf index 936b13751..992f1923c 100644 --- a/meta/conf/machine/include/tune-arm920t.conf +++ b/meta/conf/machine/include/tune-arm920t.conf @@ -1,2 +1,3 @@ -TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t" +PACKAGE_ARCH = "armv4t" +TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t -mcpu=arm920t" diff --git a/meta/conf/machine/include/tune-arm926ejs.conf b/meta/conf/machine/include/tune-arm926ejs.conf index c1462ee14..ce1d4f720 100644 --- a/meta/conf/machine/include/tune-arm926ejs.conf +++ b/meta/conf/machine/include/tune-arm926ejs.conf @@ -1,4 +1,3 @@ -#if gcc breaks change arm926ejs to arm926ej-s # For gcc 3.x you need: TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs" # For gcc 4.x you need: diff --git a/meta/conf/machine/include/tune-ep9312.conf b/meta/conf/machine/include/tune-ep9312.conf index f7a6fb845..0982cf2a1 100644 --- a/meta/conf/machine/include/tune-ep9312.conf +++ b/meta/conf/machine/include/tune-ep9312.conf @@ -1,4 +1,4 @@ -TARGET_CC_ARCH = "-march=ep9312 -mtune=ep9312" +TARGET_CC_ARCH = "-march=ep9312 -mtune=ep9312 -mcpu=ep9312" # add "-mfp=maverick" for newer gcc versions > 4.0 #set arch to ep9312 for all generated packages diff --git a/meta/conf/machine/include/zaurus-clamshell-2.6.conf b/meta/conf/machine/include/zaurus-clamshell-2.6.conf index fa2adda6f..e0a9e38e9 100644 --- a/meta/conf/machine/include/zaurus-clamshell-2.6.conf +++ b/meta/conf/machine/include/zaurus-clamshell-2.6.conf @@ -15,4 +15,6 @@ MACHINE_EXTRA_RDEPENDS = "zaurusd" MACHINE_EXTRA_RRECOMMENDS_c7x0 = "kernel-module-snd-soc-corgi" MACHINE_EXTRA_RRECOMMENDS_akita = "kernel-module-snd-soc-spitz" MACHINE_EXTRA_RRECOMMENDS_spitz = "kernel-module-snd-soc-spitz" +MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle" +MACHINE_TASK_PROVIDER = "task-base"
\ No newline at end of file diff --git a/meta/conf/machine/include/zaurus-clamshell.conf b/meta/conf/machine/include/zaurus-clamshell.conf index 00d687963..e600a4926 100644 --- a/meta/conf/machine/include/zaurus-clamshell.conf +++ b/meta/conf/machine/include/zaurus-clamshell.conf @@ -1,5 +1,5 @@ TARGET_ARCH = "arm" -IPKG_EXTRA_ARCHS = "armv4 armv5te" +IPKG_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te" PREFERRED_PROVIDER_xserver = "xserver-kdrive" diff --git a/meta/conf/machine/ipaq-pxa270.conf b/meta/conf/machine/ipaq-pxa270.conf index e621d7b9b..bd92ad5de 100644 --- a/meta/conf/machine/ipaq-pxa270.conf +++ b/meta/conf/machine/ipaq-pxa270.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for the iPAQ with a pxa27x CPU devices TARGET_ARCH = "arm" -IPKG_EXTRA_ARCHS = "armv4 armv5te ipaqpxa hx4700" +IPKG_EXTRA_ARCHS = "armv4 armv4t armv5te iwmmxt ipaqpxa hx4700" #use this for a hx2xxx ipaq PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus" diff --git a/meta/conf/machine/spitz.conf b/meta/conf/machine/spitz.conf index 6588702a8..af50217e0 100644 --- a/meta/conf/machine/spitz.conf +++ b/meta/conf/machine/spitz.conf @@ -7,6 +7,7 @@ include conf/machine/include/zaurus-clamshell-2.6.conf PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit ${PCMCIA_MANAGER}" +IPKG_EXTRA_ARCHS += "iwmmxt" IMAGE_FSTYPES ?= "tar.gz" ROOT_FLASH_SIZE = "100" |