merge of '41daabd524e84d8b355abb1ef7c1d06479c25b7d'

     and '749aa1340946e929e3de2422cb6c275ee1ae34ba'

10 files changed, 80 insertions, 13 deletions

diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 91b2729554..be6bed9f9a 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -8,7 +8,7 @@
 
 #DISTRO_VERSION = "2007.1"
 DISTRO_VERSION = "test-${DATE}"
-DISTRO_REVISION = "6"
+DISTRO_REVISION = "8"
 
 require conf/distro/include/angstrom.inc
 require conf/distro/include/sane-srcdates.inc
@@ -24,6 +24,7 @@ FEED_ARCH ?= ${TARGET_ARCH}
 #armv4t machines
 
 FEED_ARCH_ep93xx 	= "armv4t"
+FEED_ARCH_h6300		= "armv4t"
 
 #armv5t machines
 
@@ -36,6 +37,7 @@ FEED_ARCH_h5xxx		= "armv5te"
 FEED_ARCH_htcuniversal 	= "armv5te"
 FEED_ARCH_hx2000	= "armv5te"
 FEED_ARCH_hx4700	= "armv5te"
+FEED_ARCH_ixp4xx	= "armv5te"
 FEED_ARCH_netbook-pro	= "armv5te"
 FEED_ARCH_nokia770	= "armv5te"
 FEED_ARCH_poodle	= "armv5te"
@@ -62,7 +64,7 @@ FEED_URIS += " \
 #SRCDATE = "20061029"
 
 PREFERRED_VERSION_linux-handhelds-2.6 = "2.6.16-hh7"
-PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal = "2.6.17-hh1+cvs${SRCDATE}"
+PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal = "2.6.17-hh2"
 
 PREFERRED_PROVIDER_hostap-modules_ipaq-pxa270 = "hostap-modules"
 
@@ -128,6 +130,10 @@ PREFERRED_PROVIDER_ntp = "ntp"
 PREFERRED_PROVIDER_hotplug = "udev"
 PREFERRED_PROVIDER_libxss = "libxss"
 
+#Machine related toolchain stuff
+ARCH_BYTE_SEX_ixp4xx = "le"
+
+
 #EABI stuff
 PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}-libc-for-gcc = "glibc-intermediate"
 PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
diff --git a/conf/distro/include/angstrom-uclibc.inc b/conf/distro/include/angstrom-uclibc.inc
index 96d42f8a93..149b8ed9d8 100644
--- a/conf/distro/include/angstrom-uclibc.inc
+++ b/conf/distro/include/angstrom-uclibc.inc
@@ -4,6 +4,8 @@ PREFERRED_PROVIDER_virtual/libc = "uclibc"
 PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv"
 PREFERRED_PROVIDER_virtual/libintl ?= "gettext"
 
+USE_NLS ?= "no"
+
 TARGET_OS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1)=='arm']}"
 
 #mess with compiler flags to use -Os instead of -O2
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 48915e6554..858305cd39 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -31,6 +31,7 @@ ENABLE_BINARY_LOCALE_GENERATION ?= "1"
 #ARM EABI is softfloat by default, but let's make sure :)
 #make it overridable for platforms with FPU, like ep93xx or i.mx31
 TARGET_FPU_arm ?= "soft"
+TARGET_FPU_ixp4xx ?= "soft"
 
 #Name the generated images in a sane way
 IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}"
diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf
index e3f669e9a2..2390106023 100644
--- a/conf/distro/jlime-donkey.conf
+++ b/conf/distro/jlime-donkey.conf
@@ -90,9 +90,7 @@ TARGET_OS = "linux"
 #<>What we want on the bootstrap image (extra) 
 #<>                                            
 #<>------------------------------------------------------------------<
-BOOTSTRAP_EXTRA_RDEPENDS += "ncurses nano wireless-tools console-tools  \
-                             udev e2tools e2fsprogs kernel-modules keymaps \
-			     wget links"
+DISTRO_EXTRA_RDEPENDS += ""
 
 
 #<>------------------------------------------------------------------>
