diff options
| author | Tim 'timtim' Ellis <tim.ellis@foonas.org> | 2009-01-16 23:24:24 +0000 |
|---|---|---|
| committer | Tim 'timtim' Ellis <tim.ellis@foonas.org> | 2009-01-16 23:24:24 +0000 |
| commit | 5f5d8b4fccc84fe54b908a36c6c513846bef3d34 (patch) | |
| tree | 4b8740b3da4ccf183262f102d4a5e5467f83c2c3 /conf | |
| parent | fb99c1caa63b34fbc16f4d47cda3e6e434f19478 (diff) | |
tsx09: ts109 and ts209 are for our purposes the same device. Move this to one machine config to cover both.
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/machine/ts209.conf | 6 | ||||
| -rw-r--r-- | conf/machine/tsx09.conf (renamed from conf/machine/ts109.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 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/ts109.conf b/conf/machine/tsx09.conf index df0801d061..ef5d966f53 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 |