4 files changed, 2 insertions, 32 deletions
diff --git a/conf/machine/mtx-1.conf b/conf/machine/mtx-1.conf
index 7db19696fa..33a69f45b3 100644
--- a/conf/machine/mtx-1.conf
+++ b/conf/machine/mtx-1.conf
@@ -6,8 +6,6 @@ TARGET_ARCH = "mipsel"
 PACKAGE_ARCHS = "all mipsel ${MACHINE}"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-mtx-1"
-KERNEL_VERSION_mtx-1 = "2.4.27"
-MACHINE_FEATURES = "kernel24 usbhost vfat"
 
 # md: is the --pad=.. necessary? I believe not.
 # EXTRA_IMAGECMD_jffs2 = "--pad=0x1c00000 --little-endian --eraseblock=0x20000 -n"  
diff --git a/conf/machine/mtx-2.conf b/conf/machine/mtx-2.conf
index 67cc5bf185..438c1fed79 100644
--- a/conf/machine/mtx-2.conf
+++ b/conf/machine/mtx-2.conf
@@ -6,8 +6,6 @@ TARGET_ARCH = "mipsel"
 PACKAGE_ARCHS = "all mipsel ${MACHINE}"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-mtx-2"
-KERNEL_VERSION_mtx-2 = "2.4.27"
-MACHINE_FEATURES = "kernel24 usbhost vfat"
 
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n"  
 
diff --git a/conf/machine/mtx-3.conf b/conf/machine/mtx-3.conf
index f6e9e8aad5..d6d14d86df 100644
--- a/conf/machine/mtx-3.conf
+++ b/conf/machine/mtx-3.conf
@@ -10,21 +10,8 @@
 TARGET_ARCH = "arm"
 require conf/machine/include/tune-arm926ejs.inc
 
-# begin overrides mtx-3
-#PREFERRED_VERSION_glibc_mtx-3 = "2.3.5+cvs20050627"
-PREFERRED_VERSION_gcc-cross-initial_mtx-3 = "3.4.4"
-PREFERRED_VERSION_gcc-cross-intermediate_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"
-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"
-
-KERNEL_VERSION_mtx-3 = "2.6.15.4"
+
 PREFERRED_PROVIDER_virtual/kernel = "linux-mtx-3"
-PREFERRED_PROVIDER_hotplug_mtx-3 = "udev"
-MACHINE_FEATURES = "kernel26 usbhost vfat"
 
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n"  
 
diff --git a/conf/machine/mtx-3a.conf b/conf/machine/mtx-3a.conf
index d3adce325b..cb1b129660 100644
--- a/conf/machine/mtx-3a.conf
+++ b/conf/machine/mtx-3a.conf
@@ -4,21 +4,8 @@
 
 include conf/machine/mtx-3.conf
 
-#PREFERRED_VERSION_glibc_mtx-3a = "2.3.5+cvs20050627"
-PREFERRED_VERSION_gcc-cross-initial_mtx-3a = "3.4.4"
-PREFERRED_VERSION_gcc-cross-intermediate_mtx-3a = "3.4.4"
-PREFERRED_VERSION_gcc-cross_mtx-3a = "3.4.4"
-PREFERRED_VERSION_gcc-cross-sdk_mtx-3a = "3.4.4"
-PREFERRED_VERSION_gcc_mtx-3a = "3.4.4"
-PREFERRED_VERSION_binutils-cross_mtx-3a = "2.15.94.0.1"
-PREFERRED_VERSION_binutils-cross-sdk_mtx-3a = "2.15.94.0.1"
-PREFERRED_VERSION_binutils_mtx-3a = "2.16"
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-mtx-3a"
-KERNEL_VERSION_mtx-3a = "2.6.16.6"
-PREFERRED_PROVIDER_hotplug_mtx-3a = "udev"
-
 TARGET_ARCH = "arm"
+PREFERRED_PROVIDER_virtual/kernel = "linux-mtx-3a"
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 -n"  
 USE_VT = "0"
 SERIAL_CONSOLE = "115200 ttyS0 vt100"