merge of '60f8ab65a31175b75e99193102e2ec70cbdfdef8'

     and '6417986ed931c354e68da472aabbf608cb98eb63'

5 files changed, 122 insertions, 128 deletions

diff --git a/conf/distro/hentges-2.0.conf b/conf/distro/hentges-2.0.conf
deleted file mode 100644
index 5f23949d2d..0000000000
--- a/conf/distro/hentges-2.0.conf
+++ /dev/null
@@ -1,42 +0,0 @@
-#! /bin/sh
-#
-# Copyright Matthias Hentges <devel@hentges.net> (c) 2007
-# License: MIT (see http://www.opensource.org/licenses/mit-license.php 
-#               for a copy of the license)
-#
-# Filename: hentges-2.0.conf
-# Date: 20070521 (YMD)
-
-DESCRIPTION = "Distribution configuration for the Hentges ROM based on Angstrom"
-MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
-HOMEPAGE = "http://www.hentges.net"
-LICENSE = "MIT"
-
-######################################################################################
-
-require conf/distro/angstrom-2007.1.conf
-
-######################################################################################
-
-require conf/machine/hentges-2.0_common.conf
-require conf/machine/hentges-2.0_${MACHINE}.conf
-
-######################################################################################
-
-DISTRO_VERSION = "1.9+WIP-${DATE}"
-DISTRO_REVISION = "1"
-
-DISTRO = "hentges-2.0"
-DISTRO_NAME = "Hentges"
-
-######################################################################################
-
-# Override FEED_URIS here
-
-######################################################################################
-
-HENTGES_PV = "${DISTRO_VERSION}"
-HENTGES_PR = "${DISTRO_REVISION}"
-
-######################################################################################
-
diff --git a/conf/machine/hentges-2.0_common.conf b/conf/machine/hentges-2.0_common.conf
deleted file mode 100644
index e7e1d5b2b7..0000000000
--- a/conf/machine/hentges-2.0_common.conf
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-#
-# Copyright Matthias Hentges <devel@hentges.net> (c) 2007
-# License: MIT (see http://www.opensource.org/licenses/mit-license.php 
-#               for a copy of the license)
-#
-# Filename: hentges-2.0_common.conf
-# Date: 20070521 (YMD)
-
-DESCRIPTION = "Hentges common dependency description"
-MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
-LICENSE = "MIT"
-
-######################################################################################
-
-HENTGES_BASE_DEPENDS = "task-base-wifi"
-HENTGES_BASE_RDEPENDS = "task-base-wifi"
-
-######################################################################################
-
-# Handled via task-base:
-
-DISTRO_SSH_DAEMON ?= "dropbear"
-
-######################################################################################
-
-# Handled via task-base:
-
-DISTRO_EXTRA_RDEPENDS = "\
-    update-modules \
-    ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \   
-    angstrom-version \
-    ipkg ipkg-collateral \
-    util-linux-mount util-linux-umount \
-    ${EXTRA_STUFF} \
-    ${DEBUG_APPS} \
-    "
-    
-HENTGES_X11_DEPENDS += "angstrom-x11-base-depends \
-			angstrom-gpe-task-base"
diff --git a/conf/machine/hentges-2.0_spitz.conf b/conf/machine/hentges-2.0_spitz.conf
deleted file mode 100644
index cffa01de92..0000000000
--- a/conf/machine/hentges-2.0_spitz.conf
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /bin/sh
-#
-# Copyright Matthias Hentges <devel@hentges.net> (c) 2007
-# License: MIT (see http://www.opensource.org/licenses/mit-license.php 
-#               for a copy of the license)
-#
-# Filename: hentges-2.0_spitz.conf
-# Date: 20070521 (YMD)
-
-DESCRIPTION = "Hentges dependency description for Spitz aka SL-C3x00"
-MAINTAINER = "Matthias 'CoreDump' Hentges <oe@hentges.net>"
-HOMEPAGE = "<homepage>"
-LICENSE = "MIT"
-
-######################################################################################
-
-DISTRO_SSH_DAEMON_spitz = "openssh"
-
-XSERVER = "xserver-kdrive-fbdev"
-
-######################################################################################
-
-HENTGES_BASE_RDEPENDS += "tar bash"
-
-######################################################################################
-
-# In the future I plan to replace the angstrom-*task* stuff with custom
-# hentges tasks, replacing the angstrom defaults where needed
-
-HENTGES_X11_RDEPENDS += "${XSERVER} \
-			angstrom-gpe-task-pim \
-			angstrom-ohand-task-pim \
-			angstrom-gpe-task-settings \
-			angstrom-gpe-task-apps \
-			angstrom-gpe-task-games \
-			angstrom-task-office \
-			angstrom-task-printing \
-			angstrom-task-sectest \
-			firefox gftp"
diff --git a/conf/machine/htcwallaby.conf b/conf/machine/htcwallaby.conf
new file mode 100644
index 0000000000..32c3f30af1
--- /dev/null
+++ b/conf/machine/htcwallaby.conf
@@ -0,0 +1,29 @@
+#@TYPE: Machine
+#@NAME: HTC Wallaby
+#@DESCRIPTION: Machine configuration for the HTC Wallaby aka XDA aka many other names
+
+#
+# Hardware-based properties
+#
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 "
+
+require conf/machine/include/tune-strongarm.conf
+
+ROOT_FLASH_SIZE = "16" #?
+VOLATILE_STORAGE_SIZE = "32"
+GUI_MACHINE_CLASS = "smallscreen"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda usbgadget screen phone"
+
+#
+# Software/packages selection
+#
+PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
+PCMCIA_MANAGER = "pcmciautils"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+
+#
+# Modules autoload and other boot properties
+#
+SERIAL_CONSOLE = "115200 ttySA0 vt100"
+USE_VT = "0"
diff --git a/conf/machine/palmld.conf b/conf/machine/palmld.conf
index ba67f473b2..9857108472 100644
--- a/conf/machine/palmld.conf
+++ b/conf/machine/palmld.conf
@@ -2,15 +2,13 @@
 #@NAME: Palm LifeDrive
 #@DESCRIPTION: Machine configuration for the Palm LifeDrive
 
