diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2010-01-10 16:16:44 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-01-10 16:16:44 +0100 |
commit | cfc200714ddfa6d76feb836c258b1135d91a8348 (patch) | |
tree | ecc4628fc161de5044c9acb03bb63b2fd48ae75c /target/target.lst | |
parent | 77bdac14df2e20b290cdd4bcad0ecb0e1fc446be (diff) | |
parent | 91c8ff1c3f772e0ae8d7c60a3252c5efced9fe92 (diff) |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
package/digitemp/Makefile
Diffstat (limited to 'target/target.lst')
-rw-r--r-- | target/target.lst | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/target/target.lst b/target/target.lst index 2537feef7..f78fff3da 100644 --- a/target/target.lst +++ b/target/target.lst @@ -1,7 +1,8 @@ native ADK_LINUX_NATIVE alix1c ADK_LINUX_X86_ALIX1C alix2d ADK_LINUX_X86_ALIX2D -alix ADK_LINUX_X86_ALIX1C || ADK_LINUX_X86_ALIX2D +alix2d13 ADK_LINUX_X86_ALIX2D13 +alix ADK_LINUX_X86_ALIX1C || ADK_LINUX_X86_ALIX2D || ADK_LINUX_X86_ALIX2D13 wrap ADK_LINUX_X86_WRAP foxboard ADK_LINUX_CRIS_FOXBOARD lemote ADK_LINUX_MIPS64_LEMOTE @@ -27,5 +28,5 @@ rb411 ADK_LINUX_MIPS_RB411 rb433 ADK_LINUX_MIPS_RB433 rb532 ADK_LINUX_MIPS_RB532 routerboard ADK_LINUX_MIPS_RB411 || ADK_LINUX_MIPS_RB433 || ADK_LINUX_MIPS_RB532 -x86 ADK_LINUX_X86_QEMU || ADK_LINUX_X86_RESCUE || ADK_LINUX_X86_ALIX1C || ADK_LINUX_X86_ALIX2D || ADK_LINUX_X86_WRAP +x86 ADK_LINUX_X86_QEMU || ADK_LINUX_X86_RESCUE || ADK_LINUX_X86_ALIX1C || ADK_LINUX_X86_ALIX2D || ADK_LINUX_X86_WRAP || ADK_LINUX_X86_ALIX2D13 x86_64 ADK_LINUX_X86_64_QEMU || ADK_LINUX_X86_64_RESCUE || ADK_LINUX_X86_64_SHUTTLE |