6 files changed, 45 insertions, 4 deletions
diff --git a/conf/machine/include/lsppc.conf b/conf/machine/include/lsppc.conf
index ad94a0f029..161f3ad8c1 100644
--- a/conf/machine/include/lsppc.conf
+++ b/conf/machine/include/lsppc.conf
@@ -20,6 +20,7 @@ USE_VT = "0"
 HOTPLUG = "udev"
 udevdir = "/dev"
 
+IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt"
 IMAGE_FSTYPES = "tar.gz"
 
 #tune for the MPC5200B cpu
diff --git a/conf/machine/lsarm.conf b/conf/machine/lsarm.conf
new file mode 100644
index 0000000000..9698fc9a70
--- /dev/null
+++ b/conf/machine/lsarm.conf
@@ -0,0 +1,33 @@
+#@TYPE: Machine
+#@NAME: ARM based Buffalo Linkstation
+#@DESCRIPTION: Machine configuration for various different ARM based linkstations
+TARGET_ARCH = "arm"
+PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5te"
+INHERIT += "lsarm-image"
+
+MACHINE_EXTRA_RDEPENDS = "miconapl micro-evtd"
+MACHINE_FEATURES = "kernel26 usbhost ext2 pci uboot"
+
+TARGET_FPU = "soft"
+
+PREFERRED_PROVIDER_virtual/bootloader = ""
+
+MACHINE_TASK_PROVIDER = "task-base"
+
+USE_DEVFS = "0"
+
+require conf/machine/include/tune-arm926ejs.conf
+
+IMAGE_FSTYPES = "tar.gz"
+
+# serial console port on devboard rev. B3
+SERIAL_CONSOLE = "115200 ttyS0"
+
+HOTPLUG = "udev"
+udevdir = "/dev"
+
+IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt"
+
+BOOTSTRAP_EXTRA_RDEPENDS = "udev module-init-tools kernel-modules"
+PREFERRED_PROVIDER_virtual/kernel = "linux-linkstationarm"
+
diff --git a/conf/machine/lsppchd.conf b/conf/machine/lsppchd.conf
index bf59929b02..ac22703de9 100644
--- a/conf/machine/lsppchd.conf
+++ b/conf/machine/lsppchd.conf
@@ -3,4 +3,6 @@
 #@DESCRIPTION: Machine configuration for the Buffalo Linkstation HD
 UBOOT_MACHINE = "linkstation_HDLAN"
 IMAGE_FSTYPES = "tar.gz"
-require conf/machine/include/lsppc.conf
-\ No newline at end of file
+require conf/machine/include/lsppc.conf
+
+INHERIT += "lsppchd-image"
diff --git a/conf/machine/lsppchg.conf b/conf/machine/lsppchg.conf
index 6040010176..9f03febba6 100644
--- a/conf/machine/lsppchg.conf
+++ b/conf/machine/lsppchg.conf
@@ -3,4 +3,6 @@
 #@DESCRIPTION: Machine configuration for the Buffalo Linkstation HG
 UBOOT_MACHINE = "linkstation_HGLAN"
 IMAGE_FSTYPES = "tar.gz"
-require conf/machine/include/lsppc.conf
-\ No newline at end of file
+require conf/machine/include/lsppc.conf
+
+INHERIT += "lsppchg-image"
diff --git a/conf/machine/n2100.conf b/conf/machine/n2100.conf
index 2acfe812b0..11ec87d205 100644
--- a/conf/machine/n2100.conf
+++ b/conf/machine/n2100.conf
@@ -23,5 +23,6 @@ EXTRA_IMAGECMD = "--little-endian"
 # Creating an image that works with the webinterface required encrypting it
 # So we'll need openssl
 EXTRA_IMAGEDEPENDS = "openssl-native"
+IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt"
 
 require conf/machine/include/tune-xscale.conf
diff --git a/conf/machine/turbostation.conf b/conf/machine/turbostation.conf
index 2c1a9d70b5..0911dd39af 100644
--- a/conf/machine/turbostation.conf
+++ b/conf/machine/turbostation.conf
@@ -8,6 +8,8 @@ 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"
@@ -20,8 +22,8 @@ MACHINE_TASK_PROVIDER = "task-base"
 # We want udev support in the image
 udevdir = "/dev"
 
-EXTRA_IMAGECMD = "--big-endian"
-ERASEBLOCK_SIZE = "0x20000"
 IMAGE_FSTYPES = "jffs2"
+EXTRA_IMAGECMD_jffs2 = "--big-endian --eraseblock=0x20000"
+IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt"
 
 require conf/machine/include/tune-ppc603e.conf