tsx09: ts109 and ts209 are for our purposes the same device. Move this to one machine...

diff --git a/conf/machine/ts109.conf b/conf/machine/ts109.conf
deleted file mode 100644 (file)
index df0801d..0000000
--- a/conf/machine/ts109.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-#@NAME: ARM based QNAP TS-109
-
-INHERIT += "ts109-image"
-MACHINE_EXTRA_RDEPENDS                          = "u-boot-utils piccontrol"
-# piccontrol was broken on uclibc
-
-require conf/machine/include/orion.inc

diff --git a/conf/machine/ts209.conf b/conf/machine/ts209.conf
deleted file mode 100644 (file)
index d82d241..0000000
--- a/conf/machine/ts209.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-#@NAME: ARM based QNAP TS-209
-
-INHERIT += "ts209-image"
-MACHINE_EXTRA_RDEPENDS                         = "u-boot-utils piccontrol"
-
-require conf/machine/include/orion.inc

diff --git a/conf/machine/tsx09.conf b/conf/machine/tsx09.conf
new file mode 100644 (file)
index 0000000..ef5d966
--- /dev/null
+++ b/conf/machine/tsx09.conf
@@ -0,0 +1,6 @@
+#@NAME: ARM based QNAP TS-109 and TS-209
+
+MACHINE_EXTRA_RDEPENDS                          = "u-boot-utils piccontrol"
+# piccontrol was broken on uclibc
+
+require conf/machine/include/orion.inc