merge of '521ac5658b53e3b348b3e85852c99f684ac9e8d3'

     and 'ca40d35221cc8bdac2ca608b0449df2559183f6a'

6 files changed, 31 insertions, 11 deletions

diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 5b46a59640..b95fdb7223 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -32,6 +32,7 @@ FEED_ARCH_a780 		= "armv5te"
 FEED_ARCH_akita		= "armv5te"
 FEED_ARCH_c7x0		= "armv5te"
 FEED_ARCH_h2200		= "armv5te"
+FEED_ARCH_h3900		= "armv5te"
 FEED_ARCH_h4000		= "armv5te"
 FEED_ARCH_h5000		= "armv5te"
 FEED_ARCH_htcuniversal 	= "armv5te"
diff --git a/conf/machine/compulab-pxa270.conf b/conf/machine/compulab-pxa270.conf
index 12f82773d4..78bcf6a6f8 100644
--- a/conf/machine/compulab-pxa270.conf
+++ b/conf/machine/compulab-pxa270.conf
@@ -1,9 +1,9 @@
 #@TYPE: Machine
 #@Name: Compulab PXA270 system
-#@DESCRIPTION: Machine configuration for LogicPD PXA270 system
-#OLDEST_KERNEL = "2.6.17"
+#@DESCRIPTION: Machine configuration for Compulab PXA270 system
+#OLDEST_KERNEL = "2.6.16"
 TARGET_ARCH = "arm"
-PREFERRED_VERSION_logicpd-pxa270 = "2.6.17"
+PREFERRED_VERSION_compulab-pxa270 = "2.6.16"
 GUI_MACHINE_CLASS = "bigscreen"
 
 PREFERRED_PROVIDER_virtual/kernel = "${MACHINE}"
diff --git a/conf/machine/h1940.conf b/conf/machine/h1940.conf
index 37f61433c7..e105360b96 100644
--- a/conf/machine/h1940.conf
+++ b/conf/machine/h1940.conf
@@ -12,8 +12,6 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-h1940"
 # Set features for task-base
 MACHINE_FEATURES = "kernel26 touchscreen apm bluetooth irda usbgadget screen"
 
-# Empty modules list for now
-HANDHELD_MODULES = ""
 
 # Some extra configuration
 VOLATILE_STORAGE_SIZE = "64"
@@ -22,3 +20,6 @@ GUI_MACHINE_CLASS = "smallscreen"
 SERIAL_CONSOLE = "115200 ttySAC2 vt100"
 USE_VT = "0"
 
+# tune for armv4t
+include conf/machine/include/tune-arm920t.conf
+
diff --git a/conf/machine/hx2000.conf b/conf/machine/hx2000.conf
index 48a4bbf3e5..900da400b0 100644
--- a/conf/machine/hx2000.conf
+++ b/conf/machine/hx2000.conf
@@ -22,11 +22,6 @@ MODUTILS = "26"
 MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia bluetooth irda wifi usbgadget screen"
 
 PCMCIA_MANAGER = "pcmciautils"
-BOOTMODULES_RRECOMMENDS = "${@linux_module_packages('${PXA270_MODULES}', d)}"
-BOOTSTRAP_EXTRA_RRECOMMENDS += " ${BOOTMODULES_RRECOMMENDS}"
-BOOTSTRAP_EXTRA_RDEPENDS = "tiinit acx-firmware"
-
-PXA270_MODULES = "nls_cp437 nls_iso8859-1 nls_utf8 af_key"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
diff --git a/conf/machine/palmld.conf b/conf/machine/palmld.conf
index ec7336fe06..ae858ef2f8 100644
--- a/conf/machine/palmld.conf
+++ b/conf/machine/palmld.conf
@@ -5,7 +5,7 @@
 TARGET_ARCH = "arm"
 PACKAGE_EXTRA_ARCHS = "arm armv4t armv5te"
 
-PREFERRED_PROVIDER_virtual/kernel = "hackndev-2.6trunk"
+PREFERRED_PROVIDER_virtual/kernel = "linux-hackndev-2.6"
 
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
 
diff --git a/conf/machine/palmtx.conf b/conf/machine/palmtx.conf
new file mode 100644
index 0000000000..0c2b08ba9a
--- /dev/null
+++ b/conf/machine/palmtx.conf
@@ -0,0 +1,23 @@
+#@TYPE: Machine
+#@NAME: Palm TX
+#@DESCRIPTION: Machine configuration for the Palm TX
+
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-hackndev-2.6"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa pcmcia irda bluetooth wifi ext2 usbgadget screen"
+
+ROOT_FLASH_SIZE = "100"
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+GUI_MACHINE_CLASS = "bigscreen"
+
+# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
+include conf/machine/tune-xscale.conf
+
+module_autoload_sa1100-rtc = "sa1100-rtc"