merge of 2ba8efd35a14c2dca849205133efdd2ecd83c907

     and d43467c2202cf4bba65631e9cb48b580772f7fc1

4 files changed, 73 insertions, 1 deletions

diff --git a/conf/distro/angstrom.conf b/conf/distro/angstrom.conf
index 100017410d..d30fcd3cca 100644
--- a/conf/distro/angstrom.conf
+++ b/conf/distro/angstrom.conf
@@ -22,8 +22,11 @@ ENABLE_BINARY_LOCALE_GENERATION ?= ""
 
 #Use the ARM EABI when building for an ARM cpu. We can't use overrides
 #here because this breaks all places where ":=" is used.
+#if you want to build using uclibc, specify "-uclibcgnueabi"
 TARGET_VENDOR = "${@['','-angstrom'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}"
 TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}"
+#uclibc (needs gcc 4.1.1 or newer)
+#TARGET_OS = "linux${@['','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}"
 
 #mess with compiler flags to use -Os instead of -O2
 #Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info
diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf
index 123fd4362a..b9b169b359 100644
--- a/conf/distro/slugos.conf
+++ b/conf/distro/slugos.conf
@@ -170,7 +170,7 @@ PREFERRED_VERSION_glibc ?= "2.3.5+cvs20050627"
 # Select the correct versions of the kernel and modules (these are the
 # defaults, override in the conf/distro top-level distro file).
 PREFERRED_PROVIDER_virtual/kernel ?= "ixp4xx-kernel"
-PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.16"
+PREFERRED_VERSION_ixp4xx-kernel ?= "2.6.17"
 
 # Built-in ethernet modules
 PREFERRED_PROVIDER_virtual/ixp-eth ?= "ixp400-eth"
diff --git a/conf/machine/htcuniversal.conf b/conf/machine/htcuniversal.conf
new file mode 100644
index 0000000000..800cd77540
--- /dev/null
+++ b/conf/machine/htcuniversal.conf
@@ -0,0 +1,49 @@
+#@TYPE: Machine
+#@NAME: HTC Universal
+#@DESCRIPTION: Machine configuration for the HTC Universal with a pxa27x CPU  devices
+
+TARGET_ARCH = "arm"
+IPKG_EXTRA_ARCHS = "armv4 armv5te ipaqpxa htcuniversal"
+#use this for a HTC Universal
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/kernel = "xanadux-un-2.6"
+
+
+MODUTILS = "26"	
+BOOTSTRAP_EXTRA_RDEPENDS = "kernel ipaq-boot-params "
+BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${PXA270_MODULES}', d)}" 
+BOOTSTRAP_EXTRA_RDEPENDS_append = " module-init-tools detect-stylus"
+BOOTSTRAP_EXTRA_RDEPENDS_append = " tiinit acx-firmware"
+
+PXA270_MODULES = "g_ether snd_pcm_oss snd_mixer_oss hidp"
+
+SERIAL_CONSOLE = "115200 tts/0"
+
+include conf/machine/include/smartphone-common.conf
+
+GUI_MACHINE_CLASS = "bigscreen"
+
+# Use tune-xscale per default. Machine independent feeds should be built with tune-strongarm.
+include conf/machine/include/tune-xscale.conf
+
+# Uncomment this to use iwmmxt optimizations. Remove the above xscale stuff first
+#include conf/machine/include/tune-iwmmxt.conf
+
+BOOTSTRAP_EXTRA_RRECOMMENDS += "${@linux_module_packages('${UN_MODULES}', d)}"
+UN_MODULES = "i2c-pxa snd-pxa-i2sound-htcuniversal htcuniversal_power htcuniversal_acx acx htcuniversal_bt htcuniversal_leds"
+
+
+module_autoload_htcuniversal_power = "htcuniversal_power"
+module_autoload_snd-pxa-i2sound-htcuniversal = "snd-pxa-i2sound-htcuniversal"
+module_autoload_snd-pcm-oss = "snd-pcm-oss"
+module_autoload_snd-mixer-oss = "snd-mixer-oss"
+module_autoload_acx = "acx"
+module_autoload_htcuniversal-bt = "htcuniversal_bt"
+module_autoload_htcuniversal-power = "htcuniversal_power"
+
+#module_autoload_pxa27x_udc = "pxa27x_udc"
+
+#FIXME: this should be controlled by a userspace utility later.
+module_autoload_g_ether = "g_ether"
+
+GPE_EXTRA_DEPENDS += " gomunicator"
diff --git a/conf/machine/include/smartphone-common.conf b/conf/machine/include/smartphone-common.conf
new file mode 100644
index 0000000000..2ff8d4bc47
--- /dev/null
+++ b/conf/machine/include/smartphone-common.conf
@@ -0,0 +1,20 @@
+HANDHELD_MODULES = "ipv6 \
+ipsec \
+nvrd \
+mip6-mn \
+tun \
+fat vfat \
+loop \
+rfcomm bnep l2cap sco hci_uart hidp \
+af_packet \
+ppp-async ppp-deflate ppp-mppe \
+ip-gre ip-tables ipip \
+irda irlan irnet irport irtty ircomm-tty \
+input uinput \
+"
+
+# Configuration bits for "generic samrtphone"
+BOOTSTRAP_EXTRA_RDEPENDS +=  "apm apmd network-suspend-scripts"
+BOOTSTRAP_EXTRA_RRECOMMENDS += "ppp wireless-tools irda-utils wpa-supplicant-nossl lrzsz ppp-dialin ${@linux_module_packages('${HANDHELD_MODULES}', d)}"
+
+INHERIT += "linux_modules"