Move machine include files (files that are not machines in their own right) into conf/machine/include.

22 files changed, 254 insertions, 0 deletions

diff --git a/conf/machine/include/.mtn2git_empty b/conf/machine/include/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/include/.mtn2git_empty
diff --git a/conf/machine/include/handheld-common.conf b/conf/machine/include/handheld-common.conf
new file mode 100644
index 0000000000..40fd9780f9
--- /dev/null
+++ b/conf/machine/include/handheld-common.conf
@@ -0,0 +1,26 @@
+HANDHELD_MODULES = "ipv6 \
+ipsec \
+nvrd \
+mip6-mn \
+tun \
+ide-cs ide-disk ide-probe-mod \
+loop \
+vfat ext2 \
+sunrpc nfs \
+btuart-cs dtl1-cs bt3c-cs rfcomm bnep l2cap sco hci_uart \
+pcnet-cs serial-cs airo-cs \
+af_packet \
+ppp-async ppp-deflate ppp-mppe \
+ip-gre ip-tables ipip \
+irda irlan irnet irport irtty ircomm-tty \
+input uinput \
+"
+
+PCMCIA_MANAGER ?= "pcmcia-cs"
+
+# Configuration bits for "generic handheld"
+BOOTSTRAP_EXTRA_DEPENDS += "${PCMCIA_MANAGER} apmd ppp wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz ppp-dialin network-suspend-scripts"
+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)}"
+
+INHERIT += "linux_modules"
diff --git a/conf/machine/include/ipaq-common.conf b/conf/machine/include/ipaq-common.conf
new file mode 100644
index 0000000000..791abd2103
--- /dev/null
+++ b/conf/machine/include/ipaq-common.conf
@@ -0,0 +1,9 @@
+IPAQ_MODULES = "apm h3600_generic_sleeve ipaq-sleeve ipaq-mtd-asset nvrd atmelwlandriver sa1100-rtc ipaq-hal h3600_ts usb-eth wavelan_cs keybdev" 
+
+BOOTSTRAP_EXTRA_DEPENDS += "kbdd bl hostap-modules orinoco-modules atmelwlandriver"
+BOOTSTRAP_EXTRA_DEPENDS_append_kernel24 += "mipv6"
+BOOTSTRAP_EXTRA_RRECOMMENDS += "kbdd bl hostap-modules-cs orinoco-modules-cs atmelwlandriver ${@linux_module_packages('${IPAQ_MODULES}', d)}"
+BOOTSTRAP_EXTRA_RRECOMMENDS_append_kernel24 += "mipv6"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+
diff --git a/conf/machine/include/poodle-2.4.conf b/conf/machine/include/poodle-2.4.conf
new file mode 100644
index 0000000000..dc603d3bcc
--- /dev/null
+++ b/conf/machine/include/poodle-2.4.conf
@@ -0,0 +1,14 @@
+PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa"
+
+# Later versions are broken on kernel 2.4
+PREFERRED_VERSION_orinoco-modules = "0.13e"
+
+BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel \
+hostap-modules orinoco-modules sharp-sdmmc-support \
+hostap-utils prism3-firmware prism3-support"
+
+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/conf/machine/include/poodle-2.6.conf b/conf/machine/include/poodle-2.6.conf
new file mode 100644
index 0000000000..7edebad2d3
--- /dev/null
+++ b/conf/machine/include/poodle-2.6.conf
@@ -0,0 +1,5 @@
+PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
+
+BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel udev sysfsutils modutils-collateral hostap-modules orinoco-modules"
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel udev sysfsutils hostap-modules-cs orinoco-modules-cs udev-utils"
+
diff --git a/conf/machine/include/thinclient-common.conf b/conf/machine/include/thinclient-common.conf
new file mode 100644
index 0000000000..e6c97886c9
--- /dev/null
+++ b/conf/machine/include/thinclient-common.conf
@@ -0,0 +1,20 @@
+THINCLIENT_MODULES = "ipv6 \
+mip6-mn \
+tun \
+loop \
+vfat \
+sunrpc nfs \
+rfcomm bnep l2cap sco \
+af_packet \
+ppp-async ppp-deflate ppp-mppe \
+ip-gre ip-tables ipip \
+irda irlan irnet irport irtty \
+input uinput \
+"
+
+# Configuration bits for "generic thinclient"
+BOOTSTRAP_EXTRA_DEPENDS += "apmd ppp bluez-utils wireless-tools"
+BOOTSTRAP_EXTRA_RDEPENDS +=  "apm"
+BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp bluez-utils wireless-tools ${@linux_module_packages('${THINCLIENT_MODULES}', d)}"
+
+INHERIT += "linux_modules"
diff --git a/conf/machine/include/tosa-2.4.conf b/conf/machine/include/tosa-2.4.conf
new file mode 100644
index 0000000000..6e208f4fc6
--- /dev/null
+++ b/conf/machine/include/tosa-2.4.conf
@@ -0,0 +1,23 @@
+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_DEPENDS += "wlan-ng-modules wlan-ng-utils virtual/kernel hostap-modules \
+			    orinoco-modules sharp-sdmmc-support usbutils console-tools"
+
+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/conf/machine/include/tosa-2.6.conf b/conf/machine/include/tosa-2.6.conf
new file mode 100644
index 0000000000..fdd706d093
--- /dev/null
+++ b/conf/machine/include/tosa-2.6.conf
@@ -0,0 +1,14 @@
+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"
+
+# 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"
diff --git a/conf/machine/include/tune-arm920t.conf b/conf/machine/include/tune-arm920t.conf
new file mode 100644
index 0000000000..936b137517
--- /dev/null
+++ b/conf/machine/include/tune-arm920t.conf
@@ -0,0 +1,2 @@
+TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t"
+
diff --git a/conf/machine/include/tune-arm926ejs.conf b/conf/machine/include/tune-arm926ejs.conf
new file mode 100644
index 0000000000..5e2f6b7c62
--- /dev/null
+++ b/conf/machine/include/tune-arm926ejs.conf
@@ -0,0 +1,3 @@
+#if gcc breaks change arm926ejs to arm926ej-s
+TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs"
+PACKAGE_ARCH = "armv5te"
diff --git a/conf/machine/include/tune-arm9tdmi.conf b/conf/machine/include/tune-arm9tdmi.conf
new file mode 100644
index 0000000000..cfc3bad1c1
--- /dev/null
+++ b/conf/machine/include/tune-arm9tdmi.conf
@@ -0,0 +1 @@
+TARGET_CC_ARCH = "-mcpu=arm9tdmi -mtune=arm9tdmi"
diff --git a/conf/machine/include/tune-c3.conf b/conf/machine/include/tune-c3.conf
new file mode 100644
index 0000000000..e6a522af10
--- /dev/null
+++ b/conf/machine/include/tune-c3.conf
@@ -0,0 +1,3 @@
+TARGET_CC_ARCH = "-march=c3 -mtune=c3"
+PACKAGE_ARCH = "i586"
+
diff --git a/conf/machine/include/tune-ppc603e.conf b/conf/machine/include/tune-ppc603e.conf
new file mode 100644
index 0000000000..7c8714cfc2
--- /dev/null
+++ b/conf/machine/include/tune-ppc603e.conf
@@ -0,0 +1,2 @@
+TARGET_CC_ARCH = "-mcpu=603e"
+PACKAGE_ARCH = "ppc603e"
diff --git a/conf/machine/include/tune-ppce500.conf b/conf/machine/include/tune-ppce500.conf
new file mode 100644
index 0000000000..11717eba70
--- /dev/null
+++ b/conf/machine/include/tune-ppce500.conf
@@ -0,0 +1,2 @@
+TARGET_CC_ARCH = "-mcpu=8540"
+PACKAGE_ARCH = "ppce500"
diff --git a/conf/machine/include/tune-sh3.conf b/conf/machine/include/tune-sh3.conf
new file mode 100644
index 0000000000..192dd8fd22
--- /dev/null
+++ b/conf/machine/include/tune-sh3.conf
@@ -0,0 +1 @@
+TARGET_CC_ARCH = "-ml -m3"
diff --git a/conf/machine/include/tune-sh4.conf b/conf/machine/include/tune-sh4.conf
new file mode 100644
index 0000000000..866f7f89d5
--- /dev/null
+++ b/conf/machine/include/tune-sh4.conf
@@ -0,0 +1 @@
+TARGET_CC_ARCH = "-ml -m4"
diff --git a/conf/machine/include/tune-strongarm.conf b/conf/machine/include/tune-strongarm.conf
new file mode 100644
index 0000000000..8654c996ef
--- /dev/null
+++ b/conf/machine/include/tune-strongarm.conf
@@ -0,0 +1,2 @@
+TARGET_CC_ARCH = "-march=armv4 -mtune=xscale"
+
diff --git a/conf/machine/include/tune-supersparc.conf b/conf/machine/include/tune-supersparc.conf
new file mode 100644
index 0000000000..1b1ec1207f
--- /dev/null
+++ b/conf/machine/include/tune-supersparc.conf
@@ -0,0 +1,2 @@
+TARGET_CC_ARCH = "-mcpu=supersparc"
+PACKAGE_ARCH = "supersparc" 
diff --git a/conf/machine/include/tune-xscale.conf b/conf/machine/include/tune-xscale.conf
new file mode 100644
index 0000000000..0b98f09fc8
--- /dev/null
+++ b/conf/machine/include/tune-xscale.conf
@@ -0,0 +1,3 @@
+TARGET_CC_ARCH = "-march=armv5te -mtune=xscale"
+PACKAGE_ARCH = "armv5te"
+
diff --git a/conf/machine/include/zaurus-clamshell-2.4.conf b/conf/machine/include/zaurus-clamshell-2.4.conf
new file mode 100644
index 0000000000..d61dc197b2
--- /dev/null
+++ b/conf/machine/include/zaurus-clamshell-2.4.conf
@@ -0,0 +1,48 @@
+# 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"
+PREFERRED_PROVIDERS_append_borzoi = " virtual/kernel:openzaurus-pxa27x"
+
+# Later versions are broken on kernel 2.4
+PREFERRED_VERSION_orinoco-modules = "0.13e"
+
+BOOTSTRAP_EXTRA_DEPENDS  += "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support \
+pcmcia-cs apmd wireless-tools console-tools irda-utils lrzsz hostap-utils prism3-firmware prism3-support \
+wpa-supplicant-nossl ppp ppp-dialin openswan"
+
+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"
+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 \
+                                           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"
+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"
+
diff --git a/conf/machine/include/zaurus-clamshell-2.6.conf b/conf/machine/include/zaurus-clamshell-2.6.conf
new file mode 100644
index 0000000000..757fc6acf3
--- /dev/null
+++ b/conf/machine/include/zaurus-clamshell-2.6.conf
@@ -0,0 +1,48 @@
+# Zaurus Clamshell specific configuration for kernel 2.6
+# Don't forget to include zaurus-clamshell.conf as well
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
+
+BOOTSTRAP_EXTRA_DEPENDS  += "virtual/kernel udev sysfsutils spectrum-fw orinoco-conf \
+pcmcia-cs apmd wireless-tools console-tools irda-utils lrzsz hostap-utils prism3-firmware prism3-support \
+ppp ppp-dialin openswan wpa-supplicant-nossl alsa-utils module-init-tools alsa-lib"
+
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel udev sysfsutils spectrum-fw \
+pcmcia-cs 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"
+
+# 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"
+
+# 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 \
+			     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 "
diff --git a/conf/machine/include/zaurus-clamshell.conf b/conf/machine/include/zaurus-clamshell.conf
new file mode 100644
index 0000000000..e0a26f3dc7
--- /dev/null
+++ b/conf/machine/include/zaurus-clamshell.conf
@@ -0,0 +1,25 @@
+TARGET_ARCH = "arm"
+IPKG_ARCHS = "all arm armv4 armv5te c7x0"
+
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n"
+EXTRA_IMAGEDEPENDS = "sharp-flash-header-c700"
+
+IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
+		   --output=${T}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}; \
+		   cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
+		   ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img"
+
+BOOTSTRAP_EXTRA_DEPENDS += "zaurus-updater"
+
+GUI_MACHINE_CLASS = "bigscreen"
+GPE_EXTRA_DEPENDS += "gaim sylpheed chkhinge"
+GPE_EXTRA_INSTALL += "gaim sylpheed chkhinge"
+
+include conf/machine/include/handheld-common.conf
+
+# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
+include conf/machine/include/tune-xscale.conf
+
+SERIAL_CONSOLE = "115200 ttyS0"