6 files changed, 17 insertions, 14 deletions
diff --git a/conf/machine/include/linkstationppc.conf b/conf/machine/include/lsppc.conf
index 620a6931eb..ad94a0f029 100644
--- a/conf/machine/include/linkstationppc.conf
+++ b/conf/machine/include/lsppc.conf
@@ -5,13 +5,13 @@
 
 TARGET_ARCH = "powerpc"
 PACKAGE_EXTRA_ARCHS = "ppc ppc603e"
-MACHINE_FEATURES = "kernel26 usbhost ext2"
+MACHINE_FEATURES = "kernel26 usbhost ext2 pci uboot"
 TARGET_FPU = "hard"
+MACHINE_TASK_PROVIDER = "task-base"
 
 USE_DEVFS = "0"
 
 BOOTSTRAP_EXTRA_RDEPENDS = "udev module-init-tools kernel-modules"
-FEED_URIS = "openlink##http://ipkg.linkstationwiki.net/2007.1/powerpc/"
 PREFERRED_PROVIDER_virtual/kernel = "linux-linkstationppc"
 
 #don't try to access tty1
@@ -20,7 +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
 require conf/machine/include/tune-ppc603e.conf
diff --git a/conf/machine/lsppchd.conf b/conf/machine/lsppchd.conf
index 51d0186dbe..bf59929b02 100644
--- a/conf/machine/lsppchd.conf
+++ b/conf/machine/lsppchd.conf
@@ -1,8 +1,6 @@
 #@TYPE: Machine
 #@NAME: HD Linkstation
 #@DESCRIPTION: Machine configuration for the Buffalo Linkstation HD
-
 UBOOT_MACHINE = "linkstation_HDLAN"
 IMAGE_FSTYPES = "tar.gz"
-
-require conf/machine/include/linkstationppc.conf
+require conf/machine/include/lsppc.conf
+\ No newline at end of file
diff --git a/conf/machine/lsppchg.conf b/conf/machine/lsppchg.conf
index 516a3aaa98..6040010176 100644
--- a/conf/machine/lsppchg.conf
+++ b/conf/machine/lsppchg.conf
@@ -1,8 +1,6 @@
 #@TYPE: Machine
 #@NAME: HG Linkstation
 #@DESCRIPTION: Machine configuration for the Buffalo Linkstation HG
-
 UBOOT_MACHINE = "linkstation_HGLAN"
 IMAGE_FSTYPES = "tar.gz"
-
-require conf/machine/include/linkstationppc.conf
+require conf/machine/include/lsppc.conf
+\ No newline at end of file
diff --git a/conf/machine/n2100.conf b/conf/machine/n2100.conf
index c84bf352da..2acfe812b0 100644
--- a/conf/machine/n2100.conf
+++ b/conf/machine/n2100.conf
@@ -3,11 +3,13 @@ TARGET_OS = "linux"
 TARGET_FPU = "soft"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
 
+INHERIT += "n2100-image"
+
 SERIAL_CONSOLE="115200 console"
 USE_VT="0"
 
 MODUTILS=26
-MACHINE_FEATURES= "kernel26 usbhost pci ext2"
+MACHINE_FEATURES= "kernel26 usbhost pci ext2 redboot"
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_VERSION_linux = "2.6.20"
 MACHINE_TASK_PROVIDER = "task-base"
diff --git a/conf/machine/storcenter.conf b/conf/machine/storcenter.conf
index bb7c8f1bef..ea59349c07 100644
--- a/conf/machine/storcenter.conf
+++ b/conf/machine/storcenter.conf
@@ -2,14 +2,15 @@ TARGET_ARCH = "powerpc"
 TARGET_OS = "linux"
 TARGET_FPU = "hard"
 PACKAGE_EXTRA_ARCHS = "ppc ppc603e"
-MACHINE_TASK_PROVIDER = "task-base"
+
+INHERIT += "storcenter-image"
 
 # terminal specs - console, but no other ports
 SERIAL_CONSOLE="115200 console"
 USE_VT="0"
 
 MODUTILS=26
-MACHINE_FEATURES= "kernel26 usbhost pci ext2"
+MACHINE_FEATURES= "kernel26 usbhost pci ext2 uboot"
 PREFERRED_PROVIDER_virtual/kernel = "linux-storcenter"
 MACHINE_TASK_PROVIDER = "task-base"
 
diff --git a/conf/machine/turbostation.conf b/conf/machine/turbostation.conf
index ffa44207cd..2c1a9d70b5 100644
--- a/conf/machine/turbostation.conf
+++ b/conf/machine/turbostation.conf
@@ -2,14 +2,18 @@ TARGET_ARCH = "powerpc"
 TARGET_OS = "linux"
 TARGET_FPU = "hard"
 PACKAGE_EXTRA_ARCHS = "ppc ppc603e"
-MACHINE_TASK_PROVIDER = "task-base"
+
+INHERIT += "turbostation-image"
 
 # terminal specs - console, but no other ports
 SERIAL_CONSOLE="115200 console"
 USE_VT="0"
 
 MODUTILS=26
-MACHINE_FEATURES= "kernel26 usbhost pci ext2"
+MACHINE_FEATURES = "kernel26 usbhost pci ext2 uboot"
+UBOOT_MACHINE = "qnap_config"
+PREFERRED_VERSION_u-boot = "1.2.0"
+
 PREFERRED_PROVIDER_virtual/kernel = "linux-turbostation"
 MACHINE_TASK_PROVIDER = "task-base"