8 files changed, 77 insertions, 27 deletions
diff --git a/conf/machine/lsmipsel.conf b/conf/machine/lsmipsel.conf
new file mode 100644
index 0000000000..0702478e3c
--- /dev/null
+++ b/conf/machine/lsmipsel.conf
@@ -0,0 +1,30 @@
+#@TYPE: Machine
+#@NAME: Linkstation HD-HLAN
+#@DESCRIPTION: Machine configuration for the Buffalo Linkstation HD-HLAN (mipsel)
+
+INHERIT += "lsmipsel-image"
+
+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"
+
+USE_DEVFS = "0"
+
+PREFERRED_PROVIDER_virtual/kernel 		= "linux-lsmipsel"
+PREFERRED_PROVIDER_virtual/bootloader 		= ""
+PREFERRED_VERSION_linux-lsmipsel	 	= "2.6.23.17"
+
+#don't try to access tty1
+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/lspro.conf b/conf/machine/lspro.conf
new file mode 100644
index 0000000000..e61943acb4
--- /dev/null
+++ b/conf/machine/lspro.conf
@@ -0,0 +1,6 @@
+#@NAME: ARM based Revolution Kurobox Pro
+
+INHERIT += "lspro-image"
+MACHINE_EXTRA_RDEPENDS          = "micro-evtd u-boot-utils"
+
+require conf/machine/include/orion.inc
diff --git a/conf/machine/ts101.conf b/conf/machine/ts101.conf
new file mode 100644
index 0000000000..ac0e2877be
--- /dev/null
+++ b/conf/machine/ts101.conf
@@ -0,0 +1,7 @@
+#@TYPE: Machine configuration
+#@Name: QNAP Turbostation TS-101
+#@DESCRIPTION: Generic Machine configuration for QNAP TS-101
+
+require conf/machine/include/tsppc.inc
+
+INHERIT += "tsppc-image"
diff --git a/conf/machine/ts109.conf b/conf/machine/ts109.conf
new file mode 100644
index 0000000000..96cee24ccb
--- /dev/null
+++ b/conf/machine/ts109.conf
@@ -0,0 +1,9 @@
+#@NAME: ARM based QNAP TS-109
+
+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"
+
+require conf/machine/include/orion.inc
diff --git a/conf/machine/ts201.conf b/conf/machine/ts201.conf
new file mode 100644
index 0000000000..1f40c048dd
--- /dev/null
+++ b/conf/machine/ts201.conf
@@ -0,0 +1,8 @@
+#@TYPE: Machine configuration
+#@Name: QNAP Turbostation TS-101
+#@DESCRIPTION: Generic Machine configuration for QNAP TS-101
+
+require conf/machine/include/tsppc.inc
+
+INHERIT += "tsppc-image"
+
diff --git a/conf/machine/ts209.conf b/conf/machine/ts209.conf
new file mode 100644
index 0000000000..882a8e3553
--- /dev/null
+++ b/conf/machine/ts209.conf
@@ -0,0 +1,8 @@
+#@NAME: ARM based QNAP TS-209
+
+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
new file mode 100644
index 0000000000..51bebb9578
--- /dev/null
+++ b/conf/machine/ts409.conf
@@ -0,0 +1,9 @@
+#@NAME: ARM based QNAP TS-409
+
+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
diff --git a/conf/machine/turbostation.conf b/conf/machine/turbostation.conf
deleted file mode 100644
index bb923dc19c..0000000000
--- a/conf/machine/turbostation.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-TARGET_ARCH = "powerpc"
-TARGET_OS = "linux"
-PACKAGE_EXTRA_ARCHS = "ppc603e"
-
-INHERIT += "turbostation-image"
-
-# terminal specs - console, but no other ports
-SERIAL_CONSOLE="115200 console"
-USE_VT="0"
-MACHINE_EXTRA_RDEPENDS = "u-boot"
-PREFERRED_VERSION_u-boot = "1.2.0"
-
-MODUTILS=26
-MACHINE_FEATURES = "kernel26 usbhost pci ext2 uboot"
-UBOOT_MACHINE = "qnap_config"
-PREFERRED_VERSION_u-boot = "1.2.0"
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-turbostation"
-
-# We want udev support in the image
-udevdir = "/dev"
-
-IMAGE_FSTYPES = "jffs2"
-EXTRA_IMAGECMD_jffs2 = "--big-endian --eraseblock=0x20000"
-IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt"
-
-require conf/machine/include/tune-ppc603e.inc