From 5f5d8b4fccc84fe54b908a36c6c513846bef3d34 Mon Sep 17 00:00:00 2001 From: Tim 'timtim' Ellis Date: Fri, 16 Jan 2009 23:24:24 +0000 Subject: tsx09: ts109 and ts209 are for our purposes the same device. Move this to one machine config to cover both. --- conf/machine/ts109.conf | 7 ------- conf/machine/ts209.conf | 6 ------ conf/machine/tsx09.conf | 6 ++++++ 3 files changed, 6 insertions(+), 13 deletions(-) delete mode 100644 conf/machine/ts109.conf delete mode 100644 conf/machine/ts209.conf create mode 100644 conf/machine/tsx09.conf (limited to 'conf') diff --git a/conf/machine/ts109.conf b/conf/machine/ts109.conf deleted file mode 100644 index df0801d061..0000000000 --- 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 index d82d241553..0000000000 --- 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 index 0000000000..ef5d966f53 --- /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 -- cgit v1.2.3