summaryrefslogtreecommitdiff
path: root/conf/machine
diff options
context:
space:
mode:
authorFrans Meulenbroeks <fransmeulenbroeks@yahoo.com>2005-11-05 21:50:06 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2005-11-05 21:50:06 +0000
commit594cd366a214b9ea8f7ed52eb7f4635a393f48a5 (patch)
treed0d22e466d06421e9972cd9027569b54924b18d3 /conf/machine
parent7adabd7dffa510d614b4a681c912909b354c1ed6 (diff)
parent3eeaa7051df89f3241f6420d22aa919001376e39 (diff)
merge of 21d66a92293faf76a506c7d17e3cd16e143bb401
and 70f8ac179abbb777f1bec20edf02530820b33e92
Diffstat (limited to 'conf/machine')
-rw-r--r--conf/machine/.mtn2git_empty0
-rw-r--r--conf/machine/akita.conf10
-rw-r--r--conf/machine/blueangel.conf35
-rw-r--r--conf/machine/borzoi.conf20
-rw-r--r--conf/machine/boxer.conf2
-rw-r--r--conf/machine/c7x0.conf12
-rw-r--r--conf/machine/colinux.conf9
-rw-r--r--conf/machine/collie.conf32
-rw-r--r--conf/machine/corgi.conf3
-rw-r--r--conf/machine/devkitidp-pxa255.conf23
-rw-r--r--conf/machine/epia.conf14
-rw-r--r--conf/machine/geodegx.conf12
-rw-r--r--conf/machine/h1910.conf22
-rw-r--r--conf/machine/h1940.conf23
-rw-r--r--conf/machine/h2200.conf48
-rw-r--r--conf/machine/h3600.conf42
-rw-r--r--conf/machine/h3900.conf42
-rw-r--r--conf/machine/h6300.conf29
-rw-r--r--conf/machine/handheld-common.conf24
-rw-r--r--conf/machine/husky.conf2
-rw-r--r--conf/machine/ipaq-common.conf9
-rw-r--r--conf/machine/ipaq-pxa270.conf54
-rw-r--r--conf/machine/jornada56x.conf20
-rw-r--r--conf/machine/jornada6xx.conf10
-rw-r--r--conf/machine/jornada7xx.conf8
-rw-r--r--conf/machine/lite5200.conf19
-rw-r--r--conf/machine/mainstone.conf22
-rw-r--r--conf/machine/mnci.conf11
-rw-r--r--conf/machine/mtx-1.conf23
-rw-r--r--conf/machine/native.conf12
-rw-r--r--conf/machine/netvista.conf28
-rw-r--r--conf/machine/nokia770.conf60
-rw-r--r--conf/machine/nslu2.conf149
-rw-r--r--conf/machine/omap1510inn.conf18
-rw-r--r--conf/machine/omap1610h2.conf18
-rw-r--r--conf/machine/omap1710h3.conf18
-rw-r--r--conf/machine/omap2420h4.conf18
-rw-r--r--conf/machine/omap5912osk.conf34
-rw-r--r--conf/machine/poodle-2.4.conf14
-rw-r--r--conf/machine/poodle-2.6.conf5
-rw-r--r--conf/machine/poodle.conf26
-rw-r--r--conf/machine/rt3000.conf12
-rw-r--r--conf/machine/shepherd.conf3
-rw-r--r--conf/machine/simpad.conf51
-rw-r--r--conf/machine/spitz.conf20
-rw-r--r--conf/machine/sun4cdm.conf14
-rw-r--r--conf/machine/thinclient-common.conf20
-rw-r--r--conf/machine/tosa-2.4.conf23
-rw-r--r--conf/machine/tosa-2.6.conf14
-rw-r--r--conf/machine/tosa.conf26
-rw-r--r--conf/machine/triton.conf19
-rw-r--r--conf/machine/tune-arm920t.conf2
-rw-r--r--conf/machine/tune-arm926ejs.conf2
-rw-r--r--conf/machine/tune-arm9tdmi.conf1
-rw-r--r--conf/machine/tune-c3.conf3
-rw-r--r--conf/machine/tune-ppc603e.conf2
-rw-r--r--conf/machine/tune-ppce500.conf2
-rw-r--r--conf/machine/tune-sh3.conf1
-rw-r--r--conf/machine/tune-sh4.conf1
-rw-r--r--conf/machine/tune-strongarm.conf2
-rw-r--r--conf/machine/tune-supersparc.conf2
-rw-r--r--conf/machine/tune-xscale.conf3
-rw-r--r--conf/machine/wl500g.conf7
-rw-r--r--conf/machine/wrt54.conf34
-rw-r--r--conf/machine/x86-uml.conf8
-rw-r--r--conf/machine/x86.conf15
-rw-r--r--conf/machine/xxs1500.conf21
-rw-r--r--conf/machine/zaurus-clamshell-2.4.conf48
-rw-r--r--conf/machine/zaurus-clamshell-2.6.conf37
-rw-r--r--conf/machine/zaurus-clamshell.conf25
70 files changed, 1398 insertions, 0 deletions
diff --git a/conf/machine/.mtn2git_empty b/conf/machine/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/.mtn2git_empty
diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf
new file mode 100644
index 0000000000..cfcc411671
--- /dev/null
+++ b/conf/machine/akita.conf
@@ -0,0 +1,10 @@
+#@TYPE: Machine
+#@NAME: Sharp Zaurus SL-C1000
+#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C1000 device
+
+KERNEL_VERSION ?= "2.4"
+
+include conf/machine/zaurus-clamshell.conf
+include conf/machine/zaurus-clamshell-${KERNEL_VERSION}.conf
+
+ROOT_FLASH_SIZE = "64"
diff --git a/conf/machine/blueangel.conf b/conf/machine/blueangel.conf
new file mode 100644
index 0000000000..ef9bd3419e
--- /dev/null
+++ b/conf/machine/blueangel.conf
@@ -0,0 +1,35 @@
+#@TYPE: Machine
+#@NAME: HTC Blueangel
+#@DESCRIPTION: Machine configuration for the HTC Blueangel device
+
+KERNEL ?= "kernel26"
+
+OVERRIDES =. "${KERNEL}:"
+
+TARGET_ARCH = "arm"
+IPKG_ARCHS = "all arm armv4 armv4t armv5e armv5te ipaqpxa blueangel"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel_kernel26 = "xanadux-ba-2.6"
+PREFERRED_PROVIDER_virtual/kernel = "xanadux-ba-2.6"
+
+BOOTSTRAP_EXTRA_DEPENDS = "ipaq-boot-params"
+BOOTSTRAP_EXTRA_DEPENDS_append_kernel26 = " xanadux-ba-2.6 udev module-init-tools"
+
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${BA_MODULES}', d)}"
+BOOTSTRAP_EXTRA_RDEPENDS_append_kernel26 = " udev module-init-tools"
+
+BA_MODULES_kernel26 = " evdev tsdev himalaya_tsc2200 himalaya_ts3 asic3_mmc mmc_core g_ether blueangel_battery \
+ pcmcia-core hci_uart blueangel_pcmcia snd-mixer-oss blueangel_audio blueangel_rom blueangel_kp"
+# pxa2xx_udc is built in to the kernel
+
+SERIAL_CONSOLE = "115200 tts/2 vt100"
+
+USE_VT = "0"
+
+include conf/machine/handheld-common.conf
+
+GUI_MACHINE_CLASS = "smallscreen"
+ROOT_FLASH_SIZE = "32"
+
+# optimize images, but build feeds without using tune-xscale so as to retain backwards compatibility
+include conf/machine/tune-xscale.conf
diff --git a/conf/machine/borzoi.conf b/conf/machine/borzoi.conf
new file mode 100644
index 0000000000..b2d2eafc22
--- /dev/null
+++ b/conf/machine/borzoi.conf
@@ -0,0 +1,20 @@
+#@TYPE: Machine
+#@NAME: Sharp Zaurus SL-C3100
+#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C3100 device
+
+KERNEL_VERSION ?= "2.4"
+
+include conf/machine/zaurus-clamshell.conf
+include conf/machine/zaurus-clamshell-${KERNEL_VERSION}.conf
+
+PIVOTBOOT_EXTRA_DEPENDS += "pivotinit pcmcia-cs"
+PIVOTBOOT_EXTRA_RDEPENDS += "pivotinit pcmcia-cs"
+PIVOTBOOT_EXTRA_RRECOMMENDS += ""
+
+# Useful things for the built-in Harddisk
+BOOTSTRAP_EXTRA_DEPENDS += "hdparm e2fsprogs"
+BOOTSTRAP_EXTRA_RDEPENDS += "hdparm e2fsprogs e2fsprogs-e2fsck e2fsprogs-mke2fs"
+
+IMAGE_FSTYPES = "jffs2 tar.gz"
+
+ROOT_FLASH_SIZE = "32"
diff --git a/conf/machine/boxer.conf b/conf/machine/boxer.conf
new file mode 100644
index 0000000000..f5afc14017
--- /dev/null
+++ b/conf/machine/boxer.conf
@@ -0,0 +1,2 @@
+WARNING:="${@bb.fatal('\n*\n*\n* Sorry, There is no dedicated configuration for the Sharp SL-C860,\n* because \
+it really is just a Sharp SL-C760 with a different case color. Use MACHINE = \"c7x0\".\n*\n*\n')}"
diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf
new file mode 100644
index 0000000000..c5e42a2bed
--- /dev/null
+++ b/conf/machine/c7x0.conf
@@ -0,0 +1,12 @@
+#@TYPE: Machine
+#@NAME: Sharp Zaurus SL-C7x0
+#@DESCRIPTION: Machine configuration for the Sharp Zaurus SL-C700, Sharp Zaurus SL-C750, Sharp Zaurus SL-C760, Sharp Zaurus SL-C860 devices
+
+KERNEL_VERSION ?= "2.6"
+
+include conf/machine/zaurus-clamshell.conf
+include conf/machine/zaurus-clamshell-${KERNEL_VERSION}.conf
+
+ROOT_FLASH_SIZE = "32"
+# yes, the husky has 64MB, I know... Be happy, that way you can install more software :)
+
diff --git a/conf/machine/colinux.conf b/conf/machine/colinux.conf
new file mode 100644
index 0000000000..8c66aa1ab4
--- /dev/null
+++ b/conf/machine/colinux.conf
@@ -0,0 +1,9 @@
+#@TYPE: Machine
+#@NAME: Cooperative Linux
+#@DESCRIPTION: Machine configuration for Cooperative Linux running on an x86 compatible PC
+
+TARGET_ARCH = "i686"
+IPKG_ARCHS = "all i686 i386 x86 ${MACHINE}"
+PREFERRED_PROVIDER_virtual/kernel = "linux-colinux"
+BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel"
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel kernel-modules"
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
new file mode 100644
index 0000000000..428f47f71e
--- /dev/null
+++ b/conf/machine/collie.conf
@@ -0,0 +1,32 @@
+#@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 ?= "collie-kernels-2.4-embedix"
+BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support"
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel hostap-modules-cs orinoco-modules-cs \
+sharp-sdmmc-support kernel-module-net-fd kernel-module-sa1100-bi \
+kernel-module-usbdcore kernel-module-usbdmonitor"
+
+# kernel-module-collie-ssp kernel-module-collie-tc35143af if buzzer.patch applied
+
+# 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"
+
+IMAGE_LINGUAS = ""
+
+include conf/machine/handheld-common.conf
+include conf/machine/tune-strongarm.conf
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+ROOT_FLASH_SIZE = "16"
+
+# Later versions are broken on kernel 2.4
+PREFERRED_VERSION_orinoco-modules = "0.13e"
diff --git a/conf/machine/corgi.conf b/conf/machine/corgi.conf
new file mode 100644
index 0000000000..8055af0e82
--- /dev/null
+++ b/conf/machine/corgi.conf
@@ -0,0 +1,3 @@
+WARNING:="${@bb.fatal('\n*\n*\n* Sorry, There is no dedicated configuration for the Sharp SL-C700,\n* because \
+of the similarities of the clamshell series. Use MACHINE = \"c7x0\".\n*\n*\n')}"
+
diff --git a/conf/machine/devkitidp-pxa255.conf b/conf/machine/devkitidp-pxa255.conf
new file mode 100644
index 0000000000..ff4a82f95c
--- /dev/null
+++ b/conf/machine/devkitidp-pxa255.conf
@@ -0,0 +1,23 @@
+#@TYPE: Machine
+#@Name: BSQUARE PXA255 DevKitIDP Development Platform
+#@DESCRIPTION: Machine configuration for PXA255 DevKitIDP
+
+TARGET_ARCH = "arm"
+
+GUI_MACHINE_CLASS = "bigscreen"
+IPKG_ARCHS = "all arm armv5te ${MACHINE}"
+
+PREFERRED_PROVIDER_virtual/bootloader = "uboot-${MACHINE}"
+PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}-kernel"
+
+BOOTSTRAP_EXTRA_DEPENDS += "virtual/kernel virtual/bootloader"
+
+include conf/machine/tune-xscale.conf
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200 ttyS0"
+
+# used by opie-collections.inc
+ROOT_FLASH_SIZE = "32"
+
+
diff --git a/conf/machine/epia.conf b/conf/machine/epia.conf
new file mode 100644
index 0000000000..429242c9bd
--- /dev/null
+++ b/conf/machine/epia.conf
@@ -0,0 +1,14 @@
+TARGET_ARCH = "i586"
+TARGET_VENDOR = "-oe"
+PREFERRED_PROVIDER_virtual/kernel = "linux-epia"
+IMAGE_FSTYPE = "ext2.gz"
+BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel pciutils udev"
+BOOTSTRAP_EXTRA_RDEPENDS = "pciutils udev kernel-modules"
+udevdir = "/dev"
+OLDEST_KERNEL = "2.6.5"
+GLIBC_ADDONS = "nptl"
+GLIBC_EXTRA_OECONF = "--with-tls"
+IPKG_ARCHS = "i386"
+
+include conf/machine/tune-c3.conf
+
diff --git a/conf/machine/geodegx.conf b/conf/machine/geodegx.conf
new file mode 100644
index 0000000000..23a08cc99d
--- /dev/null
+++ b/conf/machine/geodegx.conf
@@ -0,0 +1,12 @@
+# Machine file for devices with the AMD Geode GX processor
+# Copyright (C) 2005, Advanced Micro Devices, Inc. All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+
+TARGET_ARCH = "i486"
+IPKG_ARCHS = "all i486 geodegx"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-geodegx"
+BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel pciutils udev"
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel pciutils udev kernel-modules"
+
+udevdir = "/dev"
diff --git a/conf/machine/h1910.conf b/conf/machine/h1910.conf
new file mode 100644
index 0000000000..468fcf1838
--- /dev/null
+++ b/conf/machine/h1910.conf
@@ -0,0 +1,22 @@
+#@TYPE: Machine
+#@NAME: HP iPAQ H1910/H1915
+#@DESCRIPTION: Machine configuration for the HP iPAQ H1910/H1915
+
+KERNEL ?= "kernel26"
+OVERRIDES =. "${KERNEL}:"
+
+TARGET_ARCH = "arm"
+IPKG_ARCHS = "all arm armv5te h1910"
+
+include conf/machine/tune-xscale.conf
+
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+
+BOOTSTRAP_EXTRA_DEPENDS = "udev apmd irda-utils network-suspend-scripts modutils-collateral mtd-utils"
+BOOTSTRAP_EXTRA_RDEPENDS = "udev apm apmd network-suspend-scripts modutils-collateral mtd-utils"
+BOOTSTRAP_EXTRA_RRECOMMENDS += ""
+
+EXTRA_IMAGECMD_h1910_jffs2 = "-e 0x4000 -p -n"
+
+GUI_MACHINE_CLASS = "smallscreen"
+
diff --git a/conf/machine/h1940.conf b/conf/machine/h1940.conf
new file mode 100644
index 0000000000..5e84076b01
--- /dev/null
+++ b/conf/machine/h1940.conf
@@ -0,0 +1,23 @@
+#@TYPE: Machine
+#@NAME: h1940
+#@DESCRIPTION: Machine configuration for the HP iPAQ h1930 and h1940
+
+IPKG_ARCHS = "all arm h3900 ${MACHINE}"
+TARGET_ARCH = arm
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "linux-h1940"
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
+BOOTSTRAP_EXTRA_DEPENDS = "udev virtual/kernel modutils-collateral module-init-tools"
+BOOTSTRAP_EXTRA_RDEPENDS = "udev kernel kernel-modules modutils-collateral module-init-tools"
+
+HANDHELD_MODULES = "fat vfat nfs \
+bluetooth rfcomm bnep l2cap hci_uart \
+irda irlan irtty ircomm ircomm-tty \
+"
+
+BOOTSTRAP_EXTRA_DEPENDS += "apmd wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz scap network-suspend-scripts"
+BOOTSTRAP_EXTRA_RDEPENDS += "apm apmd network-suspend-scripts"
+BOOTSTRAP_EXTRA_RRECOMMENDS += "wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz scap ${@linux_module_packages('${HANDHELD_MODULES}', d)}"
+
+INHERIT += "linux_modules"
+
diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf
new file mode 100644
index 0000000000..973364ebf7
--- /dev/null
+++ b/conf/machine/h2200.conf
@@ -0,0 +1,48 @@
+#@TYPE: Machine
+#@NAME: HP iPAQ h22xx
+#@DESCRIPTION: Machine configuration for the HP iPAQ h22xx
+
+
+TARGET_ARCH = "arm"
+IPKG_ARCHS = "all arm armv4 armv4t armv5e armv5te ipaqpxa h2200"
+
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "handhelds-pxa-2.6"
+
+EXTRA_IMAGECMD_jffs2 = "--pad --no-cleanmarkers --pagesize=4096 --eraseblock=16384"
+
+ROOT_FLASH_SIZE = "32"
+
+BOOTSTRAP_EXTRA_DEPENDS_append = "h2200-bootloader handhelds-pxa-2.6 udev module-init-tools"
+
+BOOTSTRAP_EXTRA_RDEPENDS = "h2200-bootloader ${@linux_module_packages('${H2200_MODULES}', d)}"
+BOOTSTRAP_EXTRA_RDEPENDS_append = " udev module-init-tools"
+
+#ship in rootfs:
+H2200_MODULES = "g_ether g_serial g_file_storage sa1100-rtc apm pcmcia-core snd-pcm-oss snd-pxa-i2sound-h2200 pxa2xx_h2200 h2200_pm h2200_lcd h2200_kbd h2200_battery mq11xx_base mq1100fb samcop_adcts w1_ds2760 w1_samcop "
+
+#autoload on boot:
+module_autoload_h2200_pm = "h2200_pm"
+module_autoload_h2200_kbd = "h2200_kbd"
+module_autoload_h2200_lcd = "h2200_lcd"
+module_autoload_mq11xx_base = "mq11xx_base"
+module_autoload_mq1100fb = "mq1100fb"
+module_autoload_samcop_adcts = "samcop_adcts"
+module_autoload_samcop_sdi = "samcop_sdi"
+module_autoload_w1_ds2760 = "w1_ds2760"
+module_autoload_h2200_battery = "h2200_battery"
+module_autoload_hamcop_nand = "hamcop_nand"
+module_autoload_pxa2xx_h2200 = "pxa2xx_h2200"
+module_autoload_snd_pxa_i2sound_h2200 = "snd-pxa-i2sound-h2200"
+module_autoload_snd-pcm-oss = "snd-pcm-oss"
+
+SERIAL_CONSOLE = "115200 tts/0 vt100"
+
+USE_VT = "0"
+
+include conf/machine/ipaq-common.conf
+include conf/machine/handheld-common.conf
+
+GUI_MACHINE_CLASS = "smallscreen"
+
+include conf/machine/tune-xscale.conf
diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf
new file mode 100644
index 0000000000..48990d5618
--- /dev/null
+++ b/conf/machine/h3600.conf
@@ -0,0 +1,42 @@
+#@TYPE: Machine
+#@NAME: Compaq iPAQ 36xx,Compaq iPAQ 37xx,Compaq iPAQ 38xx
+#@DESCRIPTION: Machine configuration for the Compaq iPAQ 36xx, Compaq iPAQ 37xx and Compaq iPAQ 38xx devices
+
+TARGET_ARCH = "arm"
+IPKG_ARCHS = "all arm ipaqsa h3600"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "handhelds-sa"
+EXTRA_IMAGECMD_h3600_jffs2 = "-e 0x40000 -p"
+BOOTSTRAP_EXTRA_DEPENDS = "alsa-driver handhelds-sa ipaq-boot-params"
+BOOTSTRAP_EXTRA_RDEPENDS = "alsa-driver kernel ipaq-boot-params ${@linux_module_packages('${H3600_MODULES}', d)}"
+
+ROOT_FLASH_SIZE = "16"
+
+H3600_MODULES = "\
+h3600-asic \
+h3600-micro \
+h3600-microkbd h3600-stowaway \
+hwtimer \
+l3-backpaq \
+nvrd \
+sa1100-cs \
+sa1100-ir \
+sa1100-wdt \
+sa1100-audio \
+sa1100-rtc \
+sa1100usb-core \
+sd-mod \
+serial-h3800 \
+usb-char \
+usb-eth"
+
+USE_DEVFS = "1"
+USE_VT = "0"
+
+IMAGE_LINGUAS = ""
+
+include conf/machine/ipaq-common.conf
+include conf/machine/handheld-common.conf
+include conf/machine/tune-strongarm.conf
+
+SERIAL_CONSOLE = "115200 ttySA0"
diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf
new file mode 100644
index 0000000000..cff74131d5
--- /dev/null
+++ b/conf/machine/h3900.conf
@@ -0,0 +1,42 @@
+#@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
+
+KERNEL ?= "kernel24"
+#KERNEL ?= "kernel26"
+
+OVERRIDES =. "${KERNEL}:"
+
+TARGET_ARCH = "arm"
+IPKG_ARCHS = "all arm armv4 armv4t armv5e armv5te ipaqpxa h3900"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel_kernel24 = "handhelds-pxa"
+PREFERRED_PROVIDER_virtual/kernel_kernel26 = "handhelds-pxa-2.6"
+EXTRA_IMAGECMD_h3900_jffs2 = "-e 0x40000 -p"
+
+ROOT_FLASH_SIZE = "32"
+
+BOOTSTRAP_EXTRA_DEPENDS = "ipaq-boot-params"
+BOOTSTRAP_EXTRA_DEPENDS_append_kernel24 = " handhelds-pxa at76c503a-modules"
+BOOTSTRAP_EXTRA_DEPENDS_append_kernel26 = " handhelds-pxa-2.6 udev module-init-tools"
+
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params ${@linux_module_packages('${H3900_MODULES}', d)}"
+BOOTSTRAP_EXTRA_RDEPENDS_append_kernel24 = " at76c503a-modules"
+BOOTSTRAP_EXTRA_RDEPENDS_append_kernel26 = " udev module-init-tools"
+
+H3900_MODULES_kernel24 = "g_ether pxa2xx_udc h3900_asic h5400_asic pxa_ir h5400_buzzer h5400_fsi mmc_h5400 usb-ohci-h5400 mmc_asic3 mtdchar h5400-audio h3900-uda1380"
+H3900_MODULES_kernel26 = " h3900_lcd h5400_lcd asic2_adcts g_ether apm h5400_battery h3900_battery pcmcia-core"
+# pxa2xx_udc is built in to the kernel
+
+SERIAL_CONSOLE = "115200 tts/0 vt100"
+
+USE_DEVFS_kernel24 = "1"
+USE_VT = "0"
+
+include conf/machine/ipaq-common.conf
+include conf/machine/handheld-common.conf
+
+GUI_MACHINE_CLASS = "smallscreen"
+
+#use tune xscale for extra performance. Distro feeds be built with tune-strongarm
+include conf/machine/tune-xscale.conf
diff --git a/conf/machine/h6300.conf b/conf/machine/h6300.conf
new file mode 100644
index 0000000000..166701a46b
--- /dev/null
+++ b/conf/machine/h6300.conf
@@ -0,0 +1,29 @@
+#@TYPE: Machine
+#@NAME: OMAP1510 cpu on iPaq h6315 and h6340
+#@DESCRIPTION: Machine configuration for the OMAP 1510 based iPaq h6300 series devices
+
+TARGET_ARCH = "arm"
+PACKAGE_ARCH = "arm"
+IPKG_ARCHS = "all arm armv4"
+
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "linux-h6300-omap1"
+PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
+
+BOOTSTRAP_EXTRA_DEPENDS = "udev virtual/kernel sysfsutils console-tools modutils-collateral module-init-tools nano minicom gdb"
+BOOTSTRAP_EXTRA_RDEPENDS = "udev kernel kernel-modules sysfsutils console-tools modutils-collateral module-init-tools nano minicom gdb"
+
+H6300_MODULES = "fat vfat nfs \
+bluetooth rfcomm bnep l2cap hci_uart \
+irda irlan irtty ircomm ircomm-tty \
+omapts"
+
+BOOTSTRAP_EXTRA_DEPENDS += "apmd wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz scap network-suspend-scripts"
+BOOTSTRAP_EXTRA_RDEPENDS += "apm apmd network-suspend-scripts"
+BOOTSTRAP_EXTRA_RRECOMMENDS += "wireless-tools irda-utils openswan wpa-supplicant-nossl lrzsz scap ${@linux_module_packages('${H6300_MODULES}', d)}"
+
+SERIAL_CONSOLE ?= "115200 ttyS0"
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000"
+
+#Use OMAP 1510 cpu specifig arm9tdmi options for gcc
+include conf/machine/tune-arm9tdmi.conf
diff --git a/conf/machine/handheld-common.conf b/conf/machine/handheld-common.conf
new file mode 100644
index 0000000000..2445ee17a6
--- /dev/null
+++ b/conf/machine/handheld-common.conf
@@ -0,0 +1,24 @@
+HANDHELD_MODULES = "ipv6 \
+ipsec \
+nvrd \
+mip6-mn \
+tun \
+ide-cs ide-disk ide-probe-mod \
+loop \