unbreak conf/ inclusion caused by kergoth's batch rename

BKrev: 4165b9c01stiHQ1gecbRR9Qr3w_nzQ

12 files changed, 219 insertions, 0 deletions

diff --git a/conf/machine/beagle.conf b/conf/machine/beagle.conf
index e69de29bb2..edb07fa1b4 100644
--- a/conf/machine/beagle.conf
+++ b/conf/machine/beagle.conf
@@ -0,0 +1,35 @@
+#@TYPE: Machine
+#@NAME: MasterIA PA100
+#@DESCRIPTION: Machine configuration for the SA1100 based MasterIA PA-100 device
+
+TARGET_ARCH = "arm"
+IPKG_ARCHS = "all arm ${MACHINE}"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "montavista-sa"
+BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel modutils hostap-modules orinoco-modules "
+BOOTSTRAP_EXTRA_RDEPENDS = " kernel-module-net-fd \
+kernel-module-sa1100-bi kernel-module-usbdcore kernel-module-usbdmonitor \
+kernel-module-pcnet-cs kernel-module-8390 kernel-module-unix  \
+kernel-module-sa1100-ir \
+kernel-module-usb-eth kernel-module-sa1100usb-core \
+kernel-module-ppp-generic kernel-module-ppp-async kernel-module-mtdchar \
+kernel-module-fat kernel-module-vfat "
+BOOTSTRAP_EXTRA_RRECOMMENDS = "hostap-modules-cs "
+
+
+# FIXME: the modules list is not complete yet!
+
+EXTRA_IMAGECMD_jffs2 = "--pad=0xec0000 --little-endian --eraseblock=0x40000"
+EXTRA_IMAGEDEPENDS = "cetools-native"
+
+IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
+                   --output=${T}/${IMAGE_NAME}.rootfs.jffs2 \
+                   ${EXTRA_IMAGECMD}; bin2rom ${T}/${IMAGE_NAME}.rootfs.jffs2 \
+                   ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img \
+                   ffffffff ffffffff d0140000"
+
+include conf/machine/handheld-common.conf
+include conf/machine/tune-strongarm.conf
+
+SERIAL_CONSOLE = "115200 ttySA0"
+
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index e69de29bb2..b693f1329a 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -0,0 +1,24 @@
+#@TYPE: Machine
+#@NAME: Sharp Zaurus SL-5000, Sharp Zaurus SL-5500
+#@DESCRIPTION: Machine configuration for the SA1100 based Sharp Zaurus SL-5000 and SL-5500 devices
+
+TARGET_ARCH = "arm"
+IPKG_ARCHS = "all arm ${MACHINE}"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "openzaurus-sa"
+BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support"
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel modutils hostap-modules-cs orinoco-modules sharp-sdmmc-support \
+kernel-module-devinfo kernel-module-gpio kernel-module-net-fd kernel-module-registers kernel-module-sa1100-bi \
+kernel-module-usbdcore kernel-module-usbdmonitor " 
+
+# This is needed for the ramdisk script to work
+BOOTSTRAP_EXTRA_DEPENDS  += "e2fsprogs"
+BOOTSTRAP_EXTRA_RDEPENDS += "e2fsprogs-mke2fs"
+
+EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
+
+include conf/machine/handheld-common.conf
+include conf/machine/tune-strongarm.conf
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
diff --git a/conf/machine/corgi.conf b/conf/machine/corgi.conf
index e69de29bb2..080ad1af7b 100644
--- a/conf/machine/corgi.conf
+++ b/conf/machine/corgi.conf
@@ -0,0 +1,5 @@
+#@TYPE: Machine
+#@NAME: Sharp Zaurus SL-C700
+#@DESCRIPTION: Machine configuration for the PXA250 based Sharp Zaurus SL-C700 device
+
+include conf/machine/zaurus-pxa.conf
diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf
index e69de29bb2..907437c857 100644
--- a/conf/machine/h3900.conf
+++ b/conf/machine/h3900.conf
@@ -0,0 +1,23 @@
+#@TYPE: Machine
+#@NAME: Compaq iPAQ 39xx, Compaq iPAQ 54xx, Compaq iPAQ 55xx
+#@DESCRIPTION: Machine configuration for the Compaq iPAQ 39xx, Compaq iPAQ 54xx, and Compaq iPAQ 55xx devices
+
+TARGET_ARCH = "arm"
+IPKG_ARCHS = "all arm ipaqpxa h3900"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa"
+EXTRA_IMAGECMD_h3900 = "-e 0x40000 -p"
+BOOTSTRAP_EXTRA_DEPENDS = "handhelds-pxa at76c503a-modules"
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel ${@linux_module_packages('${H3900_MODULES}')} at76c503a-modules"
+H3900_MODULES = "h3900_asic h5400_asic pxa_ir h5400_buzzer h5400_fsi mmc_h5400 usb-ohci-h5400 mmc_asic3 mtdchar h5400-audio"
+
+SERIAL_CONSOLE = "115200 tts/0 vt100"
+USE_DEVFS = "1"
+
+include conf/machine/ipaq-common.conf
+include conf/machine/handheld-common.conf
+
+GPE_MACHINE_CLASS = "smallscreen"
+
+# not using tune-xscale so as to retain backwards compatibility
+include conf/machine/tune-strongarm.conf
diff --git a/conf/machine/husky.conf b/conf/machine/husky.conf
index e69de29bb2..24a7f61dff 100644
--- a/conf/machine/husky.conf
+++ b/conf/machine/husky.conf
@@ -0,0 +1,5 @@
+#@TYPE: Machine
+#@NAME: Sharp Zaurus SL-C750,Sharp Zaurus SL-C760
+#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C760 and Sharp Zaurus SL-C860 devices
+
+include conf/machine/zaurus-pxa.conf
diff --git a/conf/machine/ipaq-pxa-2.6.conf b/conf/machine/ipaq-pxa-2.6.conf
index e69de29bb2..f7335a624c 100644
--- a/conf/machine/ipaq-pxa-2.6.conf
+++ b/conf/machine/ipaq-pxa-2.6.conf
@@ -0,0 +1,7 @@
+IPKG_ARCHS = "all arm ipaqpxa ${MACHINE}"
+TARGET_ARCH = arm
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
+BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel modutils-collateral"
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel kernel-modules modutils-collateral"
+include conf/machine/handheld-common.conf
diff --git a/conf/machine/omap1610h2.conf b/conf/machine/omap1610h2.conf
index e69de29bb2..04a1c74665 100644
--- a/conf/machine/omap1610h2.conf
+++ b/conf/machine/omap1610h2.conf
@@ -0,0 +1,14 @@
+#@TYPE: Machine
+#@NAME: OMAP1610 cpu on an H2 board
+#@DESCRIPTION: Machine configuration for the OMAP H2 development board with a 1610 processor
+
+TARGET_ARCH = "arm"
+IPKG_ARCHS = "all arm armv5te ${MACHINE}"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "linux-omap-2.6"
+BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel modutils-collateral"
+BOOTSTRAP_EXTRA_RDEPENDS = "modutils-collateral"
+
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
+
+include conf/machine/tune-arm926ejs.conf
diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf
index e69de29bb2..d59ffea18d 100644
--- a/conf/machine/poodle.conf
+++ b/conf/machine/poodle.conf
@@ -0,0 +1,24 @@
+#@TYPE: Machine
+#@NAME: Sharp Zaurus SL-B500, Sharp Zaurus SL-5600
+#@DESCRIPTION: Machine configuration for the PXA250 based Sharp Zaurus SL-B500 and SHarp Zaurus SL-5600 devices
+
+TARGET_ARCH = "arm"
+IPKG_ARCHS = "all arm ${MACHINE}"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa"
+BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel modutils-collateral hostap-modules orinoco-modules sharp-sdmmc-support"
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules sharp-sdmmc-support \
+kernel-module-ip-gre  \
+kernel-module-ipip kernel-module-irnet kernel-module-net-fd kernel-module-registers kernel-module-pxa-bi \
+kernel-module-usbdcore kernel-module-usbdmonitor modutils-collateral"
+
+EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad --faketime -n" 
+
+IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.bin ${EXTRA_IMAGECMD}"
+
+include conf/machine/handheld-common.conf
+# not using tune-xscale.conf so as to retain backwards compatibility
+include conf/machine/tune-strongarm.conf
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
diff --git a/conf/machine/ramses.conf b/conf/machine/ramses.conf
index e69de29bb2..7c47c2bd97 100644
--- a/conf/machine/ramses.conf
+++ b/conf/machine/ramses.conf
@@ -0,0 +1,22 @@
+#@TYPE: Machine
+#@NAME: M&N MNCI-RX
+#@DESCRIPTION: Machine configuration for the PXA255 based M&N Solutions MNCI-RX
+
+include conf/machine/openmnci.conf
+include conf/machine/tune-xscale.conf
+
+TARGET_ARCH = "arm"
+TARGET_OS = "linux"
+IPKG_ARCHS = "all arm ${MACHINE}"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "mnci-ramses"
+
+EXTRA_IMAGECMD_jffs2 = "--pad=0x1ec0000 --eraseblock=0x40000"
+
+
+USE_DEVFS = "1"
+GPE_MACHINE_CLASS = "smallscreen"
+
+# For sysvinit:
+USE_VT = "0"
+SERIAL_CONSOLE = "115200 tts/0"
diff --git a/conf/machine/shepherd.conf b/conf/machine/shepherd.conf
index e69de29bb2..91987fc4f7 100644
--- a/conf/machine/shepherd.conf
+++ b/conf/machine/shepherd.conf
@@ -0,0 +1,5 @@
+#@TYPE: Machine
+#@NAME: Sharp Zaurus SL-C750
+#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C750 device
+
+include conf/machine/zaurus-pxa.conf
diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf
index e69de29bb2..5dd25503d4 100644
--- a/conf/machine/tosa.conf
+++ b/conf/machine/tosa.conf
@@ -0,0 +1,28 @@
+#@TYPE: Machine
+#@NAME: Sharp Zaurus SL-6000
+#@DESCRIPTION: Machine configuration for the PXA255 based Sharp Zaurus SL-6000 device
+
+TARGET_ARCH = "arm"
+IPKG_ARCHS = "all arm ${MACHINE}"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa"
+BOOTSTRAP_EXTRA_DEPENDS += "wlan-ng-modules virtual/kernel modutils-collateral hostap-modules orinoco-modules sharp-sdmmc-support chkhinge"
+BOOTSTRAP_EXTRA_RDEPENDS += "wlan-ng-modules wlan-ng-utils 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-module-usb-storage \
+kernel hostap-modules-cs orinoco-modules sharp-sdmmc-support kernel-module-pxa-bi modutils chkhinge kernel-module-ip-gre \
+kernel-module-irnet kernel-module-ipip modutils-collateral kernel-module-usbcore kernel-module-usbdcore kernel-module-usbdmonitor"
+
+RRECOMMENDS += "kernel-module-usbdserial kernel-module-usbkbd kernel-module-usbmouse kernel-module-hid usbutils kernel-module-evdev"
+
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n --faketime"
+
+IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}"
+
+# GPE_MACHINE_CLASS = "bigscreen"
+# GPE_EXTRA_DEPENDS = "gaim"
+
+include conf/machine/handheld-common.conf
+# not using tune-xscale.conf so as to retain backwards compatibility
+include conf/machine/tune-strongarm.conf
+
+SERIAL_CONSOLE = "115200 ttyS0"
diff --git a/conf/machine/zaurus-pxa.conf b/conf/machine/zaurus-pxa.conf
index e69de29bb2..f92a60be19 100644
--- a/conf/machine/zaurus-pxa.conf
+++ b/conf/machine/zaurus-pxa.conf
@@ -0,0 +1,27 @@
+TARGET_ARCH = "arm"
+IPKG_ARCHS = "all arm ${MACHINE}"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "openzaurus-pxa"
+BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support chkhinge"
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules sharp-sdmmc-support \
+kernel-module-net-fd kernel-module-registers kernel-module-pxa-bi \
+kernel-module-usbdcore kernel-module-usbdmonitor modutils chkhinge"
+
+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"
+
+GPE_MACHINE_CLASS = "bigscreen"
+GPE_EXTRA_DEPENDS = "gaim"
+
+include conf/machine/handheld-common.conf
+# not using tune-xscale.conf so as to retain backwards compatibility
+include conf/machine/tune-strongarm.conf
+
+SERIAL_CONSOLE = "115200 ttyS0"