5 files changed, 1 insertions, 20 deletions
diff --git a/conf/machine/lsmipsel.conf b/conf/machine/lsmipsel.conf
index 0702478e3c..4c9efd25a4 100644
--- a/conf/machine/lsmipsel.conf
+++ b/conf/machine/lsmipsel.conf
@@ -8,8 +8,6 @@ TARGET_ARCH = "mipsel"
 TARGET_FPU  = "soft"
 
 MACHINE_FEATURES		= "kernel26 usbhost ext2 pci"
-MACHINE_FEATURES_foonas-em 	= "kernel26"
-MACHINE_FEATURES_foonas-iscsi	= "kernel26"
 MACHINE_TASK_PROVIDER		= "task-base"
 MACHINE_EXTRA_RDEPENDS		= "avr-evtd u-boot-utils"
 
@@ -24,7 +22,3 @@ USE_VT = "0"
 
 IMAGE_DEVICE_TABLES 	= "files/device_table-slugos.txt"
 IMAGE_FSTYPES			= "tar.gz"
-IMAGE_FSTYPES_foonas-em		= "cpio.gz"
-IMAGE_FSTYPES_foonas-iscsi	= "cpio.gz"
-
-BB_EMMODE = "small"
diff --git a/conf/machine/storcenter.conf b/conf/machine/storcenter.conf
index 9b90103dc7..bc4bc52bb8 100644
--- a/conf/machine/storcenter.conf
+++ b/conf/machine/storcenter.conf
@@ -6,16 +6,12 @@ PACKAGE_EXTRA_ARCHS = "ppc ppc603e"
 INHERIT += "storcenter-image"
 
 MACHINE_FEATURES		= "kernel26 usbhost pci ext2 uboot"
-MACHINE_FEATURES_foonas-em	= "kernel26"
-MACHINE_FEATURES_foonas-iscsi	= "kernel26"
 MACHINE_TASK_PROVIDER = "task-base"
 MACHINE_EXTRA_RDEPENDS = "u-boot-utils xfsprogs sccd"
 
 USE_DEVFS = "0"
 
 BOOTSTRAP_EXTRA_RDEPENDS 		= "udev module-init-tools"
-BOOTSTRAP_EXTRA_RDEPENDS_foonas-iscsi	= "module-init-tools"
-BOOTSTRAP_EXTRA_RDEPENDS_foonas-em 	= "module-init-tools"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-storcenter"
 PREFERRED_VERSION_linux-storcenter = "2.6.27.7"
@@ -26,12 +22,9 @@ USE_VT="0"
 
 IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt"
 IMAGE_FSTYPES			= "tar.gz"
-IMAGE_FSTYPES_foonas-em		= "cpio.gz"
-IMAGE_FSTYPES_foonas-iscsi	= "cpio.gz"
 
 SERIAL_CONSOLE="115200 console"
 
 require conf/machine/include/tune-ppc603e.inc
 
-BB_EMMODE = "large"
 UBOOT_MACHINE = "storcenter"
diff --git a/conf/machine/ts109.conf b/conf/machine/ts109.conf
index 96cee24ccb..df0801d061 100644
--- a/conf/machine/ts109.conf
+++ b/conf/machine/ts109.conf
@@ -2,8 +2,6 @@
 
 INHERIT += "ts109-image"
 MACHINE_EXTRA_RDEPENDS                          = "u-boot-utils piccontrol"
-# piccontrol is broken on uclibc
-MACHINE_EXTRA_RDEPENDS_foonas-em                = "u-boot-utils"
-MACHINE_EXTRA_RDEPENDS_foonas-iscsi             = "u-boot-utils"
+# piccontrol was broken on uclibc
 
 require conf/machine/include/orion.inc
diff --git a/conf/machine/ts209.conf b/conf/machine/ts209.conf
index 882a8e3553..d82d241553 100644
--- a/conf/machine/ts209.conf
+++ b/conf/machine/ts209.conf
@@ -2,7 +2,5 @@
 
 INHERIT += "ts209-image"
 MACHINE_EXTRA_RDEPENDS          		= "u-boot-utils piccontrol"
-MACHINE_EXTRA_RDEPENDS_foonas-em		= "u-boot-utils piccontrol"
-MACHINE_EXTRA_RDEPENDS_foonas-iscsi		= "u-boot-utils piccontrol"
 
 require conf/machine/include/orion.inc
diff --git a/conf/machine/ts409.conf b/conf/machine/ts409.conf
index 51bebb9578..24005a5f43 100644
--- a/conf/machine/ts409.conf
+++ b/conf/machine/ts409.conf
@@ -3,7 +3,5 @@
 INHERIT += "ts409-image"
 # Add config for ts409 for u-boot-utils fw_* utils before adding to deps
 MACHINE_EXTRA_RDEPENDS          		= ""
-MACHINE_EXTRA_RDEPENDS_foonas-em		= ""
-MACHINE_EXTRA_RDEPENDS_foonas-iscsi		= ""
 
 require conf/machine/include/orion.inc