[oe-commits] Tim 'timtim' Ellis : tsx09: ts109 and ts209 are for our purposes the same device. Move this to one machine config to cover both.

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 5f5d8b4fccc84fe54b908a36c6c513846bef3d34
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=5f5d8b4fccc84fe54b908a36c6c513846bef3d34

Author: Tim 'timtim' Ellis <tim.ellis at foonas.org>
Date:   Fri Jan 16 23:24:24 2009 +0000

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

---

 conf/machine/ts209.conf                 |    6 ------
 conf/machine/{ts109.conf => tsx09.conf} |    3 +--
 2 files changed, 1 insertions(+), 8 deletions(-)

diff --git a/conf/machine/ts209.conf b/conf/machine/ts209.conf
deleted file mode 100644
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/ts109.conf b/conf/machine/tsx09.conf
similarity index 73%
rename from conf/machine/ts109.conf
rename to conf/machine/tsx09.conf
index df0801d..ef5d966 100644
--- a/conf/machine/ts109.conf
+++ b/conf/machine/tsx09.conf
@@ -1,6 +1,5 @@
-#@NAME: ARM based QNAP TS-109
+#@NAME: ARM based QNAP TS-109 and TS-209
 
-INHERIT += "ts109-image"
 MACHINE_EXTRA_RDEPENDS                          = "u-boot-utils piccontrol"
 # piccontrol was broken on uclibc