+#
+# Hardware-based properties
+#
+
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te"
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-hackndev-2.6"
-
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
-
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda wifi ext2 usbgadget screen"
-
 ROOT_FLASH_SIZE = "100"
 
 SERIAL_CONSOLE = "115200 ttyS0"
@@ -20,4 +18,92 @@ GUI_MACHINE_CLASS = "bigscreen"
 # Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
 require conf/machine/include/tune-xscale.conf
 
-module_autoload_sa1100-rtc = "sa1100-rtc"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth pcmcia irda wifi ext2 usbgadget screen"
+
+#
+# Software/packages selection
+#
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-hackndev-2.6"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+
+MACHINE_EXTRA_RRECOMMENDS = "\
+	kernel-module-ac97-bus \
+	kernel-module-apm-power \
+	kernel-module-backlight \
+	kernel-module-battery \
+	kernel-module-bcm2035-uart \
+	kernel-module-external-power \
+	kernel-module-gpioed \
+	kernel-module-gpioed-ng \
+	kernel-module-lcd \
+	kernel-module-led-class \
+	kernel-module-leds-palmld \
+	kernel-module-ledtrig-heartbeat \
+	kernel-module-ledtrig-hwtimer \
+	kernel-module-ledtrig-timer \
+	kernel-module-palmld-battery \
+	kernel-module-palmld-ide \
+	kernel-module-palmld-pcmcia \
+	kernel-module-pcmcia-core \
+	kernel-module-pda-power \
+	kernel-module-pxa2xx-core \
+	kernel-module-pxapwm-bl \
+	kernel-module-snd \
+	kernel-module-snd-ac97-codec \
+	kernel-module-snd-page-alloc \
+	kernel-module-snd-pcm \
+	kernel-module-snd-pxa2xx-ac97 \
+	kernel-module-snd-pxa2xx-pcm \
+	kernel-module-snd-seq \
+	kernel-module-snd-seq-device \
+	kernel-module-snd-seq-midi-event \
+	kernel-module-snd-seq-oss \
+	kernel-module-snd-timer \
+	kernel-module-soundcore \
+	kernel-module-wm97xx-ts \		
+	"
+
+#
+# Modules autoload and other boot properties
+#
+
+module_conf_wm97xx-ts = "options wm97xx-ts pil=2"
+
+module_autoload_snd-ac97-bus = "snd-ac97-bus"
+module_autoload_apm_power = "apm_power"
+module_autoload_backlight = "backlight"
+module_autoload_battery = "battery"
+module_autoload_bcm2035_uart = "bcm2035_uart"
+module_autoload_gpioed = "gpioed"
+module_autoload_gpioed-ng = "gpioed-ng"
+module_autoload_lcd = "lcd"
+module_autoload_led-class = "led-class"
+module_autoload_leds-palmld = "leds-palmld"
+module_autoload_ledtrig-heartbeat = "ledtrig-heartbeat"
+module_autoload_ledtrig-hwtimer = "ledtrig-hwtimer"
+module_autoload_ledtrig-timer = "ledtrig-timer"
+module_autoload_palmld_battery = "palmld-battery"
+module_autoload_palmld_ide = "palmld-ide"
+module_autoload_palmld_pcmcia = "palmld-pcmcia"
+module_autoload_pcmcia = "pcmcia"
+module_autoload_pcmcia_core = "pcmcia-core"
+module_autoload_pda_power = "pda_power"
+module_autoload_pxa2xx_core = "pxa2xx-core"
+module_autoload_pxapwm_bl = "pxapwm_bl"
+module_autoload_snd = "snd"
+module_autoload_snd-ac97-codec = "snd-ac97-codec"
+module_autoload_snd-mixer-oss = "snd-mixer-oss"
+module_autoload_snd-page-alloc = "snd-page-alloc"
+module_autoload_snd-pcm = "snd-pcm"
+module_autoload_snd-pcm-oss = "snd-pcm-oss"
+module_autoload_snd-pxa2xx-pcm = "snd-pxa2xx-pcm"
+module_autoload_snd-pxa2xx-ac97 = "snd-pxa2xx-ac97"
+module_autoload_snd-seq = "snd-seq"
+module_autoload_snd-seq-device = "snd-seq-device"
+module_autoload_seq-midi-event = "seq-midi-event"
+module_autoload_snd-seq-oss = "snd-seq-oss"
+module_autoload_snd-timer = "snd-timer"
+module_autoload_soundcore = "soundcore"
+module_autoload_wm97xx-ts = "wm97xx-ts"