merge of '52a6d55e272aa56689f2387c7c4321d72814b233'

     and 'f7f6b0cbdf5cd009306c5467075a9f19734a4da3'

2 files changed, 63 insertions, 5 deletions

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/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; "