Pull in Robert P.J. Day's reorganized oe.conf work, to improve readability,

and moved MACHINE and DISTRO specific .conf files into their own
directories.

BKrev: 41656520p5hbk1WSEZcNUg5mgUqbwA

69 files changed, 193 insertions, 1178 deletions

diff --git a/conf/beagle.conf b/conf/beagle.conf
deleted file mode 100644
index 0b76d87dc7..0000000000
--- a/conf/beagle.conf
+++ /dev/null
@@ -1,35 +0,0 @@
-#@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/handheld-common.conf
-include conf/tune-strongarm.conf
-
-SERIAL_CONSOLE = "115200 ttySA0"
-
diff --git a/conf/collie.conf b/conf/collie.conf
deleted file mode 100644
index a7a69d9750..0000000000
--- a/conf/collie.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-#@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/handheld-common.conf
-include conf/tune-strongarm.conf
-
-SERIAL_CONSOLE = "115200 ttyS0"
-
diff --git a/conf/corgi.conf b/conf/corgi.conf
deleted file mode 100644
index 4e1793acdc..0000000000
--- a/conf/corgi.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-#@TYPE: Machine
-#@NAME: Sharp Zaurus SL-C700
-#@DESCRIPTION: Machine configuration for the PXA250 based Sharp Zaurus SL-C700 device
-
-include conf/zaurus-pxa.conf
diff --git a/conf/familiar-0.8.0.conf b/conf/distro/familiar-0.8.0.conf
index e69de29bb2..e69de29bb2 100644
--- a/conf/familiar-0.8.0.conf
+++ b/conf/distro/familiar-0.8.0.conf
diff --git a/conf/boxer.conf b/conf/distro/familiar.conf
index e69de29bb2..e69de29bb2 100644
--- a/conf/boxer.conf
+++ b/conf/distro/familiar.conf
diff --git a/conf/innovator.conf b/conf/distro/nylon.conf
index e69de29bb2..e69de29bb2 100644
--- a/conf/innovator.conf
+++ b/conf/distro/nylon.conf
diff --git a/conf/ipaq-pxa-2.6.conf b/conf/distro/openmnci.conf
index e69de29bb2..e69de29bb2 100644
--- a/conf/ipaq-pxa-2.6.conf
+++ b/conf/distro/openmnci.conf
diff --git a/conf/omap1610h2.conf b/conf/distro/opensimpad.conf
index e69de29bb2..e69de29bb2 100644
--- a/conf/omap1610h2.conf
+++ b/conf/distro/opensimpad.conf
diff --git a/conf/openslug.conf b/conf/distro/openslug.conf
index e69de29bb2..e69de29bb2 100644
--- a/conf/openslug.conf
+++ b/conf/distro/openslug.conf
diff --git a/conf/sun4cdm.conf b/conf/distro/openzaurus-3.5.1.conf
index e69de29bb2..e69de29bb2 100644
--- a/conf/sun4cdm.conf
+++ b/conf/distro/openzaurus-3.5.1.conf
diff --git a/conf/tune-arm920t.conf b/conf/distro/openzaurus.conf
index e69de29bb2..e69de29bb2 100644
--- a/conf/tune-arm920t.conf
+++ b/conf/distro/openzaurus.conf
diff --git a/conf/tune-arm926ejs.conf b/conf/distro/unslung.conf
index e69de29bb2..e69de29bb2 100644
--- a/conf/tune-arm926ejs.conf
+++ b/conf/distro/unslung.conf
diff --git a/conf/wrt54oe.conf b/conf/distro/wrt54oe.conf
index e69de29bb2..e69de29bb2 100644
--- a/conf/wrt54oe.conf
+++ b/conf/distro/wrt54oe.conf
diff --git a/conf/epia.conf b/conf/epia.conf
deleted file mode 100644
index 299ac5507b..0000000000
--- a/conf/epia.conf
+++ /dev/null
@@ -1,14 +0,0 @@
-TARGET_ARCH = "i686"
-TARGET_VENDOR = "-oe"
-PREFERRED_PROVIDER_virtual/kernel = "linux-epia"
-IMAGE_FSTYPE = "ext2"
-BOOTSTRAP_EXTRA_DEPENDS = "virtual/kernel pciutils udev module-init-tools strace"
-BOOTSTRAP_EXTRA_RDEPENDS = "pciutils udev module-init-tools kernel-modules strace"
-udevdir = "/dev"
-OLDEST_KERNEL = "2.6.5"
-GLIBC_ADDONS = "nptl"
-GLIBC_EXTRA_OECONF = "--with-tls"
-IPKG_ARCHS = "i386"
-
-include tune-c3.conf
-
diff --git a/conf/familiar.conf b/conf/familiar.conf
deleted file mode 100644
index adeeb611fb..0000000000
--- a/conf/familiar.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-#@TYPE: Distribution
-#@NAME: Familiar Linux
-#@DESCRIPTION: Distribution configuration for Familiar Linux (handhelds.org)
-
-INHERIT += " package_ipk debian"
diff --git a/conf/h3600.conf b/conf/h3600.conf
deleted file mode 100644
index e5dc8a14e2..0000000000
--- a/conf/h3600.conf
+++ /dev/null
@@ -1,39 +0,0 @@
-#@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 = "-e 0x40000 -p"
-BOOTSTRAP_EXTRA_DEPENDS = "handhelds-sa"
-BOOTSTRAP_EXTRA_RDEPENDS = "kernel ${@linux_module_packages('${H3600_MODULES}')}"
-
-H3600_MODULES = "\
-h3600-asic \
-h3600-micro \
-h3600-microkbd h3600-stowaway \
-h3600-uda1341 \
-hwtimer \
-l3-backpaq \
-nvrd \
-sa1100-cs \
-sa1100-ir \
-sa1100-wdt \
-sa1100-audio \
-sa1100-rtc \
-sa1100usb-core \
-sd-mod \
-serial-h3800 \
-uda1341 \
-usb-char \
-usb-eth"
-
-USE_DEVFS = "1"
-
-include conf/ipaq-common.conf
-include conf/handheld-common.conf
-include conf/tune-strongarm.conf
-
-SERIAL_CONSOLE = "115200 ttySA0"
diff --git a/conf/h3900.conf b/conf/h3900.conf
deleted file mode 100644
index f26490fed5..0000000000
--- a/conf/h3900.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-#@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/ipaq-common.conf
-include conf/handheld-common.conf
-
-GPE_MACHINE_CLASS = "smallscreen"
-
-# not using tune-xscale so as to retain backwards compatibility
-include conf/tune-strongarm.conf
diff --git a/conf/handheld-common.conf b/conf/handheld-common.conf
deleted file mode 100644
index f9e2608927..0000000000
--- a/conf/handheld-common.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-HANDHELD_MODULES = "ipv6 \
-ipsec \
-nvrd \
-mip6-mn \
-tun \
-ide-cs ide-disk \
-loop \
-vfat ext2 \
-sunrpc nfs \
-btuart-cs dtl1-cs bt3c-cs rfcomm bnep l2cap sco hci_uart \
-pcnet-cs serial-cs \
-af_packet \
-ppp-async ppp-deflate ppp-mppe \
-ip-gre ip-tables ipip \
-irda irlan irnet irport irtty \
-input uinput \
-"
-
-# Configuration bits for "generic handheld"
-BOOTSTRAP_EXTRA_DEPENDS += "pcmcia-cs apmd ppp bluez-utils wireless-tools"
-BOOTSTRAP_EXTRA_RDEPENDS +=  "pcmcia-cs apm"
-BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp bluez-utils wireless-tools ${@linux_module_packages('${HANDHELD_MODULES}')}"
-
-INHERIT += "linux_modules"
diff --git a/conf/husky.conf b/conf/husky.conf
deleted file mode 100644
index c8310036a0..0000000000
--- a/conf/husky.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-#@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/zaurus-pxa.conf
diff --git a/conf/ipaq-common.conf b/conf/ipaq-common.conf
deleted file mode 100644
index 9c91802c04..0000000000
--- a/conf/ipaq-common.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-IPAQ_MODULES = "apm h3600_generic_sleeve ipaq-sleeve ipaq-mtd-asset nvrd pcmf502rd pcmf502re sa1100-rtc ipaq-hal h3600_ts usb-eth" 
-
-BOOTSTRAP_EXTRA_DEPENDS += "kbdd hostap-modules orinoco-modules freeswan mipv6"
-BOOTSTRAP_EXTRA_RRECOMMENDS += "kbdd hostap-modules-cs orinoco-modules freeswan mipv6 ${@linux_module_packages('${IPAQ_MODULES}')}"
diff --git a/conf/tune-c3.conf b/conf/machine/beagle.conf
index e69de29bb2..e69de29bb2 100644
--- a/conf/tune-c3.conf
+++ b/conf/machine/beagle.conf
diff --git a/conf/machine/boxer.conf b/conf/machine/boxer.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/boxer.conf
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/collie.conf
diff --git a/conf/machine/corgi.conf b/conf/machine/corgi.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/corgi.conf
diff --git a/conf/machine/epia.conf b/conf/machine/epia.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/epia.conf
diff --git a/conf/machine/h3600.conf b/conf/machine/h3600.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/h3600.conf
diff --git a/conf/machine/h3900.conf b/conf/machine/h3900.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/h3900.conf
diff --git a/conf/machine/handheld-common.conf b/conf/machine/handheld-common.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/handheld-common.conf
diff --git a/conf/machine/husky.conf b/conf/machine/husky.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/husky.conf
diff --git a/conf/machine/ipaq-common.conf b/conf/machine/ipaq-common.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/ipaq-common.conf
diff --git a/conf/machine/ipaq-pxa-2.6.conf b/conf/machine/ipaq-pxa-2.6.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/ipaq-pxa-2.6.conf
diff --git a/conf/machine/mtx-1.conf b/conf/machine/mtx-1.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/mtx-1.conf
diff --git a/conf/machine/native.conf b/conf/machine/native.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/native.conf
diff --git a/conf/machine/nslu2.conf b/conf/machine/nslu2.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/nslu2.conf
diff --git a/conf/machine/omap1610h2.conf b/conf/machine/omap1610h2.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/omap1610h2.conf
diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/poodle.conf
diff --git a/conf/machine/ramses.conf b/conf/machine/ramses.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/ramses.conf
diff --git a/conf/machine/shepherd.conf b/conf/machine/shepherd.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/shepherd.conf
diff --git a/conf/machine/simpad.conf b/conf/machine/simpad.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/simpad.conf
diff --git a/conf/machine/sun4cdm.conf b/conf/machine/sun4cdm.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/sun4cdm.conf
diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/tosa.conf
diff --git a/conf/machine/tune-arm920t.conf b/conf/machine/tune-arm920t.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/tune-arm920t.conf
diff --git a/conf/machine/tune-arm926ejs.conf b/conf/machine/tune-arm926ejs.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/tune-arm926ejs.conf
diff --git a/conf/machine/tune-c3.conf b/conf/machine/tune-c3.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/tune-c3.conf
diff --git a/conf/machine/tune-strongarm.conf b/conf/machine/tune-strongarm.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/tune-strongarm.conf
diff --git a/conf/machine/tune-xscale.conf b/conf/machine/tune-xscale.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/tune-xscale.conf
diff --git a/conf/machine/wrt54.conf b/conf/machine/wrt54.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/conf/machine/wrt54.conf
diff --git a/conf/machine/x86-uml.conf b/conf/machine/x86-uml.conf
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/