configuration: merged in changes to nylon/mtx from 4G repository

* added mtx-2 machine (4G Surfbox II)
* updated several defaults

3 files changed, 44 insertions, 8 deletions

diff --git a/conf/distro/nylon.conf b/conf/distro/nylon.conf
index a1d81e336f..b68d82ced6 100644
--- a/conf/distro/nylon.conf
+++ b/conf/distro/nylon.conf
@@ -19,7 +19,9 @@ PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}gcc:gcc-cross"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}g++:gcc-cross"
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}libc-for-gcc:glibc"
 
-#SRCDATE = 20040916
+TARGET_FPU = "soft"
+
+SRCDATE := "20050527"
 
 PREFERRED_VERSION_glibc = "2.3.3"
 PREFERRED_VERSION_gcc-cross-initial = "3.3.4"
@@ -28,11 +30,11 @@ PREFERRED_VERSION_gcc-cross-sdk = "3.3.4"
 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.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_olsrd = "0.4.8"
 PREFERRED_VERSION_prism54-firmware = "1.0.3.0"
-PREFERRED_VERSION_usbutils = "0.11"
 
 # usually overrrided from local.conf
 NYLON_RELEASE = "unstable"
diff --git a/conf/machine/mtx-1.conf b/conf/machine/mtx-1.conf
index 3a5f047ae0..73500b501d 100644
--- a/conf/machine/mtx-1.conf
+++ b/conf/machine/mtx-1.conf
@@ -3,11 +3,13 @@
 #@DESCRIPTION: Machine configuration for the mtx-1 (aka MeshCube)
 
 TARGET_ARCH = "mipsel"
+IPKG_ARCHS = "all mipsel ${MACHINE}"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-mtx-1"
-#PREFERRED_VERSION_linux-mtx-1 = "2.4.24"
 
-EXTRA_IMAGECMD_jffs2 = "--pad=0x1c00000 --little-endian --eraseblock=0x20000 -n"  
+# md: is the --pad=.. necessary? I believe not.
+# EXTRA_IMAGECMD_jffs2 = "--pad=0x1c00000 --little-endian --eraseblock=0x20000 -n"  
+EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n"  
 
 # does not gain any speed and just creates problems:
 # TARGET_CC_ARCH = "-march=mips32" 
@@ -18,5 +20,10 @@ SERIAL_CONSOLE = "115200 tts/0 vt100"
 
 BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-usb-storage kernel-module-scsi-mod kernel-module-sd-mod kernel-module-fat kernel-module-vfat kernel-module-usbnet kernel-module-mii"
 
-# also create a srec file
-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"
\ No newline at end of file
+PREFERRED_VERSION_yamon = "2.17"
+
+# 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/mtx-2.conf b/conf/machine/mtx-2.conf
new file mode 100644
index 0000000000..d3e15afc9e
--- /dev/null
+++ b/conf/machine/mtx-2.conf
@@ -0,0 +1,27 @@
+#@TYPE: Machine
+#@NAME: 4G Systems mtx-2
+#@DESCRIPTION: Machine configuration for the mtx-2 (aka SurfBox 2nd generation)
+
+TARGET_ARCH = "mipsel"
+IPKG_ARCHS = "all mipsel ${MACHINE}"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-mtx-2"
+
+EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n"  
+
+# does not gain any speed and just creates problems:
+# TARGET_CC_ARCH = "-march=mips32" 
+
+USE_DEVFS = "1"
+USE_VT = "0"
+SERIAL_CONSOLE = "115200 tts/0 vt100"
+
+BOOTSTRAP_EXTRA_RDEPENDS += "kernel-module-usb-storage kernel-module-scsi-mod kernel-module-sd-mod kernel-module-fat kernel-module-vfat kernel-module-usbnet kernel-module-mii"
+
+PREFERRED_VERSION_yamon = "2.24"
+
+# 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; "