@@ -113,7 +111,7 @@ PCMCIA_MANAGER = "pcmciautils"
 #<>------------------------------------------------------------------>
 #<> We are using gcc 4.1.1 so lets keep optimizations low
 #<>------------------------------------------------------------------< 
-FULL_OPTIMIZATION = "-O1"
+FULL_OPTIMIZATION = "-O2"
 
 
 #<>------------------------------------------------------------------>
diff --git a/conf/distro/nylon.conf b/conf/distro/nylon.conf
index 1c76ef870b..0d21488bb0 100644
--- a/conf/distro/nylon.conf
+++ b/conf/distro/nylon.conf
@@ -20,12 +20,18 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}libc-for-gcc:glibc"
 PREFERRED_PROVIDERS += " virtual/libx11:diet-x11"
 PREFERRED_PROVIDERS += " python:python-curses"
+PREFERRED_PROVIDER_classpath = "classpath-minimal"
 
 TARGET_FPU = "soft"
 
 SRCDATE := "20050527"
 
 PREFERRED_VERSION_glibc = "2.3.3"
+PREFERRED_VERSION_shorewall = "2.0.9-monolithic"
+PREFERRED_VERSION_ppp-dsl = "0.1-monolithic"
+PREFERRED_VERSION_mtd-utils = "0.0.0+cvs20041113"
+PREFERRED_VERSION_kismet = "2005-01-R1"
+
 PREFERRED_VERSION_gcc-cross-initial = "3.3.4"
 PREFERRED_VERSION_gcc-cross = "3.3.4"
 PREFERRED_VERSION_gcc-cross-sdk = "3.3.4" 
@@ -33,13 +39,30 @@ PREFERRED_VERSION_gcc = "3.3.4"
 PREFERRED_VERSION_binutils-cross = "2.14.90.0.7"
 PREFERRED_VERSION_binutils-cross-sdk = "2.14.90.0.7"
 PREFERRED_VERSION_binutils = "2.16"
-PREFERRED_VERSION_shorewall = "2.0.9-monolithic"
-PREFERRED_VERSION_ppp-dsl = "0.1-monolithic"
-PREFERRED_VERSION_mtd-utils = "0.0.0+cvs20041113"
-PREFERRED_VERSION_kismet = "2005-01-R1"
 
 PREFERRED_VERSION_prism54-firmware = "1.0.3.0"
 
+KERNEL_VERSION_mtx-1 = "2.4.27"
+KERNEL_VERSION_mtx-2 = "2.4.27"
+
+PREFERRED_VERSION_glibc_mtx-3 = "2.3.5+cvs20050627"
+PREFERRED_VERSION_gcc-cross-initial_mtx-3 = "3.4.4"
+PREFERRED_VERSION_gcc-cross_mtx-3 = "3.4.4"
+PREFERRED_VERSION_gcc-cross-sdk_mtx-3 = "3.4.4" 
+PREFERRED_VERSION_gcc_mtx-3 = "3.4.4"
+### did not compile with:
+#PREFERRED_VERSION_binutils-cross_mtx-3 = "2.16.91.0.7"
+#PREFERRED_VERSION_binutils-cross-sdk_mtx-3 = "2.16.91.0.7"
+### falling back to:
+PREFERRED_VERSION_binutils-cross_mtx-3 = "2.15.94.0.1"
+PREFERRED_VERSION_binutils-cross-sdk_mtx-3 = "2.15.94.0.1"
+PREFERRED_VERSION_binutils_mtx-3 = "2.16"
+
+PREFERRED_VERSION_udev = "089"
+
+KERNEL_VERSION_mtx-3 = "2.6.15.4"
+
+
 # usually overrrided from local.conf
 NYLON_RELEASE = "unstable"
 
@@ -53,7 +76,6 @@ export FEED_URIS = " \
 # image names
 DISTRO_VERSION = "${NYLON_VERSION}"
 BUILDNAME := "${NYLON_VERSION}"
-KERNEL_VERSION = "2.4.27"
 #this does not work: ${@base_read_file('${STAGING_DIR}/${HOST_SYS}/kernel/kernel-abiversion')}
 IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}_${BUILDNAME}"
 KERNEL_IMAGE_NAME = "kernel-${KERNEL_VERSION}-${MACHINE}_${BUILDNAME}"
diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf
index cc242dc682..8a6cee312c 100644
--- a/conf/machine/h2200.conf
+++ b/conf/machine/h2200.conf
@@ -26,7 +26,7 @@ PCMCIA_MANAGER = "pcmciautils"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 PREFERRED_PROVIDER_virtual/kernel = "linux-handhelds-2.6"
 
-MACHINE_EXTRA_RDEPENDS = "mtd-utils h2200-bootloader kernel"
+MACHINE_EXTRA_RDEPENDS = "h2200-bootloader"
 EXTRA_IMAGECMD_jffs2 = "--pad --eraseblock=0x4000"
 
 #
diff --git a/conf/machine/h6300.conf b/conf/machine/h6300.conf
index bffe1a97e1..8cce5f61b9 100644
--- a/conf/machine/h6300.conf
+++ b/conf/machine/h6300.conf
@@ -7,7 +7,7 @@
 #
 TARGET_ARCH = "arm"
 PACKAGE_ARCH = "arm"
-IPKG_EXTRA_ARCHS = "armv4"
+IPKG_EXTRA_ARCHS = "arm armv4 armv4t"
 
 #Use OMAP 1510 cpu specifig arm9tdmi options for gcc
 require conf/machine/include/tune-arm9tdmi.conf
diff --git a/conf/machine/include/tune-arm9tdmi.conf b/conf/machine/include/tune-arm9tdmi.conf
index cfc3bad1c1..d097b07739 100644
--- a/conf/machine/include/tune-arm9tdmi.conf
+++ b/conf/machine/include/tune-arm9tdmi.conf
@@ -1 +1,2 @@
+PACKAGE_ARCH = "armv4t"
 TARGET_CC_ARCH = "-mcpu=arm9tdmi -mtune=arm9tdmi"
diff --git a/conf/machine/mtx-3.conf b/conf/machine/mtx-3.conf
new file mode 100644
index 0000000000..bdd39ab57f
--- /dev/null
+++ b/conf/machine/mtx-3.conf
@@ -0,0 +1,36 @@
+#@TYPE: Machine
+#@NAME: 4G Systems mtx-3
+#@DESCRIPTION: Machine configuration for the mtx-3 (aka SurfBox 3rd generation)
+
+# hint: the mtx-3 architecture is still in experimental state, no hardware
+# is yet available for it
+
+# TARGET_ARCH should be set here in the machine configuration.
+# For compiling the kernel, ARCH will be derived form it by kernel-arch.bbclass 
+TARGET_ARCH = "arm"
+
+IPKG_ARCHS = "all arm ${MACHINE}"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-mtx-3"
+
+EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n"  
+
+TARGET_CC_ARCH = "-march=armv5te"
+#-mtune=arm926ejs"
+
+USE_DEVFS = "1"
+USE_VT = "0"
+SERIAL_CONSOLE = "115200 ttyS0 vt100"
+
+BOOTSTRAP_EXTRA_RDEPENDS += ""
+
+#PREFERRED_VERSION_yamon = "2.24"
+
+
+# FIXME: old srec files as mtx-2 used to do it ... this may need to get adapted sometime!
+
+# create srec files
+#IMAGE_POSTPROCESS_COMMAND += "\
+#	${TARGET_PREFIX}objcopy -O srec -I binary --adjust-vma 0xbe000000 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.${type} ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.srec; \
+#	grep -v S7 ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.srec > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.srec; \
+#	grep -v S0 ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_NAME}.flash.srec >> ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.srec; "
diff --git a/conf/machine/navman-icn330.conf b/conf/machine/navman-icn330.conf
index fa1cbbaaf4..79bafd1230 100644
--- a/conf/machine/navman-icn330.conf
+++ b/conf/machine/navman-icn330.conf
@@ -18,6 +18,7 @@ VOLATILE_STORAGE_SIZE = "32"
 GUI_MACHINE_CLASS = "smallscreen"
 
 #Set features for task-base 
+# touchscreen is not confirmed
 MACHINE_FEATURES = "kernel26 touchscreen apm alsa  usbgadget"
 
 #